diff options
| author | gdt <gdt> | 2016-03-23 12:55:18 +0000 |
|---|---|---|
| committer | gdt <gdt> | 2016-03-23 12:55:18 +0000 |
| commit | 822e7db639c624e22ba7e62c843382cf3dfc324f (patch) | |
| tree | e7f473ae910003ed98756b578169697056f24aef /mail | |
| parent | 321680a2b7b8f758d4bcab420e0271c67f54b4cf (diff) | |
| download | pkgsrc-822e7db639c624e22ba7e62c843382cf3dfc324f.tar.gz | |
Fix netbsd-5 build by defining shlib methods
Very surprisingly, postfix's build hard-codes shared library behavior
in a giant case statement not only per OS but per version, essentially
open-coding libtool while not being complete. This commit copies the
netbsd-6 flags to netbsd-5, as a minimal change during the freeze to
let this build on netbsd-5 (where it then works fine).
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/postfix/distinfo | 4 | ||||
| -rw-r--r-- | mail/postfix/patches/patch-ai | 30 |
2 files changed, 25 insertions, 9 deletions
diff --git a/mail/postfix/distinfo b/mail/postfix/distinfo index affce977661..0100d099fae 100644 --- a/mail/postfix/distinfo +++ b/mail/postfix/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.162 2015/11/03 23:27:17 agc Exp $ +$NetBSD: distinfo,v 1.163 2016/03/23 12:55:18 gdt Exp $ SHA1 (postfix-3.0.2.tar.gz) = 9d75ca3c207441a38a79a2c8ceaa398c2b9cdc4e RMD160 (postfix-3.0.2.tar.gz) = aba1e9decc1aa9aa0c0b68f2bb7f0432b75fabdf @@ -6,5 +6,5 @@ SHA512 (postfix-3.0.2.tar.gz) = b097ff5cb1707361af568bbcf8b9d264dfefe7a9fd5c2fb4 Size (postfix-3.0.2.tar.gz) = 4239235 bytes SHA1 (patch-aa) = f2c418a2fd34da7325ea2823ddd14043768f0111 SHA1 (patch-ag) = e3d818cd75225c5b50960659827c6e27767cbd58 -SHA1 (patch-ai) = d515202c3bba755067bcb057714cb21453d15d75 +SHA1 (patch-ai) = 17b29cceadba3055ae198e1802a786468ecc9eff SHA1 (patch-src_dns_dns__lookup.c) = 9c26686e5abd9aee36f042440e5f6a6ffca3df4a diff --git a/mail/postfix/patches/patch-ai b/mail/postfix/patches/patch-ai index fb1916b24f2..a6346857fa6 100644 --- a/mail/postfix/patches/patch-ai +++ b/mail/postfix/patches/patch-ai @@ -1,10 +1,26 @@ -$NetBSD: patch-ai,v 1.34 2015/09/07 09:47:01 fhajny Exp $ +$NetBSD: patch-ai,v 1.35 2016/03/23 12:55:18 gdt Exp $ -Make this pkgsrc friendly. +1) Add shlib definitions for NetBSD 5; the build system must be +hard-coded per OS per version. Not yet reported upstream. + +2) Make this pkgsrc friendly. --- makedefs.orig 2015-07-19 14:24:25.000000000 +0000 +++ makedefs -@@ -372,13 +372,6 @@ case "$SYSTEM.$RELEASE" in +@@ -292,6 +292,12 @@ case "$SYSTEM.$RELEASE" in + NetBSD.4*) SYSTYPE=NETBSD4 + ;; + NetBSD.5*) SYSTYPE=NETBSD5 ++ : ${SHLIB_SUFFIX=.so} ++ : ${SHLIB_CFLAGS=-fPIC} ++ : ${SHLIB_LD="${CC-gcc} -shared"' -Wl,-soname,${LIB}'} ++ : ${SHLIB_RPATH='-Wl,-rpath,${SHLIB_DIR}'} ++ : ${SHLIB_ENV="LD_LIBRARY_PATH=`pwd`/lib"} ++ : ${PLUGIN_LD="${CC-gcc} -shared"} + ;; + NetBSD.6*) SYSTYPE=NETBSD6 + : ${SHLIB_SUFFIX=.so} +@@ -372,13 +378,6 @@ case "$SYSTEM.$RELEASE" in esac ;; ULTRIX.4*) SYSTYPE=ULTRIX4 @@ -18,7 +34,7 @@ Make this pkgsrc friendly. for l in syslog resolv; do if [ -f /usr/local/lib/lib$l.a ]; then SYSLIBS="$SYSLIBS -l$l" -@@ -416,33 +409,8 @@ case "$SYSTEM.$RELEASE" in +@@ -416,33 +415,8 @@ case "$SYSTEM.$RELEASE" in esac;; # Tested with RedHat 3.03 on 20020729. Linux.1*) SYSTYPE=LINUX1 @@ -52,7 +68,7 @@ Make this pkgsrc friendly. for name in nsl resolv $GDBM_LIBS do for lib in /usr/lib64 /lib64 /usr/lib /lib -@@ -503,25 +471,6 @@ EOF +@@ -503,25 +477,6 @@ EOF : ${PLUGIN_LD="${CC-gcc} -shared"} ;; Linux.[34].*) SYSTYPE=LINUX$RELEASE_MAJOR @@ -78,7 +94,7 @@ Make this pkgsrc friendly. for name in nsl resolv do for lib in /usr/lib64 /lib64 /usr/lib /usr/lib/* /lib /lib/* -@@ -542,24 +491,6 @@ EOF +@@ -542,24 +497,6 @@ EOF ;; GNU.0*|GNU/kFreeBSD.[567]*) SYSTYPE=GNU0 @@ -103,7 +119,7 @@ Make this pkgsrc friendly. for name in nsl resolv do for lib in /usr/lib64 /lib64 /usr/lib /lib -@@ -590,25 +521,13 @@ EOF +@@ -590,25 +527,13 @@ EOF HP-UX.A.09.*) SYSTYPE=HPUX9 SYSLIBS=-ldbm CCARGS="$CCARGS -DMISSING_USLEEP" |