diff options
| author | tnn <tnn@pkgsrc.org> | 2010-01-16 15:04:32 +0000 |
|---|---|---|
| committer | tnn <tnn@pkgsrc.org> | 2010-01-16 15:04:32 +0000 |
| commit | acf54f151efdb361d4e02dbda6a0975772e0beb6 (patch) | |
| tree | 204fd415fe6d58efd6239370f3b10752570d2082 /lang | |
| parent | cbf26db93525e23c0593acc408045a87186cda69 (diff) | |
| download | pkgsrc-acf54f151efdb361d4e02dbda6a0975772e0beb6.tar.gz | |
use pkg-config to locate nspr
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/spidermonkey/Makefile | 6 | ||||
| -rw-r--r-- | lang/spidermonkey/distinfo | 4 | ||||
| -rw-r--r-- | lang/spidermonkey/files/pkgsrc.mk | 2 | ||||
| -rw-r--r-- | lang/spidermonkey/patches/patch-ae | 6 |
4 files changed, 9 insertions, 9 deletions
diff --git a/lang/spidermonkey/Makefile b/lang/spidermonkey/Makefile index 18d6c41ae64..35c3e40308e 100644 --- a/lang/spidermonkey/Makefile +++ b/lang/spidermonkey/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.18 2009/05/20 00:58:20 wiz Exp $ +# $NetBSD: Makefile,v 1.19 2010/01/16 15:04:32 tnn Exp $ DISTNAME= js-1.60 PKGNAME= ${DISTNAME:S/js/spidermonkey/} -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= lang MASTER_SITES= ${MASTER_SITE_MOZILLA:=js/} @@ -17,7 +17,7 @@ WRKSRC= ${WRKDIR}/js/src MAKE_JOBS_SAFE= no NO_CONFIGURE= yes -USE_TOOLS+= gmake +USE_TOOLS+= gmake pkg-config MAKE_FILE= Makefile.ref CFLAGS+= -DJS_USE_FDLIBM_MATH=0 diff --git a/lang/spidermonkey/distinfo b/lang/spidermonkey/distinfo index 41099ef7a80..3ffb322fe7a 100644 --- a/lang/spidermonkey/distinfo +++ b/lang/spidermonkey/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.9 2007/08/12 03:04:32 wiz Exp $ +$NetBSD: distinfo,v 1.10 2010/01/16 15:04:32 tnn Exp $ SHA1 (js-1.60.tar.gz) = db1457c28d2a55080520d7565a2c271eb1599064 RMD160 (js-1.60.tar.gz) = 630e0f5606d9cc398daa41e71ca3f98c04e3aed2 @@ -7,7 +7,7 @@ SHA1 (patch-aa) = bdd0e741483c5261837948b288c68d040c95e2a9 SHA1 (patch-ab) = 1ea712aa7a8d2d48acf4980db3df74f70e616252 SHA1 (patch-ac) = 75ccc29f5075d95b087b28dba25fb8ee78cee706 SHA1 (patch-ad) = ca651bfc31b5ad06e45010d40309121c7300807a -SHA1 (patch-ae) = 928b2f441fe026538f3d1281a725dd362d1c11ed +SHA1 (patch-ae) = 5ac0c7013fe4290fc770c91bc2db438f17481f5e SHA1 (patch-af) = 353a2b119f56974cc1ae0c2a646d014c075eb5fd SHA1 (patch-ah) = a8a486353bc164cff0ba57efc6ad4e82ff339e3e SHA1 (patch-ai) = 5835ce03309d45f607a1613062b609e39cc1b974 diff --git a/lang/spidermonkey/files/pkgsrc.mk b/lang/spidermonkey/files/pkgsrc.mk index e2df0b59a9c..611acb89892 100644 --- a/lang/spidermonkey/files/pkgsrc.mk +++ b/lang/spidermonkey/files/pkgsrc.mk @@ -48,7 +48,7 @@ OS_CFLAGS= -DJS_THREADSAFE -DXP_UNIX -DSVR4 OS_CFLAGS+= -DSYSV -D_BSD_SOURCE -DPOSIX_SOURCE # -DHAVE_LOCALTIME_R RANLIB = echo -MKSHLIB = $(LD) -lm -lplds4 -lplc4 -lnspr4 -shared $(LDFLAGS) $(XMKSHLIBOPTS) +MKSHLIB = $(LD) -lm `pkg-config --libs nspr` -shared $(LDFLAGS) $(XMKSHLIBOPTS) #.c.o: # $(CC) -c -MD $*.d $(CFLAGS) $< diff --git a/lang/spidermonkey/patches/patch-ae b/lang/spidermonkey/patches/patch-ae index b7f66733ae3..9394c2d76f0 100644 --- a/lang/spidermonkey/patches/patch-ae +++ b/lang/spidermonkey/patches/patch-ae @@ -1,6 +1,6 @@ -$NetBSD: patch-ae,v 1.2 2007/08/12 03:04:33 wiz Exp $ +$NetBSD: patch-ae,v 1.3 2010/01/16 15:04:32 tnn Exp $ ---- Makefile.ref.orig 2006-08-21 14:58:45.000000000 -0400 +--- Makefile.ref.orig 2006-08-21 18:58:45.000000000 +0000 +++ Makefile.ref @@ -55,8 +55,6 @@ include config.mk @@ -17,7 +17,7 @@ $NetBSD: patch-ae,v 1.2 2007/08/12 03:04:33 wiz Exp $ # -CFLAGS += $(OPTIMIZER) $(OS_CFLAGS) $(DEFINES) $(INCLUDES) $(XCFLAGS) +CFLAGS += -L$(PREFIX)/lib $(OPTIMIZER) $(OS_CFLAGS) $(DEFINES) \ -+ $(INCLUDES) $(XCFLAGS) ++ $(INCLUDES) $(XCFLAGS) `pkg-config --cflags nspr` LDFLAGS = $(XLDFLAGS) |