diff options
| author | jlam <jlam@pkgsrc.org> | 2004-02-10 00:13:24 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2004-02-10 00:13:24 +0000 |
| commit | 38afafca594bfd3a70805da5193411839d7db5b3 (patch) | |
| tree | d22bd850d6abaec38ffa69639255f40c473dc969 /security/libgcrypt | |
| parent | bbdd151ce77ef253c7a8feb444ae001a52ba61eb (diff) | |
| download | pkgsrc-38afafca594bfd3a70805da5193411839d7db5b3.tar.gz | |
bl3ify and remove libiconv and gettext-lib buildlink files. This package
really only needs gettext-lib through libgpg-error, and doesn't need
libiconv at all unless it uses the pkgsrc gettext-lib. The gettext-lib
buildlink3.mk file combined with the buildlink3 framework is considerably
better at detecting this than the buildlink2.mk, which broke in a lot of
instances.
Diffstat (limited to 'security/libgcrypt')
| -rw-r--r-- | security/libgcrypt/Makefile | 17 | ||||
| -rw-r--r-- | security/libgcrypt/buildlink3.mk | 18 |
2 files changed, 26 insertions, 9 deletions
diff --git a/security/libgcrypt/Makefile b/security/libgcrypt/Makefile index 39d0e0cd6e3..e614f0081c7 100644 --- a/security/libgcrypt/Makefile +++ b/security/libgcrypt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2004/02/05 00:09:51 grant Exp $ +# $NetBSD: Makefile,v 1.12 2004/02/10 00:13:24 jlam Exp $ # DISTNAME= libgcrypt-1.1.90 @@ -11,7 +11,7 @@ MAINTAINER= tron@NetBSD.org HOMEPAGE= http://www.gnu.org/directory/security/libgcrypt.html COMMENT= GNU cryptographic library -USE_BUILDLINK2= YES +USE_BUILDLINK3= YES USE_LIBTOOL= YES GNU_CONFIGURE= YES @@ -25,18 +25,17 @@ INFO_FILES= gcrypt.info # Our "libtool" doesn't like the crafted ".lo" files with the assembly # implementations. So we use the bundled "libtool" for NetBSD-i386 ELF # and ours otherwise. -.if ${MACHINE_GNU_PLATFORM} != i386--netbsdelf && ${MACHINE_GNU_PLATFORM} != alpha--netbsd +# +.if empty(MACHINE_PLATFORM:MNetBSD-*-i386) && \ + empty(MACHINE_PLATFORM:MNetBSD-*-alpha) CONFIGURE_ARGS+= --disable-asm LIBTOOL_OVERRIDE+= ${WRKSRC}/libtool .endif -.if exists(/usr/include/pthread.h) +.include "../../mk/pthread.buildlink3.mk" +.if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "native") CONFIGURE_ARGS+= --without-pth .endif -.include "../../converters/libiconv/buildlink2.mk" -.include "../../devel/gettext-lib/buildlink2.mk" -.include "../../security/libgpg-error/buildlink2.mk" - -.include "../../mk/pthread.buildlink2.mk" +.include "../../security/libgpg-error/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/security/libgcrypt/buildlink3.mk b/security/libgcrypt/buildlink3.mk new file mode 100644 index 00000000000..05101889fc1 --- /dev/null +++ b/security/libgcrypt/buildlink3.mk @@ -0,0 +1,18 @@ +# $NetBSD: buildlink3.mk,v 1.1 2004/02/10 00:13:24 jlam Exp $ + +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ +LIBGCRYPT_BUILDLINK3_MK:= ${LIBGCRYPT_BUILDLINK3_MK}+ + +.if !empty(BUILDLINK_DEPTH:M+) +BUILDLINK_DEPENDS+= libgcrypt +.endif + +.if !empty(LIBGCRYPT_BUILDLINK3_MK:M+) +BUILDLINK_PACKAGES+= libgcrypt +BUILDLINK_DEPENDS.libgcrypt+= libgcrypt>=1.1.90 +BUILDLINK_PKGSRCDIR.libgcrypt?= ../../security/libgcrypt + +. include "../../security/libgpg-error/buildlink3.mk" +.endif # LIBGCRYPT_BUILDLINK3_MK + +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} |