diff options
Diffstat (limited to 'dev-java/jss/files/jss-4.2.5-use_pkg-config.patch')
| -rw-r--r-- | dev-java/jss/files/jss-4.2.5-use_pkg-config.patch | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/dev-java/jss/files/jss-4.2.5-use_pkg-config.patch b/dev-java/jss/files/jss-4.2.5-use_pkg-config.patch index a2c3a3e5ad93..adf2862c90e6 100644 --- a/dev-java/jss/files/jss-4.2.5-use_pkg-config.patch +++ b/dev-java/jss/files/jss-4.2.5-use_pkg-config.patch @@ -6,18 +6,17 @@ 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 +--- a/mozilla/security/coreconf/location.mk ++++ b/mozilla/security/coreconf/location.mk @@ -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)` ++ 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 |