diff options
| author | drochner <drochner> | 2009-02-20 10:52:56 +0000 |
|---|---|---|
| committer | drochner <drochner> | 2009-02-20 10:52:56 +0000 |
| commit | b5cae29950a82dca21d929d25a6877108943cb34 (patch) | |
| tree | a8f29dc5bef0aafdd37e761afc552c3fb673a8b5 /graphics/djvulibre-lib | |
| parent | 2f97a4b0112b057bea66c7dd07b7ce7c8c85f080 (diff) | |
| download | pkgsrc-b5cae29950a82dca21d929d25a6877108943cb34.tar.gz | |
Fix an undefined symbol problem which rendered this pkg unusable
after the last update.
(due to use of a locking primitive which is only available on 486+
while gcc defaults to -march=i386)
This might also fix PR pkg/40630 by Kamel Derouiche.
bump PKGREVISION
Diffstat (limited to 'graphics/djvulibre-lib')
| -rw-r--r-- | graphics/djvulibre-lib/Makefile | 11 | ||||
| -rw-r--r-- | graphics/djvulibre-lib/distinfo | 4 | ||||
| -rw-r--r-- | graphics/djvulibre-lib/patches/patch-ad | 10 |
3 files changed, 21 insertions, 4 deletions
diff --git a/graphics/djvulibre-lib/Makefile b/graphics/djvulibre-lib/Makefile index b5a5615f8e7..18d2d73a115 100644 --- a/graphics/djvulibre-lib/Makefile +++ b/graphics/djvulibre-lib/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.5 2009/01/06 18:03:23 adam Exp $ +# $NetBSD: Makefile,v 1.6 2009/02/20 10:52:56 drochner Exp $ DISTNAME= djvulibre-3.5.21 PKGNAME= djvulibre-lib-3.5.21 +PKGREVISION= 1 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=djvu/} @@ -20,5 +21,13 @@ PKGCONFIG_OVERRIDE+= libdjvu/ddjvuapi.pc.in BUILD_DIRS= libdjvu INSTALL_DIRS= libdjvu +.include "../../mk/bsd.prefs.mk" +.if !empty(MACHINE_PLATFORM:MNetBSD-[5-9]*-i386) && !empty(PKGSRC_COMPILER:Mgcc) +# The library uses Intel atomic intrinsics which don't work with NetBSD's +# default arch setting of "i386" because eg. cmpxchgl is 486+. +# On NetBSD-5+, i386 is desupported so we can safely assume a 486. +CFLAGS+= -march=i486 +.endif + .include "../../graphics/jpeg/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/djvulibre-lib/distinfo b/graphics/djvulibre-lib/distinfo index ab1a07a5c99..354aa9da630 100644 --- a/graphics/djvulibre-lib/distinfo +++ b/graphics/djvulibre-lib/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.5 2009/01/06 18:03:23 adam Exp $ +$NetBSD: distinfo,v 1.6 2009/02/20 10:52:56 drochner Exp $ SHA1 (djvulibre-3.5.21.tar.gz) = a6ef5cb1445baa333883754c703abd75cc5b34f6 RMD160 (djvulibre-3.5.21.tar.gz) = 2163b784d705cc7b55bb3d9c9eb85edec44f28a7 @@ -6,4 +6,4 @@ Size (djvulibre-3.5.21.tar.gz) = 2993718 bytes SHA1 (patch-aa) = c819c6b1218b3178983bb48e53c4d3c0f7dd0227 SHA1 (patch-ab) = 5e8f6d3b925da3a2a09b87a05d2b9564f9c2e7b4 SHA1 (patch-ac) = 0c713031903aade12eda1d898595798a1468fd0a -SHA1 (patch-ad) = 49b1847af0c0fb6d786e7f3c26e415e215928248 +SHA1 (patch-ad) = 66b149594453d70afd47ed03e6067d6356288191 diff --git a/graphics/djvulibre-lib/patches/patch-ad b/graphics/djvulibre-lib/patches/patch-ad index 52c3e7ab630..a38bb96d164 100644 --- a/graphics/djvulibre-lib/patches/patch-ad +++ b/graphics/djvulibre-lib/patches/patch-ad @@ -1,4 +1,4 @@ -$NetBSD: patch-ad,v 1.3 2009/01/06 18:05:07 adam Exp $ +$NetBSD: patch-ad,v 1.4 2009/02/20 10:52:57 drochner Exp $ --- configure.orig 2008-07-03 00:43:52.000000000 +0200 +++ configure @@ -41,3 +41,11 @@ $NetBSD: patch-ad,v 1.3 2009/01/06 18:05:07 adam Exp $ else { echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6; } +@@ -21691,6 +21687,7 @@ main () + __sync_lock_test_and_set(&l,1); + __sync_lock_release(&l); + __sync_add_and_fetch(&l,1); ++ __sync_bool_compare_and_swap(&l,0,1); + return 0; + ; + return 0; |