diff options
| author | wiz <wiz@pkgsrc.org> | 2006-05-09 22:28:18 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2006-05-09 22:28:18 +0000 |
| commit | 7a6c37fc128d724073d241790cab4c08e9df9db8 (patch) | |
| tree | 11c37a190c8c55e9182e26f18ee09ed1664dc048 /graphics | |
| parent | c43654731aab2b80dfded56a726ba4bca856cc73 (diff) | |
| download | pkgsrc-7a6c37fc128d724073d241790cab4c08e9df9db8.tar.gz | |
Propagate PNG_NO_ASSEMBLER_CODE to dependencies.
This should fix PR 33325 (ImageMagick not building on amd64).
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/png/Makefile | 4 | ||||
| -rw-r--r-- | graphics/png/buildlink3.mk | 8 |
2 files changed, 9 insertions, 3 deletions
diff --git a/graphics/png/Makefile b/graphics/png/Makefile index bb9ee968c5e..3e24064632b 100644 --- a/graphics/png/Makefile +++ b/graphics/png/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.78 2006/04/22 07:07:55 wiz Exp $ +# $NetBSD: Makefile,v 1.79 2006/05/09 22:28:18 wiz Exp $ DISTNAME= libpng-1.2.9 PKGNAME= ${DISTNAME:S/lib//} @@ -23,7 +23,7 @@ TEST_TARGET= test USE_LIBTOOL= yes .include "../../mk/bsd.prefs.mk" - +# keep this in sync with the same code in buildlink3.mk .if ${MACHINE_ARCH} != "i386" CPPFLAGS+= -DPNG_NO_ASSEMBLER_CODE .endif diff --git a/graphics/png/buildlink3.mk b/graphics/png/buildlink3.mk index 08877ac13e4..2b91c977136 100644 --- a/graphics/png/buildlink3.mk +++ b/graphics/png/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.13 2006/04/17 13:44:46 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.14 2006/05/09 22:28:18 wiz Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ PNG_BUILDLINK3_MK:= ${PNG_BUILDLINK3_MK}+ @@ -14,6 +14,12 @@ BUILDLINK_PACKAGES+= png BUILDLINK_API_DEPENDS.png+= png>=1.2.4 BUILDLINK_ABI_DEPENDS.png?= png>=1.2.9nb2 BUILDLINK_PKGSRCDIR.png?= ../../graphics/png + +. include "../../mk/bsd.prefs.mk" +# keep this in sync with the same code in Makefile +. if ${MACHINE_ARCH} != "i386" +CPPFLAGS+= -DPNG_NO_ASSEMBLER_CODE +. endif .endif # PNG_BUILDLINK3_MK .include "../../devel/zlib/buildlink3.mk" |