Wed Apr 29 21:38:24 2020 UTC ()
djvulibre-lib: remove workaround needed for EOL NetBSD/i386.

NetBSD seems to have defaulted to assuming i486 since 2009.


(maya)
diff -r1.3 -r1.4 pkgsrc/graphics/djvulibre-lib/Makefile.common
cvs diff -r1.3 -r1.4 pkgsrc/graphics/djvulibre-lib/Makefile.common (expand / switch to unified diff)

--- pkgsrc/graphics/djvulibre-lib/Makefile.common 2020/03/20 11:57:47 1.3
+++ pkgsrc/graphics/djvulibre-lib/Makefile.common 2020/04/29 21:38:24 1.4
@@ -1,32 +1,24 @@ @@ -1,32 +1,24 @@
1# $NetBSD: Makefile.common,v 1.3 2020/03/20 11:57:47 nia Exp $ 1# $NetBSD: Makefile.common,v 1.4 2020/04/29 21:38:24 maya Exp $
2 2
3DISTNAME= djvulibre-3.5.27 3DISTNAME= djvulibre-3.5.27
4CATEGORIES= graphics 4CATEGORIES= graphics
5MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=djvu/} 5MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=djvu/}
6 6
7HOMEPAGE= http://djvu.sourceforge.net/ 7HOMEPAGE= http://djvu.sourceforge.net/
8COMMENT= Compression library for scanned documents 8COMMENT= Compression library for scanned documents
9LICENSE= gnu-gpl-v2 9LICENSE= gnu-gpl-v2
10 10
11PATCHDIR= ${.CURDIR}/../djvulibre-lib/patches 11PATCHDIR= ${.CURDIR}/../djvulibre-lib/patches
12DISTINFO_FILE= ${.CURDIR}/../djvulibre-lib/distinfo 12DISTINFO_FILE= ${.CURDIR}/../djvulibre-lib/distinfo
13 13
14USE_LANGUAGES= c c++ 14USE_LANGUAGES= c c++
15USE_LIBTOOL= yes 15USE_LIBTOOL= yes
16USE_TOOLS+= gmake pkg-config 16USE_TOOLS+= gmake pkg-config
17GNU_CONFIGURE= yes 17GNU_CONFIGURE= yes
18 18
19PKGCONFIG_OVERRIDE+= libdjvu/ddjvuapi.pc.in 19PKGCONFIG_OVERRIDE+= libdjvu/ddjvuapi.pc.in
20BUILD_DIRS= libdjvu share 20BUILD_DIRS= libdjvu share
21INSTALL_DIRS= libdjvu share 21INSTALL_DIRS= libdjvu share
22 22
23.include "../../mk/bsd.prefs.mk" 
24.if !empty(MACHINE_PLATFORM:MNetBSD-[5-9]*-i386) && !empty(PKGSRC_COMPILER:Mgcc) 
25# The library uses Intel atomic intrinsics which don't work with NetBSD's 
26# default arch setting of "i386" because eg. cmpxchgl is 486+. 
27# On NetBSD-5+, i386 is desupported so we can safely assume a 486. 
28CFLAGS+= -march=i486 
29.endif 
30 
31.include "../../graphics/tiff/buildlink3.mk" 23.include "../../graphics/tiff/buildlink3.mk"
32.include "../../mk/jpeg.buildlink3.mk" 24.include "../../mk/jpeg.buildlink3.mk"