From 18ef65ef9fc54eac7c1d9e27a2adfef2b3ce1ff2 Mon Sep 17 00:00:00 2001 From: bjs Date: Fri, 26 Oct 2007 03:53:39 +0000 Subject: Add x86_64 to the list of architectures which don't require -DPNG_NO_ASSEMBLER_CODE. Bump rev. I've tested png on NetBSD/amd64 with the assembler code and it seems no less functional than NetBSD/i386. ok'd weeks ago (before freeze)--I forgot to commit it. --- graphics/png/Makefile | 5 +++-- graphics/png/buildlink3.mk | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'graphics/png') diff --git a/graphics/png/Makefile b/graphics/png/Makefile index 5d80ff690a0..42aea23545b 100644 --- a/graphics/png/Makefile +++ b/graphics/png/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.94 2007/10/17 20:45:47 wiz Exp $ +# $NetBSD: Makefile,v 1.95 2007/10/26 03:53:39 bjs Exp $ DISTNAME= libpng-1.2.22 PKGNAME= ${DISTNAME:S/lib//} +PKGREVISION= 1 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libpng/} \ http://www.libpng.org/pub/png/src/ \ @@ -24,7 +25,7 @@ USE_LIBTOOL= yes .include "../../mk/bsd.prefs.mk" # keep this in sync with the same code in buildlink3.mk -.if ${MACHINE_ARCH} != "i386" +.if ${MACHINE_ARCH} != "i386" && ${MACHINE_ARCH} != "x86_64" CPPFLAGS+= -DPNG_NO_ASSEMBLER_CODE .endif diff --git a/graphics/png/buildlink3.mk b/graphics/png/buildlink3.mk index 43d7e6859f2..446d1c13e94 100644 --- a/graphics/png/buildlink3.mk +++ b/graphics/png/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.20 2007/01/03 20:38:46 rillig Exp $ +# $NetBSD: buildlink3.mk,v 1.21 2007/10/26 03:53:39 bjs Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ PNG_BUILDLINK3_MK:= ${PNG_BUILDLINK3_MK}+ @@ -23,7 +23,7 @@ BUILDLINK_ABI_DEPENDS.png+= png>=1.2.9nb2 BUILDLINK_PKGSRCDIR.png?= ../../graphics/png # keep this in sync with the same code in Makefile -. if ${MACHINE_ARCH} != "i386" +. if ${MACHINE_ARCH} != "i386" && ${MACHINE_ARCH} != "x86_64" CPPFLAGS+= -DPNG_NO_ASSEMBLER_CODE . endif .endif # PNG_BUILDLINK3_MK -- cgit v1.2.3