summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--berkeleydb/db-4.7.25.patch9
-rw-r--r--berkeleydb/makefile.mk5
-rw-r--r--icu/makefile.mk10
-rw-r--r--moz/extractfiles.mk5
-rw-r--r--moz/makefile.mk12
-rw-r--r--neon/neon_exports_unix.patch2
-rw-r--r--neon/neon_exports_win.patch2
-rw-r--r--nss/makefile.mk4
8 files changed, 6 insertions, 43 deletions
diff --git a/berkeleydb/db-4.7.25.patch b/berkeleydb/db-4.7.25.patch
index c97522f62612..8cf412d23e25 100644
--- a/berkeleydb/db-4.7.25.patch
+++ b/berkeleydb/db-4.7.25.patch
@@ -646,7 +646,7 @@
+
--- misc/db-4.7.25.NC/makefile.mk 2009-07-21 11:42:40.000000000 +0200
+++ misc/build/db-4.7.25.NC/makefile.mk 2009-07-21 11:39:26.000000000 +0200
-@@ -1 +1,81 @@
+@@ -1 +1,76 @@
-dummy
+PRJ=..$/..$/..$/..
+PRJNAME=libdb47
@@ -658,11 +658,6 @@
+CFLAGS+=-GS -EHsc -Gy
+
+#LINKFLAGS!:=$(LINKFLAGS:s/NODEFAULTLIB/NOLOGO/)
-+.IF "$(USE_SHELL)"!="4nt"
-+BUILD_ACTION_SEP=;
-+.ELSE # "$(USE_SHELL)"!="4nt"
-+BUILD_ACTION_SEP=^
-+.ENDIF # "$(USE_SHELL)"!="4nt"
+
+CHILDREN= \
+ btree clib common cxx \
@@ -720,7 +715,7 @@
+ALLTAR : $(CHILDREN)
+
+$(CHILDREN) .PHONY :
-+ cd $@ $(BUILD_ACTION_SEP) $(MAKECMD) subdmake=true $(MFLAGS) $(CALLMACROS)
++ cd $@ ; $(MAKECMD) subdmake=true $(MFLAGS) $(CALLMACROS)
+
+.INCLUDE : target.mk
+
diff --git a/berkeleydb/makefile.mk b/berkeleydb/makefile.mk
index eb1ce22a8c4f..963c61a3bbde 100644
--- a/berkeleydb/makefile.mk
+++ b/berkeleydb/makefile.mk
@@ -161,11 +161,6 @@ OUT2INC= \
# make use of stlport headerfiles
EXT_USE_STLPORT=TRUE
-.IF "$(USE_SHELL)"!="4nt"
-BUILD_ACTION_SEP=;
-.ELSE # "$(USE_SHELL)"!="4nt"
-BUILD_ACTION_SEP=^
-.ENDIF # "$(USE_SHELL)"!="4nt"
BUILD_DIR=
BUILD_ACTION=dmake
diff --git a/icu/makefile.mk b/icu/makefile.mk
index e5d0de314e82..70ff42c1a443 100644
--- a/icu/makefile.mk
+++ b/icu/makefile.mk
@@ -87,9 +87,8 @@ icu_CFLAGS+=-O $(ARCH_FLAGS) $(EXTRA_CDEFS)
icu_LDFLAGS+=$(EXTRA_LINKFLAGS)
icu_CXXFLAGS+=-O $(ARCH_FLAGS) $(EXTRA_CDEFS)
-BUILD_ACTION_SEP=;
# remove conversion and transliteration data to reduce binary size.
-CONFIGURE_ACTION=rm data/mappings/ucm*.mk data/translit/trn*.mk $(BUILD_ACTION_SEP)
+CONFIGURE_ACTION=rm data/mappings/ucm*.mk data/translit/trn*.mk ;
# until someone introduces SOLARIS 64-bit builds
.IF "$(OS)"=="SOLARIS"
@@ -186,11 +185,6 @@ OUT2BIN= \
$(BUILD_DIR)$/bin$/gencmn.exe
.ELSE
-.IF "$(USE_SHELL)"=="4nt"
-BUILD_ACTION_SEP=^
-.ELSE
-BUILD_ACTION_SEP=;
-.ENDIF # "$(USE_SHELL)"=="4nt"
BUILD_DIR=source
.IF "full_debug" == ""
@@ -256,7 +250,7 @@ OUT2BIN= \
.IF "$(BINARY_PATCH_FILES)"!=""
$(PACKAGE_DIR)$/so_add_binary : $(PACKAGE_DIR)$/$(ADD_FILES_FLAG_FILE)
- cd $(PACKAGE_DIR) && gunzip -c $(BACK_PATH)$(BINARY_PATCH_FILES) | tar $(TAR_EXCLUDE_SWITCH) -xvf -
+ cd $(PACKAGE_DIR) && gunzip -c $(BACK_PATH)$(BINARY_PATCH_FILES) | tar -xvf -
$(TOUCH) $(PACKAGE_DIR)$/so_add_binary
$(PACKAGE_DIR)$/$(CONFIGURE_FLAG_FILE) : $(PACKAGE_DIR)$/so_add_binary
diff --git a/moz/extractfiles.mk b/moz/extractfiles.mk
index c8d88c015411..dedfade257db 100644
--- a/moz/extractfiles.mk
+++ b/moz/extractfiles.mk
@@ -386,10 +386,6 @@ $(INCCOM)$/nsBuildID.h: $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE)
$(MISC)$/build$/so_moz_include_files: $(INCCOM)$/nsBuildID.h
-.IF "$(USE_SHELL)"=="4nt"
- $(COPY) /QSZ $(INCLUDE_PATH)* $(INCLUDE_DIR)
- $(COPY) /QSZ $(PUBLIC_PATH)* $(INCLUDE_DIR)
-.ELSE
.IF "$(OS)"!="SOLARIS"
$(GNUCOPY) -pRL $(INCLUDE_PATH)* $(INCLUDE_DIR)
$(GNUCOPY) -pRL $(PUBLIC_PATH)* $(INCLUDE_DIR)
@@ -397,7 +393,6 @@ $(MISC)$/build$/so_moz_include_files: $(INCCOM)$/nsBuildID.h
$(COPY) -pr $(INCLUDE_PATH)* $(INCLUDE_DIR)
$(COPY) -pr $(PUBLIC_PATH)* $(INCLUDE_DIR)
.ENDIF # "$(OS)"!="SOLARIS"
-.ENDIF
.IF "$(GUI)"=="UNX"
chmod -R 775 $(INCCOM)
diff --git a/moz/makefile.mk b/moz/makefile.mk
index cd7e3e67997c..050d923c48e7 100644
--- a/moz/makefile.mk
+++ b/moz/makefile.mk
@@ -169,13 +169,7 @@ MOZ_CROSSCOMPILE=CROSS_COMPILE=1 CC="$(CC) -arch $(MOZ_ARCH)" CXX="$(CXX) -arch
CONFIGURE_ACTION=$(null,$(MOZ_ARCH) $(NULL) $(MOZ_CROSSCOMPILE)) ../configure $(MOZILLA_CONFIGURE_FLAGS)
-.IF "$(USE_SHELL)"!="4nt"
BUILD_ACTION:=$(GNUMAKE) -j$(EXTMAXPROCESS)
-.ELSE
-# This construct is needed because unitools.mk defines GNUMAKE using $ENV_TOOLS.
-# $ENV_TOOLS doesn't exist for OOo builds and the cygwin make is needed.
-BUILD_ACTION:=make
-.ENDIF
.IF "$(GUI)"=="UNX"
.IF "$(COMNAME)"=="sunpro5"
@@ -245,7 +239,6 @@ MOZTOOLSINST:=$(MISC)$/build$/moztoolsinst
.ELSE
MOZTOOLS_EXTRACT:=$(MISC)$/build$/moztools
.ENDIF
-.IF "$(USE_SHELL)"!="4nt"
.IF "$(COM)"=="GCC"
MOZ_TOOLS_DOS:=$(shell @cygpath -ad "$(MISC)")\build\moztoolsinst
PATH!:=$(PATH):$(shell @cygpath $(MOZ_TOOLS_DOS))/bin:$(shell @cygpath $(MOZ_TOOLS_DOS))/vc71/bin
@@ -254,11 +247,6 @@ SET_MOZ_TOOLS_INSTALL_BAT:=export "MOZ_TOOLS=$(MOZ_TOOLS_DOS)"
MOZ_TOOLS_DOS:=$(shell @cygpath -ad "$(MISC)")\build\moztools\vc8-moztools
PATH!:=$(shell @cygpath $(MOZ_TOOLS_DOS))/bin:$(PATH)
.ENDIF
-.ELSE # "$(USE_SHELL)"!="4nt"
-# MOZ_TOOLS must contain an absolute path
-MOZ_TOOLS_DOS:=$(shell @echo %@SFN[$(MISC)])\build\moztools\vc8-moztools
-PATH!:=$(MOZ_TOOLS_DOS)\bin;$(PATH)
-.ENDIF # "$(USE_SHELL)"!="4nt"
MOZ_TOOLS:=$(subst,\,/ $(MOZ_TOOLS_DOS))
.IF "$(COM)"=="GCC"
diff --git a/neon/neon_exports_unix.patch b/neon/neon_exports_unix.patch
index 55bdaac7adc4..f5c2ce8afea3 100644
--- a/neon/neon_exports_unix.patch
+++ b/neon/neon_exports_unix.patch
@@ -1,7 +1,7 @@
--- misc/neon-0.29.3/src/exports.map 2009-09-29 10:28:13.531250000 +0200
+++ misc/build/neon-0.29.3/src/exports.map 2009-09-21 12:16:53.453125000 +0200
@@ -0,0 +1,288 @@
-+NEON_0_29_3 {
++UDK_3_0_0 {
+ global:
+ ne__negotiate_ssl;
+ ne__ssl_exit;
diff --git a/neon/neon_exports_win.patch b/neon/neon_exports_win.patch
index 09bc86eebce4..85d73da2b41d 100644
--- a/neon/neon_exports_win.patch
+++ b/neon/neon_exports_win.patch
@@ -1,7 +1,7 @@
--- misc/neon-0.29.3/src/exports.map 2009-09-29 10:28:13.531250000 +0200
+++ misc/build/neon-0.29.3/src/exports.map 2009-09-21 12:16:53.453125000 +0200
@@ -0,0 +1,294 @@
-+NEON_0_29_3 {
++UDK_3_0_0 {
+ global:
+ ne_sspi_authenticate;
+ ne_sspi_clear_context;
diff --git a/nss/makefile.mk b/nss/makefile.mk
index 377017c986c0..78de2a9afbf3 100644
--- a/nss/makefile.mk
+++ b/nss/makefile.mk
@@ -135,12 +135,8 @@ OUT2LIB= \
.ELSE # "$(COM)"=="GCC"
MOZ_MSVCVERSION= 9
.EXPORT : MOZ_MSVCVERSION
-.IF "$(USE_SHELL)"=="4nt"
-PATH!:=$(MOZILLABUILD)/msys/bin;$(MOZILLABUILD)/moztools/bin;$(PATH)
-.ELSE # $(USE_SHELL)"=="4nt"
moz_build:=$(shell cygpath -p $(MOZILLABUILD))
PATH!:=$(moz_build)/msys/bin:$(moz_build)/moztools/bin:$(PATH)
-.ENDIF # $(USE_SHELL)"=="4nt"
.EXPORT : PATH
#Using WINNT will cause at least that nspr4.dll, plc4.dll, plds4.dll
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-03 19:26:06 +0000