Граф коммитов

292 Коммитов

Автор SHA1 Сообщение Дата
neil.williams%sun.com d8061f8758 Back out previous patch 2007-05-08 01:31:24 +00:00
neil.williams%sun.com 5c0bfb4f55 Bug 82268, Builds use wrong version of perl
r=Christophe, Nelson
2007-05-07 21:36:04 +00:00
nelson%bolyard.com 2e606b1d8e Bug 370062 � nss build changes for OpenBSD, r=nelson,wtc
patches contributed by Martynas Venckus <martynas@openbsd.org>
2007-05-06 08:06:25 +00:00
nelson%bolyard.com 8de90ec018 Bug 371685 � allow unsupported critical extensions in special builds.
r=rrelyea,wtc
2007-05-04 05:15:43 +00:00
wtchang%redhat.com 743c1a5216 Bug 317323: Set NSPR31_LIB_PREFIX to empty explicitly for WIN95 and WINCE
builds.  r=nelsonb
Modified files: WIN954.0.mk WINCE3.0.mk
2007-02-22 23:13:58 +00:00
wtchang%redhat.com 217011483f Bug 232600: use the same linker flags for programs as for DLLs when doing
optimized builds with MOZ_DEBUG_SYMBOLS=1. r=nelsonb
2007-01-14 02:54:49 +00:00
nelson%bolyard.com b20a16af29 Bug 232600. Define MOZ_DEBUG_SYMBOLS in environment to create .pdb files
and install them in $DIST.   r=rrelyea,wtchang
2007-01-06 05:47:10 +00:00
wtchang%redhat.com 0ed608db45 Bugzilla Bug 351246: Load memory into Highmem on OS/2. The patch is
contributed by Peter Weilbacher <mozilla@Weilbacher.org>. r=wtc,kaply
2007-01-05 22:10:04 +00:00
nelson%bolyard.com 53f8f14efb Bug 256046. Don't prefix with $(JAVA_DESTPATH)/ if it's undefined.
r=Glen.beasley,neil.williams
2007-01-03 13:07:47 +00:00
wtchang%redhat.com c2805bff1d Bugzilla Bug 361077: removed commented-out code. r=christophe.ravel 2006-12-07 18:31:49 +00:00
wtchang%redhat.com 7f10b9b9eb Bugzilla Bug 361077: fixed the bug that HP-UXB.11.*.mk test USE_PTHREADS
before it is set.  Since we always use pthreads now, we can unconditionally
add -D_POSIX_C_SOURCE=199506L to OS_CFLAGS in HP-UXB.11.mk.
r=christophe.ravel
Modified Files:
	HP-UXB.11.00.mk HP-UXB.11.11.mk HP-UXB.11.20.mk
	HP-UXB.11.22.mk HP-UXB.11.23.mk HP-UXB.11.mk
2006-12-07 18:28:40 +00:00
wtchang%redhat.com b033b4ec3c Bugzilla Bug 345482: changed abspath to core_abspath to avoid conflict with
the built-in abspath function of GNU make 3.81.  The patch is contributed
by Benjamin Smedberg <benjamin@smedbergs.us>. r=wtc,christophe.ravel
Modified Files:
	coreconf/rules.mk nss/cmd/shlibsign/Makefile
	nss/lib/freebl/Makefile nss/lib/pk11wrap/Makefile
