diff options
| author | jlam <jlam@pkgsrc.org> | 2004-02-17 14:26:47 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2004-02-17 14:26:47 +0000 |
| commit | 2c8d533a36309e5e867739198f9c8a88c759492d (patch) | |
| tree | f5bb5486d3790ba67aa32f1c613512d0f541ebed /security | |
| parent | eb8b7b047dbecddf74bd753fe98c2f493cea4fab (diff) | |
| download | pkgsrc-2c8d533a36309e5e867739198f9c8a88c759492d.tar.gz | |
Don't use sysctl to determine the machine arch when ${MACHINE_ARCH} already
has the correct value. Fixes build on NetBSD-1.5.3/sparc, which doesn't
understand "sysctl hw.machine_arch", reported in PR 24448.
Diffstat (limited to 'security')
| -rw-r--r-- | security/openssl/Makefile | 3 | ||||
| -rw-r--r-- | security/openssl/distinfo | 4 | ||||
| -rw-r--r-- | security/openssl/patches/patch-aa | 4 |
3 files changed, 6 insertions, 5 deletions
diff --git a/security/openssl/Makefile b/security/openssl/Makefile index f10652866c5..1c963c8c040 100644 --- a/security/openssl/Makefile +++ b/security/openssl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.85 2004/01/05 22:39:11 jlam Exp $ +# $NetBSD: Makefile,v 1.86 2004/02/17 14:26:47 jlam Exp $ DISTNAME= openssl-0.9.6l SVR4_PKGNAME= ossl @@ -52,6 +52,7 @@ CONFIGURE_ARGS+= irix64-mips4-cc CONFIGURE_ARGS+= ${CFLAGS} ${LDFLAGS} CONFIGURE_ENV+= PERL="${PERL5}" +CONFIGURE_ENV+= MACHINE_ARCH=${MACHINE_ARCH} PLIST_SRC= ${PKGDIR}/PLIST.${LOWER_OPSYS:C/([.0-9]*)$//} PLIST_SRC+= ${PLIST_RSAREF} diff --git a/security/openssl/distinfo b/security/openssl/distinfo index 4f897ed0acc..7b8d2c23822 100644 --- a/security/openssl/distinfo +++ b/security/openssl/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.24 2003/11/12 03:35:46 jschauma Exp $ +$NetBSD: distinfo,v 1.25 2004/02/17 14:26:47 jlam Exp $ SHA1 (openssl-0.9.6l.tar.gz) = 4fdd3c5f09b1276bf3c64140a38130c6dd49871c Size (openssl-0.9.6l.tar.gz) = 2183726 bytes -SHA1 (patch-aa) = c4766edba4704374ae67d75c2f9454bc70782eea +SHA1 (patch-aa) = 4f172db9ed515d9972883470bf33b694f9df835a SHA1 (patch-ab) = cfbcaa52bec88987b8a63725b84adfd58b324032 SHA1 (patch-ac) = 3a5248b8b9fe6791b6c114f3b98f1b4fae93a183 SHA1 (patch-ad) = 950d57633fcb494564641f9b7e6385b96912c05d diff --git a/security/openssl/patches/patch-aa b/security/openssl/patches/patch-aa index a0e88f13417..0fbace605bd 100644 --- a/security/openssl/patches/patch-aa +++ b/security/openssl/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.11 2002/08/25 19:23:18 jlam Exp $ +$NetBSD: patch-aa,v 1.12 2004/02/17 14:26:47 jlam Exp $ --- config.orig Sun Jun 16 05:32:14 2002 +++ config @@ -9,7 +9,7 @@ $NetBSD: patch-aa,v 1.11 2002/08/25 19:23:18 jlam Exp $ - sun3*-*-netbsd) OUT="NetBSD-m68" ;; - *-*-netbsd) OUT="NetBSD-sparc" ;; + sun3*-*-netbsd) OUT="NetBSD-m68k" ;; -+ *-*-netbsd) OUT="NetBSD-`sysctl -n hw.machine_arch`" ;; ++ *-*-netbsd) OUT="NetBSD-${MACHINE_ARCH}" ;; *86*-*-openbsd) OUT="OpenBSD-x86" ;; alpha*-*-openbsd) OUT="OpenBSD-alpha" ;; pmax*-*-openbsd) OUT="OpenBSD-mips" ;; |