Gentoo Archives: gentoo-commits

From: "Petteri Raty (betelgeuse)" <betelgeuse@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-java/jss/files: jss-4.2.5-use_pkg-config.patch
Date: Sun, 04 May 2008 22:56:42
Message-Id: E1Jsn8J-00069a-Ii@stork.gentoo.org
1 betelgeuse 08/05/04 22:56:39
2
3 Added: jss-4.2.5-use_pkg-config.patch
4 Log:
5 Version bump. Fixes bug #189443. Thanks to Mario Fetka <mario-fetka@×××.at>.
6 (Portage version: 2.1.5_rc6)
7
8 Revision Changes Path
9 1.1 dev-java/jss/files/jss-4.2.5-use_pkg-config.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/jss/files/jss-4.2.5-use_pkg-config.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/jss/files/jss-4.2.5-use_pkg-config.patch?rev=1.1&content-type=text/plain
13
14 Index: jss-4.2.5-use_pkg-config.patch
15 ===================================================================
16 Submitted By: Mario Fetka (mario-fetka at gmx dot at)
17 Date: 2007-10-06
18 Initial Package Version: 4.2.5
19 Origin: me
20 Upstream Status: #392775 UNCONFIRMED
21 Description: this patch adds pkgconfig support to jss coreconf
22 !!!! no check for NSS_PKGCONFIG NSPR_PKGCONFIG at the moment !!!!
23
24 diff -Naur mozilla.orig/security/coreconf/location.mk mozilla/security/coreconf/location.mk
25 --- mozilla.orig/security/coreconf/location.mk 2006-02-27 21:18:31.000000000 +0000
26 +++ mozilla/security/coreconf/location.mk 2007-10-06 10:10:17.000000000 +0000
27 @@ -67,6 +67,13 @@
28
29 GARBAGE += $(DEPENDENCIES) core $(wildcard core.[0-9]*)
30
31 +ifdef USE_PKGCONFIG
32 + NSPR_INCLUDE_DIR = `pkg-config --variable=includedir $(NSPR_PKGCONFIG)`
33 + NSPR_LIB_DIR = `pkg-config --variable=libdir $(NSPR_PKGCONFIG)`
34 + NSS_INCLUDE_DIR = `pkg-config --variable=includedir $(NSS_PKGCONFIG)`
35 + NSS_LIB_DIR = `pkg-config --variable=libdir $(NSS_PKGCONFIG)`
36 +endif
37 +
38 ifdef NSPR_INCLUDE_DIR
39 INCLUDES += -I$(NSPR_INCLUDE_DIR)
40 endif
41
42
43
44 --
45 gentoo-commits@l.g.o mailing list