2006-12-07 01:57:18 +00:00
wtchang%redhat.com 0bf075b1e2 Bugzilla Bug 361076: removed code that handled multiple NSPR threading
implementations.  We only use the pthreads-based implementation now.
r=christophe.ravel.
2006-11-17 21:57:14 +00:00
nelson%bolyard.com 0ee53bb38c Bug 353475. When building NSS with MSVC 2005, use the "mt" command to
embed the manifest files into the executables and DLLs.
Patch contributed by Allan Beaufour <allan@beaufour.dk>, r=nelson,wtchang
2006-10-01 06:48:25 +00:00
wtchang%redhat.com db1cf9f37e Bugzilla Bug 325148: worked around the change of backslash-newline behavior
inside single-quoted strings in GNU make 3.81.  The patch is contributed by
Pawel Chmielowski <prefiks@aviary.pl>. r=benjamin.smedberg,wtc.
2006-08-15 21:35:25 +00:00
wtchang%redhat.com 8cf22abb57 Bugzilla Bug 316369: support building JSS on Mac OS X. The patch is
contributed by Nathin Kinder <nkinder@redhat.com>. r=wtc.
Modified files: coreconf/jdk.mk jss/lib/config.mk
2006-08-05 01:27:41 +00:00
julien.pierre.bugs%sun.com 604d865157 Fix for bug 335748 . Add NSS_ENABLE_ECC and NSS_ECC_MORE_THAN_SUITE_B build macros. r=nelson, rrelyea 2006-06-26 21:16:54 +00:00
wtchang%redhat.com 186930c8cf Bugzilla Bug 337887: use the -mnop-fun-dllimport flag so that we can use
a pointer to a function declared with the dllimport attribute as a constant
address.  We need to use such function pointers to initialize a const
structure in nss/lib/ssl/sslsock.c.  The patch is contributed by Chris
Seawood <cls@seawood.org>.  r=wtc.
2006-05-17 16:37:59 +00:00
wtchang%redhat.com cc75ab1cb9 Bugzilla bug 335275: compile with the GCC flag
-Werror-implicit-function-declaration. r=nelsonb.
Modified files: Linux.mk SunOS5.mk
2006-04-24 20:07:15 +00:00
julien.pierre.bugs%sun.com abf63f3923 Fix for bug 315793 . Wan-Teh's feedback for PWD 2006-04-07 04:10:28 +00:00
julien.pierre.bugs%sun.com b79555f358 Fix for bug 315793 . Make shlibsign run in the OBJDIR rather than the source directory . r=nelson 2006-04-06 06:22:02 +00:00
wtchang%redhat.com 1f27da68d4 Bugzilla bug 327855: OS2 GCC build should define XP_OS2_EMX for NSPR
headers.  Removed a duplicate XP_OS2 definition. r=Peter Weilbacher and
Julien Pierre.
2006-02-28 21:34:29 +00:00
nkwan%redhat.com d3491803d2 integrated patch 'build fix' from bugzilla #328246 2006-02-24 19:40:34 +00:00
wtchang%redhat.com 1a8b4bd028 Bugzilla bug 322578: support ppc<->x86 cross builds for Mac OS X. The
patch is contributed by Mark Mentovai <mark@moxienet.com>.  r=wtc.
2006-02-22 22:26:34 +00:00
wtchang%redhat.com de87a39bcf Bugzilla Bug 323977: use the "mapfile" (ld version script) on FreeBSD.
Build the freebl shared libraries with the -Bsymbolic flag for GNU ld.
r=nelsonb.  Thanks to Glenn Randers-Pehrson <glennrp@imagemagick.org> for
reporting this bug and verifying these changes.
Modified files: coreconf/FreeBSD.mk nss/lib/freebl/Makefile
2006-01-21 02:33:33 +00:00
wtchang%redhat.com 24734ea6fb Bugzilla Bug 317858: gcc on Linux/ppc doesn't recognize the -z defs linker
flag, so we need to use -Wl to pass it to the linker. r=caillon.
2006-01-13 17:24:13 +00:00
wtchang%redhat.com 24416549b6 Bugzilla Bug 321865: added coreconf files for Solaris 11. The patch is
contributed by Alfred Peng <alfred.peng@sun.com>. r=wtc.
Added files: SunOS5.11.mk SunOS5.11_i86pc.mk
2006-01-03 23:02:11 +00:00
wtchang%redhat.com 36c9d7bd15 Bugzilla Bug 312202: use the _32 tag in 32-bit HP-UX IPF builds. Use the
$ORIGIN linker keyword when building shared libraries and executable
programs on HP-UX IPF. r=nelsonb.
Modified Files: coreconf/HP-UX.mk nss/cmd/platlibs.mk
2005-11-15 18:19:18 +00:00
julien.pierre.bugs%sun.com 97b61a9ea6 Remove dead files. r=wtchang 2005-11-04 01:02:50 +00:00
sandeep.konchady%sun.com bf76f2aab1 Bugzilla id: 314583, removed linking of JVM to JSS library and replaced
reference to classes.zip with rt.jar.
2005-11-03 00:11:59 +00:00
wtchang%redhat.com e955d37c8b Bugzilla bug 314089: On HP-UX, use rt.jar instead of classes.zip; for JDK
1.4 or later use the "server" JVM.  Fixed an error in the pathname of
rt.jar for Linux. r=sandeep.konchady.
2005-10-28 00:20:38 +00:00
wtchang%redhat.com 151cfa866e Bugzilla Bug 302212: set DARWIN_SDK_DSOFLAGS and pass -F arguments to ld
when GCC <= 3.  Contributed by Mark Mentovai <mark@moxienet.com>. r=wtc.
2005-10-28 00:06:56 +00:00
wtchang%redhat.com d0fa45f6e1 Bugzilla Bug 302212: allow Mac OS X x86 builds to target SDKs. The patch
is contributed by Mark Mentovai <mark@moxienet.com>. r=wtc,joshmoz.
2005-10-26 17:00:07 +00:00
wtchang%redhat.com 26fa27cb5e Bugzilla bug 312774: support building with IBM JDK on Linux. Added -L
linker flags for IBM JDK's pathnames.  The patch is contributed by Rich
Megginson of Red Hat. r=wtc,glen.beasley.
2005-10-18 22:36:19 +00:00
wtchang%redhat.com e43c3ce2ce Bugzilla Bug 312202: checked in HP-UX IPF (Itanium) porting changes
contributed by Grace Lu of HP.  Use the .so suffix for shared libraries
on HP-UX IPF.  Support building on HP-UX B.11.23. r=wtc.
Modified Files:
	coreconf/HP-UX.mk nss/lib/nss/nssinit.c
