diff options
| author | jperkin <jperkin@pkgsrc.org> | 2015-10-26 09:42:47 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2015-10-26 09:42:47 +0000 |
| commit | db973246a1592c7ae6a5938661fe13c7cc4d0607 (patch) | |
| tree | 809fc4855672288bee1c50c9266a5171b9343195 /security/openssl | |
| parent | aee241ec11dda36a11d3a9249a8658c8445d75de (diff) | |
| download | pkgsrc-db973246a1592c7ae6a5938661fe13c7cc4d0607.tar.gz | |
Support SunOS/clang and pass -h linker argument correctly. Doesn't fully
fix the build yet, an additional patch to remove LD_LIBRARY_PATH is required
but needs wider testing.
Diffstat (limited to 'security/openssl')
| -rw-r--r-- | security/openssl/Makefile | 4 | ||||
| -rw-r--r-- | security/openssl/distinfo | 4 | ||||
| -rw-r--r-- | security/openssl/patches/patch-Makefile.shared | 23 |
3 files changed, 25 insertions, 6 deletions
diff --git a/security/openssl/Makefile b/security/openssl/Makefile index 3eaedb47c16..99691740b89 100644 --- a/security/openssl/Makefile +++ b/security/openssl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.214 2015/10/09 11:44:47 jperkin Exp $ +# $NetBSD: Makefile,v 1.215 2015/10/26 09:42:47 jperkin Exp $ DISTNAME= openssl-1.0.2d CATEGORIES= security @@ -43,7 +43,7 @@ OPENSSL_MACHINE_ARCH= ${MACHINE_ARCH} # back to ./config's autodetection if not. . if defined(OPENSSL_MACHINE_ARCH) && !empty(OPENSSL_MACHINE_ARCH) CONFIGURE_SCRIPT= ./Configure -. if !empty(CC_VERSION:Mgcc*) +. if ${PKGSRC_COMPILER} == "clang" || ${PKGSRC_COMPILER} == "gcc" CONFIGURE_ARGS+= solaris${${ABI}==64:?64:}-${OPENSSL_MACHINE_ARCH}-gcc . else CONFIGURE_ARGS+= solaris${${ABI}==64:?64:}-${OPENSSL_MACHINE_ARCH}-cc diff --git a/security/openssl/distinfo b/security/openssl/distinfo index eac4dfc3622..8d10c14e87f 100644 --- a/security/openssl/distinfo +++ b/security/openssl/distinfo @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.115 2015/07/09 13:37:56 wiz Exp $ +$NetBSD: distinfo,v 1.116 2015/10/26 09:42:47 jperkin Exp $ SHA1 (openssl-1.0.2d.tar.gz) = d01d17b44663e8ffa6a33a5a30053779d9593c3d RMD160 (openssl-1.0.2d.tar.gz) = a4389911e5f7436dc2f52e4968eb613a11e33027 Size (openssl-1.0.2d.tar.gz) = 5295447 bytes SHA1 (patch-Configure) = ce5f4ab244f49d3a556b1123190f2424b38fd789 SHA1 (patch-Makefile.org) = 72f023aeead660decaa09b6664936bd73a214069 -SHA1 (patch-Makefile.shared) = 709283ba4bb4bd568e289fe111b8dea319968328 +SHA1 (patch-Makefile.shared) = effbea94f9e7f399f4f46542bed6d54fc42748e6 SHA1 (patch-apps_Makefile) = 745e01fb967979f5105896f8a728fd7a041af6c9 SHA1 (patch-config) = ac8ced00cfa7d31b84afb08aedc38102fd777824 SHA1 (patch-crypto_bn_bn__prime.pl) = c07e8ccba319e4260af46e714c3be56f70579fa6 diff --git a/security/openssl/patches/patch-Makefile.shared b/security/openssl/patches/patch-Makefile.shared index 0eea0d130c8..2b57529a13a 100644 --- a/security/openssl/patches/patch-Makefile.shared +++ b/security/openssl/patches/patch-Makefile.shared @@ -1,8 +1,9 @@ -$NetBSD: patch-Makefile.shared,v 1.2 2014/05/13 02:23:11 rodent Exp $ +$NetBSD: patch-Makefile.shared,v 1.3 2015/10/26 09:42:47 jperkin Exp $ Adjust build procedure. +Fix SunOS -h linker argument. ---- Makefile.shared.orig Mon Mar 17 16:14:20 2014 +--- Makefile.shared.orig 2015-07-09 11:53:21.000000000 +0000 +++ Makefile.shared @@ -315,6 +315,11 @@ link_o.alpha-osf1: @ if $(DETECT_GNU_LD); then \ @@ -58,6 +59,24 @@ Adjust build procedure. fi; \ fi; \ $(LINK_SO_A) +@@ -372,7 +382,7 @@ link_o.solaris: + SHLIB_SUFFIX=; \ + ALLSYMSFLAGS="$${MINUSZ}allextract"; \ + NOALLSYMSFLAGS="$${MINUSZ}defaultextract"; \ +- SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX -Wl,-Bsymbolic"; \ ++ SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -Wl,-h,$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX -Wl,-Bsymbolic"; \ + fi; \ + $(LINK_SO_O) + link_a.solaris: +@@ -386,7 +396,7 @@ link_a.solaris: + SHLIB_SUFFIX=;\ + ALLSYMSFLAGS="$${MINUSZ}allextract"; \ + NOALLSYMSFLAGS="$${MINUSZ}defaultextract"; \ +- SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX -Wl,-Bsymbolic"; \ ++ SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -Wl,-h,$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX -Wl,-Bsymbolic"; \ + fi; \ + $(LINK_SO_A) + link_app.solaris: @@ -484,7 +494,7 @@ link_a.irix: ($(CC) -v 2>&1 | grep gcc) > /dev/null && MINUSWL="-Wl,"; \ ALLSYMSFLAGS="$${MINUSWL}-all"; \ |