diff options
Diffstat (limited to 'meta/recipes-support/apr/apr')
-rw-r--r-- | meta/recipes-support/apr/apr/buildconf_fix.patch | 25 | ||||
-rw-r--r-- | meta/recipes-support/apr/apr/cleanup.patch | 9 |
2 files changed, 29 insertions, 5 deletions
diff --git a/meta/recipes-support/apr/apr/buildconf_fix.patch b/meta/recipes-support/apr/apr/buildconf_fix.patch new file mode 100644 index 0000000000..641340b2a4 --- /dev/null +++ b/meta/recipes-support/apr/apr/buildconf_fix.patch | |||
@@ -0,0 +1,25 @@ | |||
1 | Remove the new libtool detection method to avoid config failure. Poky's libtool | ||
2 | has different format for "aclocaldir", and there is no elegant parsing method, | ||
3 | so fall back to old detection. | ||
4 | |||
5 | Signed-off-by: Zhai Edwin <edwin.zhai@intel.com> | ||
6 | |||
7 | Index: apr-1.4.2/buildconf | ||
8 | =================================================================== | ||
9 | --- apr-1.4.2.orig/buildconf 2009-11-13 06:19:49.000000000 +0800 | ||
10 | +++ apr-1.4.2/buildconf 2010-11-29 14:39:19.000000000 +0800 | ||
11 | @@ -50,14 +50,6 @@ | ||
12 | |||
13 | if [ -f libtool.m4 ]; then | ||
14 | ltfile=`pwd`/libtool.m4 | ||
15 | -elif grep all_pkgmacro_files $libtoolize > /dev/null; then | ||
16 | - # libtool 2.x | ||
17 | - aclocal_dir=`sed -n '/^aclocaldir=/{s/.*=//;p;q;}' < $libtoolize` | ||
18 | - ltfiles=`sed -n '/^all_pkgmacro_files=/{s/.*=//;;s/"//;p;q;}' < $libtoolize` | ||
19 | - for f in $ltfiles; do | ||
20 | - test -f "$aclocal_dir/$f" && cp "$aclocal_dir/$f" build | ||
21 | - done | ||
22 | - ltfile=$aclocal_dir/libtool.m4 | ||
23 | else | ||
24 | ltfindcmd="`sed -n \"/=[^\\\`]/p;/libtool_m4=/{s/.*=/echo /p;q;}\" \ | ||
25 | < $libtoolize`" | ||
diff --git a/meta/recipes-support/apr/apr/cleanup.patch b/meta/recipes-support/apr/apr/cleanup.patch index fd74826480..47f1c42c5c 100644 --- a/meta/recipes-support/apr/apr/cleanup.patch +++ b/meta/recipes-support/apr/apr/cleanup.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | Index: apr-1.3.3/build/buildcheck.sh | 1 | Index: apr-1.4.2/build/buildcheck.sh |
2 | =================================================================== | 2 | =================================================================== |
3 | --- apr-1.3.3.orig/build/buildcheck.sh 2009-01-15 13:32:33.000000000 +0000 | 3 | --- apr-1.4.2.orig/build/buildcheck.sh 2009-11-13 08:27:16.000000000 +0800 |
4 | +++ apr-1.3.3/build/buildcheck.sh 2009-01-15 13:33:06.000000000 +0000 | 4 | +++ apr-1.4.2/build/buildcheck.sh 2010-11-26 15:44:00.000000000 +0800 |
5 | @@ -32,35 +32,4 @@ | 5 | @@ -32,35 +32,4 @@ |
6 | echo "buildconf: autoconf version $ac_version (ok)" | 6 | echo "buildconf: autoconf version $ac_version (ok)" |
7 | fi | 7 | fi |
@@ -12,7 +12,7 @@ Index: apr-1.3.3/build/buildcheck.sh | |||
12 | -# output is multiline from 1.5 onwards | 12 | -# output is multiline from 1.5 onwards |
13 | - | 13 | - |
14 | -# Require libtool 1.4 or newer | 14 | -# Require libtool 1.4 or newer |
15 | -libtool=`build/PrintPath glibtool libtool libtool15 libtool14` | 15 | -libtool=`build/PrintPath glibtool1 glibtool libtool libtool15 libtool14` |
16 | -lt_pversion=`$libtool --version 2>/dev/null|sed -e 's/([^)]*)//g;s/^[^0-9]*//;s/[- ].*//g;q'` | 16 | -lt_pversion=`$libtool --version 2>/dev/null|sed -e 's/([^)]*)//g;s/^[^0-9]*//;s/[- ].*//g;q'` |
17 | -if test -z "$lt_pversion"; then | 17 | -if test -z "$lt_pversion"; then |
18 | -echo "buildconf: libtool not found." | 18 | -echo "buildconf: libtool not found." |
@@ -39,4 +39,3 @@ Index: apr-1.3.3/build/buildcheck.sh | |||
39 | - | 39 | - |
40 | -exit 1 | 40 | -exit 1 |
41 | +exit 0 | 41 | +exit 0 |
42 | \ No newline at end of file | ||