Added Files:
	coreconf/HP-UXB.11.23.mk
2005-10-12 19:04:13 +00:00
wtchang%redhat.com f71abec372 Bugzilla Bug 311074: cvs removed the unused nfspwd.pl script (which only
worked on the old Netscape intranet). r=relyea.
Modified Files: OS2.mk command.mk rules.mk
Removed Files: nsinstall/nfspwd nsinstall/nfspwd.pl
2005-10-10 23:46:13 +00:00
wtchang%redhat.com 106649493f Bugzilla Bug 311074: removed the unused nfspwd Perl script from TARGETS,
which caused "gmake clean" to break on a read-only source tree.  The patch
is contributed by Benjamin Smedberg <benjamin@smedbergs.us>. r=wtc.
2005-10-05 22:25:37 +00:00
wtchang%redhat.com c641f2799f Bugzilla Bug 310336: support building on Windows Server 2003.
r=Sandeep.Konchady.
2005-09-28 23:14:44 +00:00
wtchang%redhat.com ef4eb9a0e4 Bugzilla Bug 303508: enhanced the makefile rule for $(MAPFILE). Added
the new variable MAPFILE_SOURCE instead of the hardcoded
$(LIBRARY_NAME).def to represent the "source" mapfile, and use $< to
refer to the "source" mapfile (prerequisite of the target) in
PROCESS_MAP_FILE. r=nelsonb.
Modified Files:
	AIX.mk BSD_OS.mk Darwin.mk FreeBSD.mk HP-UX.mk IRIX.mk
	Linux.mk Linux2.1.mk Linux2.2.mk Linux2.4.mk Linux2.5.mk
	Linux2.6.mk NCR3.0.mk NEC4.2.mk NetBSD.mk OS2.mk OSF1.mk
	OpenUNIX.mk OpenVMS.mk ReliantUNIX.mk SCO_SV3.2.mk SunOS5.mk
	UNIXWARE2.1.mk WIN16.mk WIN32.mk WINCE.mk rules.mk ruleset.mk
