dbp/linamh
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

dev-java/jss: add different way to solve the pkg-config problem & correct the slot back to 3.4

Browse Source 
git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/linamh@189 6952d904-891a-0410-993b-d76249ca496b
This commit is contained in:
geos_one
2007-10-06 10:29:25 +00:00
parent c7330a31b9
commit a77359ac96
6 changed files with 58 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
dev-java/jss/files/digest-jss-4.2.5 → dev-java/jss/files/digest-jss-4.2.5-r1
View File

25
dev-java/jss/files/jss-4.2.5-use_pkg-config.patch Normal file
View File

@@ -0,0 +1,25 @@
Submitted By: Mario Fetka (mario-fetka at gmx dot at)
Date: 2007-10-06
Initial Package Version: 4.2.5
Origin: me
Upstream Status: #392775 UNCONFIRMED
Description: this patch adds pkgconfig support to jss coreconf
!!!! no check for NSS_PKGCONFIG NSPR_PKGCONFIG at the moment !!!!
diff -Naur mozilla.orig/security/coreconf/location.mk mozilla/security/coreconf/location.mk
--- mozilla.orig/security/coreconf/location.mk 2006-02-27 21:18:31.000000000 +0000
+++ mozilla/security/coreconf/location.mk 2007-10-06 10:10:17.000000000 +0000
@@ -67,6 +67,13 @@
GARBAGE += $(DEPENDENCIES) core $(wildcard core.[0-9]*)
+ifdef USE_PKGCONFIG
+ NSPR_INCLUDE_DIR = `pkg-config --variable=includedir $(NSPR_PKGCONFIG)`
+ NSPR_LIB_DIR = `pkg-config --variable=libdir $(NSPR_PKGCONFIG)`
+ NSS_INCLUDE_DIR = `pkg-config --variable=includedir $(NSS_PKGCONFIG)`
+ NSS_LIB_DIR = `pkg-config --variable=libdir $(NSS_PKGCONFIG)`
+endif
+
ifdef NSPR_INCLUDE_DIR
INCLUDES += -I$(NSPR_INCLUDE_DIR)
endif