diff options
| author |   Alexander Smirnov <alex.bluesman.smirnov@gmail.com> | 2011-04-13 16:51:13 +0400 |
|---|---|---|
| committer |   Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2011-06-16 18:38:48 +0400 |
| commit | 814c44486da264ac865b63952e2e41069aa7ca6e (patch) | |
| tree | 11057b0791ac576bdd7d4d84ba7757cf777a3f60 /recipes/wireshark | |
| parent | 9fef5f074ca2685f07c288ce7cc2799b757ab750 (diff) | |
| download | openembedded-814c44486da264ac865b63952e2e41069aa7ca6e.tar.gz | |
Set libtool to use correct lt-macroses
Signed-off-by: Alexander Smirnov <alex.bluesman.smirnov@gmail.com>
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Diffstat (limited to 'recipes/wireshark')
| -rw-r--r-- | recipes/wireshark/files/libtool-macroses-include.patch | 23 | ||||
| -rw-r--r-- | recipes/wireshark/wireshark_1.2.6.bb | 3 |
2 files changed, 25 insertions, 1 deletions
diff --git a/recipes/wireshark/files/libtool-macroses-include.patch b/recipes/wireshark/files/libtool-macroses-include.patch new file mode 100644 index 0000000000..c284e20c20 --- /dev/null +++ b/recipes/wireshark/files/libtool-macroses-include.patch @@ -0,0 +1,23 @@ +diff -pruN wireshark-1.2.6.orig/aclocal-flags wireshark-1.2.6/aclocal-flags +--- wireshark-1.2.6.orig/aclocal-flags 2010-01-27 19:12:50.000000000 +0300 ++++ wireshark-1.2.6/aclocal-flags 2011-04-13 16:13:47.979262764 +0400 +@@ -44,6 +44,7 @@ fi + + ac_missing_dir=`dirname $0` + echo "-I $ac_missing_dir/aclocal-fallback" | tr -d '\012' | tr -d '\015' ++echo " -I $ac_missing_dir/m4" | tr -d '\012' | tr -d '\015' + + # + # If there's no "aclocal", the former will be empty; if there's no +diff -pruN wireshark-1.2.6.orig/configure.in wireshark-1.2.6/configure.in +--- wireshark-1.2.6.orig/configure.in 2011-04-13 16:29:25.646012953 +0400 ++++ wireshark-1.2.6/configure.in 2011-04-13 15:54:27.030264922 +0400 +@@ -15,6 +15,8 @@ dnl AC_CANONICAL_TARGET + AC_INIT(wireshark, 1.2.6) + AM_INIT_AUTOMAKE([1.9 tar-ustar]) + ++AC_CONFIG_MACRO_DIR([m4]) ++ + AM_DISABLE_STATIC + + dnl Checks for programs. diff --git a/recipes/wireshark/wireshark_1.2.6.bb b/recipes/wireshark/wireshark_1.2.6.bb index cbd9c6065d..4e00795039 100644 --- a/recipes/wireshark/wireshark_1.2.6.bb +++ b/recipes/wireshark/wireshark_1.2.6.bb @@ -10,7 +10,8 @@ PR = "r5" SRC_URI = "${SOURCEFORGE_MIRROR}/wireshark/wireshark-${PV}.tar.bz2;name=src \ file://ieee80215.4.patch \ - file://fix-configure.patch " + file://fix-configure.patch \ + file://libtool-macroses-include.patch " SRC_URI[src.md5sum] = "f3e0917ed393366bbf96c53b58cb0931" SRC_URI[src.sha256sum]= "72c8178dd0614d963173d667d5ecb39bc7102453ea09da7ef3302daee7733f3c" |