bump and redigest

This commit is contained in:
Mario Fetka
2012-05-20 16:35:34 +02:00
parent 0599900c9b
commit ba957335e8
8 changed files with 289 additions and 0 deletions

View File

@@ -0,0 +1,12 @@
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));
}

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

View File

@@ -0,0 +1,14 @@
https://bugzilla.mozilla.org/show_bug.cgi?id=583666
https://bugs.gentoo.org/show_bug.cgi?id=327619
--- security/coreconf/Linux.mk
+++ security/coreconf/Linux.mk
@@ -174,7 +174,7 @@
ARCH = linux
DSO_CFLAGS = -fPIC
-DSO_LDOPTS = -shared $(ARCHFLAG) -Wl,-z,defs
+DSO_LDOPTS = $(LDFLAGS) -shared $(ARCHFLAG) -Wl,-z,defs
DSO_LDFLAGS =
LDFLAGS += $(ARCHFLAG)