diff options
| author | fhajny <fhajny@pkgsrc.org> | 2012-07-25 11:33:49 +0000 |
|---|---|---|
| committer | fhajny <fhajny@pkgsrc.org> | 2012-07-25 11:33:49 +0000 |
| commit | 67b36d67b25903fc130fa0941fd29ae3cf3fd9b3 (patch) | |
| tree | 3f236e2f97d8d995875a16a00849d0ef6491aecc /net | |
| parent | a6a68e8ff2b57e1a73852ef91c193bfe883b3c22 (diff) | |
| download | pkgsrc-67b36d67b25903fc130fa0941fd29ae3cf3fd9b3.tar.gz | |
Fix 32bit build on SunOS by relying on MACHINE_ARCH instead of isainfo.
Diffstat (limited to 'net')
| -rw-r--r-- | net/netatalk/Makefile | 3 | ||||
| -rw-r--r-- | net/netatalk/distinfo | 4 | ||||
| -rw-r--r-- | net/netatalk/patches/patch-aa | 4 |
3 files changed, 6 insertions, 5 deletions
diff --git a/net/netatalk/Makefile b/net/netatalk/Makefile index 3671deba3a2..68d11734ee5 100644 --- a/net/netatalk/Makefile +++ b/net/netatalk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.87 2012/06/13 12:38:35 obache Exp $ +# $NetBSD: Makefile,v 1.88 2012/07/25 11:33:49 fhajny Exp $ DISTNAME= netatalk-2.2.1 PKGREVISION= 5 @@ -52,6 +52,7 @@ CONFIGURE_ARGS+= --with-uams-path=${PREFIX}/libexec/netatalk/uams CONFIGURE_ARGS+= --with-bdb=${BDBBASE} CONFIGURE_ARGS+= --with-ssl-dir=${BUILDLINK_PREFIX.openssl} CONFIGURE_ARGS+= --with-ldap=no +CONFIGURE_ENV+= MACHINE_ARCH=${MACHINE_ARCH} MAKE_DIRS+= ${PKG_SYSCONFDIR}/msg diff --git a/net/netatalk/distinfo b/net/netatalk/distinfo index 8391664346e..6a07d3bbb5f 100644 --- a/net/netatalk/distinfo +++ b/net/netatalk/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.46 2012/05/16 14:03:08 hauke Exp $ +$NetBSD: distinfo,v 1.47 2012/07/25 11:33:49 fhajny Exp $ SHA1 (netatalk-2.2.1.tar.bz2) = e588b89eced7769f65e213bc4b1b1e4f8035c8b3 RMD160 (netatalk-2.2.1.tar.bz2) = bc55a591fe134d3bf05ca442aa5b5246fd766b8c Size (netatalk-2.2.1.tar.bz2) = 1227602 bytes -SHA1 (patch-aa) = 060de5d023c3cc4e8d4e126270f2be69cf8a8913 +SHA1 (patch-aa) = 3d253738afdfa81e862fbbc67f30337b8acb42c0 SHA1 (patch-ac) = 605e87479202cbf093dfbadb25f2972595246d97 SHA1 (patch-ae) = e114085fbe2abf2fb821f2d2737e877c53e7c151 SHA1 (patch-af) = 649be7e50210e6e4156aeff74d3fc0effb90f9f2 diff --git a/net/netatalk/patches/patch-aa b/net/netatalk/patches/patch-aa index 3686e9f0f56..00da615ee53 100644 --- a/net/netatalk/patches/patch-aa +++ b/net/netatalk/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.24 2012/05/12 21:53:20 dholland Exp $ +$NetBSD: patch-aa,v 1.25 2012/07/25 11:33:49 fhajny Exp $ --- configure.orig 2011-09-06 13:41:25.000000000 +0200 +++ configure 2011-11-29 18:59:56.000000000 +0100 @@ -45692,7 +45692,7 @@ $NetBSD: patch-aa,v 1.24 2012/05/12 21:53:20 dholland Exp $ + # check for isainfo, if not found it has to be a 32 bit kernel (<=2.6) + if test -x /usr/bin/isainfo; then + # check for 64 bit platform -+ if isainfo -kv | grep '^64-bit'; then ++ if test "$MACHINE_ARCH" = "x86_64"; then + COMPILE_64BIT_KMODULE=yes + fi + fi |