summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2011-08-03 14:12:29 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-08-05 17:16:00 +0100
commit281fc55ff913bb485cd208c816b91207928c9d96 (patch)
tree64f0a9a3214e9b51a8433e2547024d36784a03d8
parentdb6b664257ff4a7dc897fe12ebb6fd1e27631096 (diff)
downloadpoky-281fc55ff913bb485cd208c816b91207928c9d96.tar.gz
autoconf: Remove code checking for hardcoded /usr/local
This code is only relevant for AIX and causes problems with OE QA sniffer which detects -L/usr/local/lib on linker commandline during cross compile and rightly barfs This only happens when getloadavg() is not found in libc so we do not reach that code with eglibc but only with uclibc (From OE-Core rev: f235366c8a39679aa5beadf54a5e0ab7ece90d16) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/autoconf/autoconf/remove-usr-local-lib-from-m4.patch29
-rw-r--r--meta/recipes-devtools/autoconf/autoconf_2.68.bb3
2 files changed, 31 insertions, 1 deletions
diff --git a/meta/recipes-devtools/autoconf/autoconf/remove-usr-local-lib-from-m4.patch b/meta/recipes-devtools/autoconf/autoconf/remove-usr-local-lib-from-m4.patch
new file mode 100644
index 0000000000..55d2e2fe7e
--- /dev/null
+++ b/meta/recipes-devtools/autoconf/autoconf/remove-usr-local-lib-from-m4.patch
@@ -0,0 +1,29 @@
1We have problem using hardcoded directories like /usr/local here
2which will be checked for cross builds. This is a special case which
3is valid for AIX only. We do not have AIX as one of our supported
4build host or target. Therefore we get rid of the hardcoded paths
5and make life easier for cross compilation process.
6
7Signed-off-by: Khem Raj <raj.khem@gmail.com>
8
9Upstream-Status: Inappropriate [Upstream does care for AIX while we may not]
10Index: autoconf-2.68/lib/autoconf/functions.m4
11===================================================================
12--- autoconf-2.68.orig/lib/autoconf/functions.m4 2010-09-22 14:52:19.000000000 -0700
13+++ autoconf-2.68/lib/autoconf/functions.m4 2011-08-03 11:57:05.822199513 -0700
14@@ -749,15 +749,6 @@ if test $ac_have_func = no; then
15 [LIBS="-lutil $LIBS" ac_have_func=yes ac_cv_func_getloadavg_setgid=yes])
16 fi
17
18-if test $ac_have_func = no; then
19- # There is a commonly available library for RS/6000 AIX.
20- # Since it is not a standard part of AIX, it might be installed locally.
21- ac_getloadavg_LIBS=$LIBS
22- LIBS="-L/usr/local/lib $LIBS"
23- AC_CHECK_LIB(getloadavg, getloadavg,
24- [LIBS="-lgetloadavg $LIBS"], [LIBS=$ac_getloadavg_LIBS])
25-fi
26-
27 # Make sure it is really in the library, if we think we found it,
28 # otherwise set up the replacement function.
29 AC_CHECK_FUNCS(getloadavg, [],
diff --git a/meta/recipes-devtools/autoconf/autoconf_2.68.bb b/meta/recipes-devtools/autoconf/autoconf_2.68.bb
index 3b196a6418..c6209a37eb 100644
--- a/meta/recipes-devtools/autoconf/autoconf_2.68.bb
+++ b/meta/recipes-devtools/autoconf/autoconf_2.68.bb
@@ -1,6 +1,6 @@
1require autoconf.inc 1require autoconf.inc
2 2
3PR = "r1" 3PR = "r2"
4 4
5PARALLEL_MAKE = "" 5PARALLEL_MAKE = ""
6 6
@@ -16,6 +16,7 @@ SRC_URI += "file://autoreconf-include.patch \
16 file://autoheader-nonfatal-warnings.patch \ 16 file://autoheader-nonfatal-warnings.patch \
17 ${@['file://path_prog_fixes.patch', ''][bb.data.inherits_class('native', d)]} \ 17 ${@['file://path_prog_fixes.patch', ''][bb.data.inherits_class('native', d)]} \
18 file://config_site.patch \ 18 file://config_site.patch \
19 file://remove-usr-local-lib-from-m4.patch \
19 " 20 "
20 21
21SRC_URI[md5sum] = "864d785215aa60d627c91fcb21b05b07" 22SRC_URI[md5sum] = "864d785215aa60d627c91fcb21b05b07"