2005-09-16 17:09:23 +00:00
sandeep.konchady%sun.com 4bb21db05f Modified import.pl, jdk.mk and release.pl under coreconf and all.pl under
jss test directory for bug #302550.  Attached below is the diff of the
changes done to these files.

Index: coreconf/import.pl
===================================================================
RCS file: /cvsroot/mozilla/security/coreconf/import.pl,v
retrieving revision 1.2
diff -u -r1.2 import.pl
--- coreconf/import.pl  25 Apr 2004 15:02:17 -0000      1.2
+++ coreconf/import.pl  15 Sep 2005 18:37:51 -0000
@@ -46,7 +46,6 @@

 #######-- read in variables on command line into %var

-$var{ZIP} = "zip";
 $var{UNZIP} = "unzip -o";

 &parse_argv;
Index: coreconf/jdk.mk
===================================================================
RCS file: /cvsroot/mozilla/security/coreconf/jdk.mk,v
retrieving revision 1.14
diff -u -r1.14 jdk.mk
--- coreconf/jdk.mk     25 Apr 2004 15:02:17 -0000      1.14
+++ coreconf/jdk.mk     15 Sep 2005 18:37:52 -0000
@@ -123,14 +123,14 @@

 # set [Sun Solaris] platforms
 ifeq ($(OS_ARCH), SunOS)
-       JAVA_CLASSES = $(JAVA_HOME)/lib/classes.zip
+       JAVA_CLASSES = $(JAVA_HOME)/jre/lib/rt.jar

        ifeq ($(JRE_HOME),)
                JRE_HOME = $(JAVA_HOME)
                JRE_CLASSES = $(JAVA_CLASSES)
        else
                ifeq ($(JRE_CLASSES),)
-                       JRE_CLASSES = $(JRE_HOME)/lib/classes.zip
+                       JRE_CLASSES = $(JRE_HOME)/lib/rt.jar
                endif
        endif

@@ -144,9 +144,13 @@

        # (3) specify "linker" information
 ifeq ($(USE_64), 1)
-       JAVA_CPU = $(shell uname -p)v9
+       ifeq ($(CPU_ARCH), x86_64)
+               JAVA_CPU = amd64
+       else
+               JAVA_CPU := $(shell uname -p)v9
+       endif
 else
-       JAVA_CPU = $(shell uname -p)
+       JAVA_CPU := $(shell uname -p)
 endif

 ifeq ($(JDK_VERSION), 1.1)
@@ -163,8 +167,6 @@
 ifneq ($(JDK_VERSION), 1.1)
 ifeq ($(USE_64), 1)
        JAVA_LIBS += -L$(JAVA_HOME)/$(JAVA_LIBDIR)/server
-else
-       JAVA_LIBS += -L$(JAVA_HOME)/$(JAVA_LIBDIR)/classic
 endif
        JAVA_LIBS += -L$(JAVA_HOME)/$(JAVA_LIBDIR)
        JAVA_LIBS += -ljvm -ljava
@@ -220,14 +222,14 @@

 # set [Redhat Linux] platforms
 ifeq ($(OS_ARCH), Linux)
-       JAVA_CLASSES = $(JAVA_HOME)/lib/classes.zip
+       JAVA_CLASSES = $(JAVA_HOME)/jre/lib/rt.jar

        ifeq ($(JRE_HOME),)
                JRE_HOME = $(JAVA_HOME)
                JRE_CLASSES = $(JAVA_CLASSES)
        else
                ifeq ($(JRE_CLASSES),)
