diff options
| -rw-r--r-- | meta/recipes-devtools/autoconf/autoconf/remove-usr-local-lib-from-m4.patch | 29 | ||||
| -rw-r--r-- | meta/recipes-devtools/autoconf/autoconf_2.68.bb | 3 |
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 00000000000..55d2e2fe7ef --- /dev/null +++ b/meta/recipes-devtools/autoconf/autoconf/remove-usr-local-lib-from-m4.patch @@ -0,0 +1,29 @@ +We have problem using hardcoded directories like /usr/local here +which will be checked for cross builds. This is a special case which +is valid for AIX only. We do not have AIX as one of our supported +build host or target. Therefore we get rid of the hardcoded paths +and make life easier for cross compilation process. + +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +Upstream-Status: Inappropriate [Upstream does care for AIX while we may not] +Index: autoconf-2.68/lib/autoconf/functions.m4 +=================================================================== +--- autoconf-2.68.orig/lib/autoconf/functions.m4 2010-09-22 14:52:19.000000000 -0700 ++++ autoconf-2.68/lib/autoconf/functions.m4 2011-08-03 11:57:05.822199513 -0700 +@@ -749,15 +749,6 @@ if test $ac_have_func = no; then + [LIBS="-lutil $LIBS" ac_have_func=yes ac_cv_func_getloadavg_setgid=yes]) + fi + +-if test $ac_have_func = no; then +- # There is a commonly available library for RS/6000 AIX. +- # Since it is not a standard part of AIX, it might be installed locally. +- ac_getloadavg_LIBS=$LIBS +- LIBS="-L/usr/local/lib $LIBS" +- AC_CHECK_LIB(getloadavg, getloadavg, +- [LIBS="-lgetloadavg $LIBS"], [LIBS=$ac_getloadavg_LIBS]) +-fi +- + # Make sure it is really in the library, if we think we found it, + # otherwise set up the replacement function. + 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 3b196a64186..c6209a37eb1 100644 --- a/meta/recipes-devtools/autoconf/autoconf_2.68.bb +++ b/meta/recipes-devtools/autoconf/autoconf_2.68.bb @@ -1,6 +1,6 @@ require autoconf.inc -PR = "r1" +PR = "r2" PARALLEL_MAKE = "" @@ -16,6 +16,7 @@ SRC_URI += "file://autoreconf-include.patch \ file://autoheader-nonfatal-warnings.patch \ ${@['file://path_prog_fixes.patch', ''][bb.data.inherits_class('native', d)]} \ file://config_site.patch \ + file://remove-usr-local-lib-from-m4.patch \ " SRC_URI[md5sum] = "864d785215aa60d627c91fcb21b05b07" |