diff options
Diffstat (limited to 'meta-networking/recipes-daemons/postfix/files/makedefs.patch')
| -rw-r--r-- | meta-networking/recipes-daemons/postfix/files/makedefs.patch | 46 |
1 files changed, 25 insertions, 21 deletions
diff --git a/meta-networking/recipes-daemons/postfix/files/makedefs.patch b/meta-networking/recipes-daemons/postfix/files/makedefs.patch index ea1e994b03..98d5f7ed60 100644 --- a/meta-networking/recipes-daemons/postfix/files/makedefs.patch +++ b/meta-networking/recipes-daemons/postfix/files/makedefs.patch @@ -1,4 +1,7 @@ -1)remove RANLIB, SYSLIBS, AR and get them from env. +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 @@ -10,22 +13,25 @@ for Linux2 and Linux3 systems. Upstreamstatus: Inappropriate [embedded specific] Signed-off-by: Yao Zhao <yao.zhao@windriver.com> +--- + makedefs | 27 +++++++++++---------------- + 1 file changed, 11 insertions(+), 16 deletions(-) -5)add Linux 4.0 support - ---- a/makedefs 2015-05-30 13:38:50.346033228 +0200 -+++ b/makedefs 2015-05-30 13:40:19.375364795 +0200 -@@ -87,9 +87,6 @@ - +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 -@@ -293,12 +290,12 @@ case "$SYSTEM.$RELEASE" in +@@ -424,12 +421,12 @@ case "$SYSTEM.$RELEASE" in case "$CCARGS" in *-DNO_DB*) ;; *-DHAS_DB*) ;; @@ -41,7 +47,7 @@ Signed-off-by: Yao Zhao <yao.zhao@windriver.com> else # No, we're not going to try db1 db2 db3 etc. # On a properly installed system, Postfix builds -@@ -307,12 +304,12 @@ case "$SYSTEM.$RELEASE" in +@@ -438,12 +435,12 @@ case "$SYSTEM.$RELEASE" in echo "Install the appropriate db*-devel package first." 1>&2 exit 1 fi @@ -56,7 +62,7 @@ Signed-off-by: Yao Zhao <yao.zhao@windriver.com> do test -e $lib/lib$name.a -o -e $lib/lib$name.so && { SYSLIBS="$SYSLIBS -l$name" -@@ -332,7 +329,7 @@ case "$SYSTEM.$RELEASE" in +@@ -463,7 +460,7 @@ case "$SYSTEM.$RELEASE" in if [ `expr "X$CCARGS" : "X.*-DNO_EPOLL"` -gt 0 ] then : @@ -65,7 +71,7 @@ Signed-off-by: Yao Zhao <yao.zhao@windriver.com> then echo CCARGS="$CCARGS -DNO_EPOLL" else -@@ -356,22 +353,20 @@ +@@ -487,8 +484,6 @@ int main(int argc, char **argv) } EOF ${CC-gcc} -o makedefs.test makedefs.test.c || exit 1 @@ -74,9 +80,7 @@ Signed-off-by: Yao Zhao <yao.zhao@windriver.com> rm -f makedefs.test makedefs.test.[co] fi;; esac - ;; -- Linux.3*) SYSTYPE=LINUX3 -+ Linux.3*|Linux.4*) SYSTYPE=LINUX3 +@@ -504,12 +499,12 @@ EOF case "$CCARGS" in *-DNO_DB*) ;; *-DHAS_DB*) ;; @@ -92,7 +96,7 @@ Signed-off-by: Yao Zhao <yao.zhao@windriver.com> else # On a properly installed system, Postfix builds # by including <db.h> and by linking with -ldb -@@ -379,7 +374,7 @@ EOF +@@ -517,12 +512,12 @@ EOF echo "Install the appropriate db*-devel package first." 1>&2 exit 1 fi @@ -101,12 +105,12 @@ Signed-off-by: Yao Zhao <yao.zhao@windriver.com> ;; esac for name in nsl resolv -@@ -415,7 +410,7 @@ EOF - esac - for name in nsl resolv do -- for lib in /usr/lib64 /lib64 /usr/lib /lib +- 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 + |