diff options
Diffstat (limited to 'meta-networking/recipes-daemons/postfix/files/makedefs.patch')
-rw-r--r-- | meta-networking/recipes-daemons/postfix/files/makedefs.patch | 116 |
1 files changed, 0 insertions, 116 deletions
diff --git a/meta-networking/recipes-daemons/postfix/files/makedefs.patch b/meta-networking/recipes-daemons/postfix/files/makedefs.patch deleted file mode 100644 index 98d5f7ed60..0000000000 --- a/meta-networking/recipes-daemons/postfix/files/makedefs.patch +++ /dev/null @@ -1,116 +0,0 @@ -From 4f49e2ce420fb3c17415937530493158ef312733 Mon Sep 17 00:00:00 2001 -From: Li xin <lixin.fnst@cn.fujitsu.com> -Date: Fri, 19 Jun 2015 16:45:54 +0900 -Subject: [PATCH] 1)remove RANLIB, SYSLIBS, AR and get them from env. - -2)reference sysroot when searching header files -3)include sysroot path instead of absolute include path -for Linux2 and Linux3 systems. -4)for non-native build, search STAGING_BASELIBDIR/LIBDIR - native build, search host library path for nsl and resolv library - which comes from libc - -Upstreamstatus: Inappropriate [embedded specific] - -Signed-off-by: Yao Zhao <yao.zhao@windriver.com> ---- - makedefs | 27 +++++++++++---------------- - 1 file changed, 11 insertions(+), 16 deletions(-) - -diff --git a/makedefs b/makedefs -index 8b84e47..893fb0d 100644 ---- a/makedefs -+++ b/makedefs -@@ -170,9 +170,6 @@ echo "# pie=$pie" - - # Defaults for most sane systems - --RANLIB=ranlib --SYSLIBS= --AR=ar - ARFL=rv - - # Ugly function to make our error message more visible among the -@@ -424,12 +421,12 @@ case "$SYSTEM.$RELEASE" in - case "$CCARGS" in - *-DNO_DB*) ;; - *-DHAS_DB*) ;; -- *) if [ -f /usr/include/db.h ] -+ *) if [ -f "$BUILD_SYSROOT"/usr/include/db.h ] - then - : we are all set -- elif [ -f /usr/include/db/db.h ] -+ elif [ -f "$BUILD_SYSROOT"/usr/include/db/db.h ] - then -- CCARGS="$CCARGS -I/usr/include/db" -+ CCARGS="$CCARGS -I"$BUILD_SYSROOT"/usr/include/db" - else - # No, we're not going to try db1 db2 db3 etc. - # On a properly installed system, Postfix builds -@@ -438,12 +435,12 @@ case "$SYSTEM.$RELEASE" in - echo "Install the appropriate db*-devel package first." 1>&2 - exit 1 - fi -- SYSLIBS="-ldb" -+ SYSLIBS="$SYSLIBS -ldb" - ;; - esac - for name in nsl resolv $GDBM_LIBS - do -- for lib in /usr/lib64 /lib64 /usr/lib /lib -+ for lib in $BUILD_SYSROOT_NSL_PATH - do - test -e $lib/lib$name.a -o -e $lib/lib$name.so && { - SYSLIBS="$SYSLIBS -l$name" -@@ -463,7 +460,7 @@ case "$SYSTEM.$RELEASE" in - if [ `expr "X$CCARGS" : "X.*-DNO_EPOLL"` -gt 0 ] - then - : -- elif [ ! -e /usr/include/sys/epoll.h ] -+ elif [ ! -e "$BUILD_SYSROOT"/usr/include/sys/epoll.h ] - then - echo CCARGS="$CCARGS -DNO_EPOLL" - else -@@ -487,8 +484,6 @@ int main(int argc, char **argv) - } - EOF - ${CC-gcc} -o makedefs.test makedefs.test.c || exit 1 -- ./makedefs.test 2>/dev/null || -- CCARGS="$CCARGS -DNO_EPOLL" - rm -f makedefs.test makedefs.test.[co] - fi;; - esac -@@ -504,12 +499,12 @@ EOF - case "$CCARGS" in - *-DNO_DB*) ;; - *-DHAS_DB*) ;; -- *) if [ -f /usr/include/db.h ] -+ *) if [ -f "$BUILD_SYSROOT"/usr/include/db.h ] - then - : we are all set -- elif [ -f /usr/include/db/db.h ] -+ elif [ -f "$BUILD_SYSROOT"/usr/include/db/db.h ] - then -- CCARGS="$CCARGS -I/usr/include/db" -+ CCARGS="$CCARGS -I"$BUILD_SYSROOT"/usr/include/db" - else - # On a properly installed system, Postfix builds - # by including <db.h> and by linking with -ldb -@@ -517,12 +512,12 @@ EOF - echo "Install the appropriate db*-devel package first." 1>&2 - exit 1 - fi -- SYSLIBS="-ldb" -+ SYSLIBS="$SYSLIBS -ldb" - ;; - esac - for name in nsl resolv - do -- for lib in /usr/lib64 /lib64 /usr/lib /usr/lib/* /lib /lib/* -+ for lib in $BUILD_SYSROOT_NSL_PATH - do - test -e $lib/lib$name.a -o -e $lib/lib$name.so && { - SYSLIBS="$SYSLIBS -l$name" --- -1.8.4.2 - |