-                       JRE_CLASSES = $(JRE_HOME)/lib/classes.zip
+                       JRE_CLASSES = $(JRE_HOME)/jre/lib/rt.jar
                endif
        endif

@@ -241,16 +243,21 @@

        # (3) specify "linker" information
        JAVA_CPU = i386
-
+       ifeq ($(CPU_ARCH),x86_64)
+               ifeq ($(USE_64), 1)
+                       JAVA_CPU = amd64
+               else
+                       JAVA_CPU = i386
+               endif
+       endif
        JAVA_LIBDIR = jre/lib/$(JAVA_CPU)

        JAVA_CLIBS =

         ifeq ($(JDK_VERSION), 1.4)
-           JAVA_LIBS += -L$(JAVA_HOME)/$(JAVA_LIBDIR)/server -ljvm
-        else
-           JAVA_LIBS += -L$(JAVA_HOME)/$(JAVA_LIBDIR)/classic -ljvm
+               JAVA_LIBS += -L$(JAVA_HOME)/$(JAVA_LIBDIR)/server -ljvm
        endif
+
        JAVA_LIBS += -L$(JAVA_HOME)/$(JAVA_LIBDIR) -ljava
        JAVA_LIBS += $(JAVA_CLIBS)

Index: coreconf/release.pl
===================================================================
RCS file: /cvsroot/mozilla/security/coreconf/release.pl,v
retrieving revision 1.3
diff -u -r1.3 release.pl
--- coreconf/release.pl 25 Apr 2004 15:02:17 -0000      1.3
+++ coreconf/release.pl 15 Sep 2005 18:37:52 -0000
@@ -41,7 +41,14 @@

 #######-- read in variables on command line into %var

-$var{ZIP} = "zip";
+$use_jar = 1;
+$ZIP     = "$ENV{JAVA_HOME}/bin/jar";
+
+if ( $ENV{JAVA_HOME} eq "" ) {
+    $ZIP      = "zip";
+    $use_jar  = 0;
+}
+

 &parse_argv;

@@ -56,11 +63,15 @@

     ($jardir,$jaropts) = split(/\|/,$jarinfo);

-    $zipoptions = "-T";
-    if ($jaropts =~ /a/) {
-       if ($var{OS_ARCH} eq 'WINNT') {
-           $zipoptions .= ' -ll';
-       }
+    if ( $use_jar ) {
+        $zipoptions = "-cvf";
+    } else {
+        $zipoptions = "-T -r";
+        if ($jaropts =~ /a/) {
+            if ($var{OS_ARCH} eq 'WINNT') {
+                $zipoptions .= ' -ll';
+            }
+        }
     }

 # just in case the directory ends in a /, remove it
@@ -117,8 +128,8 @@
        }
        closedir(DIR);

-       print STDERR "zip $zipoptions -r $jarfile $filelist\n";
-       system("zip $zipoptions -r $jarfile $filelist");
+       print STDERR "$ZIP $zipoptions $jarfile $filelist\n";
+       system("$ZIP $zipoptions $jarfile $filelist");
        rmdir("META-INF");
            for $i (1 .. $dirdepth) {
            chdir("..");
Index: jss/org/mozilla/jss/tests/all.pl
===================================================================
RCS file: /cvsroot/mozilla/security/jss/org/mozilla/jss/tests/all.pl,v
retrieving revision 1.22
diff -u -r1.22 all.pl
--- jss/org/mozilla/jss/tests/all.pl    6 Sep 2005 17:57:40 -0000       1.22
+++ jss/org/mozilla/jss/tests/all.pl    15 Sep 2005 18:37:54 -0000
@@ -136,12 +136,26 @@
         exit(1);
     }

+    #
+    # Use 64-bit Java on AMD64.
+    #
+
     $java = "$ENV{JAVA_HOME}/jre/bin/java$exe_suffix";
