Delete jss as already in tree
git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/linamh@458 6952d904-891a-0410-993b-d76249ca496b
This commit is contained in:
@@ -1,12 +0,0 @@
|
||||
diff -Nru jss-3.4-src/mozilla/security/jss/build_java.pl jss-3.4-src.patched/mozilla/security/jss/build_java.pl
|
||||
--- jss-3.4-src/mozilla/security/jss/build_java.pl 2002-10-17 02:33:29.000000000 +0200
|
||||
+++ jss-3.4-src.patched/mozilla/security/jss/build_java.pl 2006-08-15 00:53:05.000000000 +0200
|
||||
@@ -190,7 +190,7 @@
|
||||
#
|
||||
if( scalar(@source_list) > 0 ) {
|
||||
ensure_dir_exists($class_dir);
|
||||
- print_do("$javac $javac_opt_flag -sourcepath . -d $class_dir " .
|
||||
+ print_do("$javac $ENV{JAVA_GENTOO_OPTS} $javac_opt_flag -sourcepath . -d $class_dir " .
|
||||
"$classpath " . join(" ",@source_list));
|
||||
}
|
||||
|
||||
@@ -1,23 +0,0 @@
|
||||
Index: security/jss/lib/config.mk
|
||||
===================================================================
|
||||
RCS file: /cvsroot/mozilla/security/jss/lib/config.mk,v
|
||||
retrieving revision 1.19
|
||||
diff -u -r1.19 config.mk
|
||||
--- mozilla/security/jss/lib/config.mk 25 Apr 2004 15:02:19 -0000 1.19
|
||||
+++ mozilla/security/jss/lib/config.mk 30 Jan 2007 21:08:06 -0000
|
||||
@@ -72,14 +72,7 @@
|
||||
else
|
||||
|
||||
EXTRA_SHARED_LIBS += \
|
||||
- -L$(NSS_LIB_DIR) \
|
||||
- -lnss3 \
|
||||
- -lsmime3 \
|
||||
- -lssl3 \
|
||||
- -L$(NSPR_LIB_DIR) \
|
||||
- -lplc4 \
|
||||
- -lplds4 \
|
||||
- -lnspr4 \
|
||||
+ `pkg-config --libs nss` \
|
||||
$(JAVA_LIBS) \
|
||||
$(NULL)
|
||||
|
||||
@@ -1,25 +0,0 @@
|
||||
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
|
||||
Reference in New Issue
Block a user