Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 22:01:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

integrated patch 'build fix' from bugzilla #328246

Browse Source
This commit is contained in:
nkwan%redhat.com 2006-02-24 19:40:34 +00:00
parent 448a8e27ed
commit 168ad01945
3 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
security/coreconf/location.mk
View File

@ -75,4 +75,12 @@ ifndef NSPR_LIB_DIR
NSPR_LIB_DIR = $(DIST)/lib NSPR_LIB_DIR = $(DIST)/lib
endif endif
ifdef NSS_INCLUDE_DIR
INCLUDES += -I$(NSS_INCLUDE_DIR)
endif
ifndef NSS_LIB_DIR
NSS_LIB_DIR = $(DIST)/lib
endif
MK_LOCATION = included MK_LOCATION = included

3
security/jss/build_java.pl
View File

@ -116,6 +116,7 @@ sub setup_vars {
dump_cmdline_vars(); dump_cmdline_vars();
$ENV{JAVA_HOME} or die "Must specify JAVA_HOME environment variable"; $ENV{JAVA_HOME} or die "Must specify JAVA_HOME environment variable";
$jar = "$ENV{JAVA_HOME}/bin/jar";
$javac = "$ENV{JAVA_HOME}/bin/javac"; $javac = "$ENV{JAVA_HOME}/bin/javac";
$javah = "$ENV{JAVA_HOME}/bin/javah"; $javah = "$ENV{JAVA_HOME}/bin/javah";
$javadoc = "$ENV{JAVA_HOME}/bin/javadoc"; $javadoc = "$ENV{JAVA_HOME}/bin/javadoc";
@ -227,7 +228,7 @@ MyLabel
ensure_dir_exists($class_dir); ensure_dir_exists($class_dir);
print_do("$javac $javac_opt_flag -sourcepath . -d $class_dir " . print_do("$javac $javac_opt_flag -sourcepath . -d $class_dir " .
"$classpath " . join(" ",@source_list)); "$classpath " . join(" ",@source_list));
print_do("sh -c 'pwd && cd $class_dir && pwd && rm -f $class_jar && pwd && ls -al && ls -al ../../dist && jar -cvmf ../../security/jss/$manifest_file $class_jar *'"); print_do("sh -c 'pwd && cd $class_dir && pwd && rm -f $class_jar && pwd && ls -al && ls -al ../../dist && $jar -cvmf ../../security/jss/$manifest_file $class_jar *'");
print_do("rm -f $manifest_file"); print_do("rm -f $manifest_file");
print "Exit status was " . ($?>>8) . "\n"; print "Exit status was " . ($?>>8) . "\n";
} }

15
security/jss/lib/config.mk
View File

@ -59,12 +59,12 @@ RES = $(OBJDIR)/jss.res
RESNAME = jss.rc RESNAME = jss.rc
EXTRA_SHARED_LIBS += \ EXTRA_SHARED_LIBS += \
$(DIST)/lib/nss3.lib \ $(NSS_LIB_DIR)/nss3.lib \
$(DIST)/lib/smime3.lib \ $(NSS_LIB_DIR)/smime3.lib \
$(DIST)/lib/ssl3.lib \ $(NSS_LIB_DIR)/ssl3.lib \
$(DIST)/lib/$(NSPR31_LIB_PREFIX)plc4.lib \ $(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plc4.lib \
$(DIST)/lib/$(NSPR31_LIB_PREFIX)plds4.lib \ $(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plds4.lib \
$(DIST)/lib/$(NSPR31_LIB_PREFIX)nspr4.lib \ $(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)nspr4.lib \
$(JAVA_LIBS) \ $(JAVA_LIBS) \
$(DLLSYSTEM) \ $(DLLSYSTEM) \
$(NULL) $(NULL)
@ -72,10 +72,11 @@ EXTRA_SHARED_LIBS += \
else else
EXTRA_SHARED_LIBS += \ EXTRA_SHARED_LIBS += \
-L$(DIST)/lib \ -L$(NSS_LIB_DIR) \
-lnss3 \ -lnss3 \
-lsmime3 \ -lsmime3 \
-lssl3 \ -lssl3 \
-L$(NSPR_LIB_DIR) \
-lplc4 \ -lplc4 \
-lplds4 \ -lplds4 \
-lnspr4 \ -lnspr4 \