+    my $java_64bit = 0;
+    if ($osname eq "SunOS") {
+       if ($ENV{USE_64}) {
+           my $cpu = `/usr/bin/isainfo -n`;
+           if ($cpu == "amd64") {
+               $java = "$ENV{JAVA_HOME}/jre/bin/amd64/java$exe_suffix";
+               $java_64bit = 1;
+           }
+       }
+    }
     (-f $java) or die "'$java' does not exist\n";
     $java = $java . $ENV{NATIVE_FLAG};

-    if ($ENV{USE_64}) {
-        $java = $java . " -d64";
+    if ($ENV{USE_64} && !$java_64bit) {
+       $java = $java . " -d64";
     }

     $pwfile = "passwords";
2005-09-16 00:33:23 +00:00
saul.edwards%sun.com 046c62d43f Bug 303508: Add freebl shared libs that do 64-bit integer math. Bug 274984: softoken fails to load freebl in setuid programs. freebl becomes a shared library on all platforms. r=nelson
Modified Files:
	coreconf/HP-UXB.11.mk coreconf/SunOS5.mk
	nss/cmd/shlibsign/Makefile nss/cmd/shlibsign/manifest.mn
	nss/lib/freebl/Makefile nss/lib/freebl/arcfour.c
	nss/lib/freebl/blapi.h nss/lib/freebl/config.mk
	nss/lib/freebl/ldvector.c nss/lib/freebl/loader.c
	nss/lib/freebl/loader.h nss/lib/freebl/manifest.mn
Added Files:
	nss/lib/freebl/freebl.def
2005-09-07 02:47:16 +00:00
wtchang%redhat.com 51ef3c3c86 Bugzilla Bug 303507: changed GCC's default OPTIMIZER back to -O2.
r=saul.edwards.
2005-09-02 00:59:00 +00:00
julien.pierre.bugs%sun.com 2ffa7acc60 Fix for 297802 . r=wtchang . Add $(OS_LIBS) to MKSHLIB rules.
Add -z defs linker option for Solaris and Linux .
Also add -z ignore on Solaris .
2005-08-26 02:17:05 +00:00
wtchang%redhat.com 94441eaca9 Bugzilla bug 302212: backed out the previous checkin. The corresponding
Mozilla patch hasn't been checked in yet.
2005-08-25 23:23:40 +00:00
saul.edwards%sun.com ca3db23c1b Addendum to 303507 - set default OPTIMIZER for Linux and Solaris gcc builds
to -O3, consolidate flags to Linux.mk.
2005-08-24 23:58:36 +00:00
wtchang%redhat.com fcf4d7234a Bugzilla bug 302670: backed out the use of system zlib because some Linux
distributions are using zlib 1.1.4, which causes our signtool tests to
fail intermittently.  Don't know why.
2005-08-20 01:05:44 +00:00
wtchang%redhat.com e06cb45930 Bugzilla Bug 266123: support 64-bit PowerPC builds for Linux distributions
(such as Red Hat and Fedora) whose GCC generates 32-bit code by default.
r=cls.
2005-08-18 17:48:26 +00:00
wtchang%redhat.com 972d589547 Bugzilla Bug 302670: enable NSS to use system zlib and do that on Linux.
r=nelsonb.
Modified Files:
	coreconf/Linux.mk nss/cmd/Makefile nss/cmd/manifest.mn
	nss/cmd/platlibs.mk
2005-08-16 01:08:59 +00:00
wtchang%redhat.com cf5e252283 Bugzilla Bug 302212: enable Mac OS X x86 builds to target SDKs. The patch
is contributed by Mark Mentovai <mark@moxienet.com>. r=wtc.
2005-08-15 22:44:22 +00:00
wtchang%redhat.com bd99a181d7 Bugzilla Bug 266123: added ppc64 support. The patch is contributed by
Markus Rothe <markus@unixforces.net>. r=wtc.
2005-08-09 22:31:24 +00:00