Skip to content

C
core
Kaydet (Commit) 373d873c authored tarafından Caolán McNamara's avatar Caolán McNamara
Dosyalara gözat
Seçenekler

defuzz patch to apply again 

Change-Id: I0b2253d3e23f6f2ec77c8aca88897144c59507a3
üst 322ee027
Hide whitespace changes
Inline Side-by-side
Showing with 73 additions and 73 deletions
liblangtag/liblangtag-0.5.1-mingw.patch
Dosyayı görüntüle @ 373d873c
--- misc/liblangtag-0.4.0/liblangtag/lt-ext-module.c 2012-10-16 04:48:31.000000000 +0200 --- misc/liblangtag-0.4.0/liblangtag/lt-ext-module.c 2013-06-14 15:06:13.629182430 +0100
+++ misc/build/liblangtag-0.4.0/liblangtag/lt-ext-module.c 2012-11-06 14:35:11.226099206 +0100 +++ misc/liblangtag-0.4.0/liblangtag/lt-ext-module.c 2013-06-14 15:06:43.537534204 +0100
@@ -605,8 +605,8 @@ @@ -608,8 +608,8 @@
size_t len; size_t len;
while (1) { while (1) {
...@@ -11,48 +11,48 @@ ...@@ -11,48 +11,48 @@
len = strlen(dent.d_name); len = strlen(dent.d_name);
if (len > suffix_len && if (len > suffix_len &&
--- misc/liblangtag-0.4.0/liblangtag/Makefile.am 2012-10-12 04:07:20.000000000 +0200 --- misc/liblangtag-0.4.0/liblangtag/Makefile.am 2013-06-14 15:06:13.636182512 +0100
+++ misc/build/liblangtag-0.4.0/liblangtag/Makefile.am 2012-11-06 14:35:11.226099206 +0100 +++ misc/liblangtag-0.4.0/liblangtag/Makefile.am 2013-06-14 15:08:53.556063464 +0100
@@ -184,6 +184,7 @@ @@ -211,6 +211,7 @@
liblangtag_la_LDFLAGS = \ liblangtag_la_LDFLAGS = \
$(LDFLAGS) \ $(LDFLAGS) \
-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
+ -no-undefined \ + -no-undefined \
$(NULL) $(NULL)
-include $(top_srcdir)/git.mk -include $(top_srcdir)/git.mk
--- misc/liblangtag-0.4.0/liblangtag/Makefile.in 2012-10-22 05:47:23.000000000 +0200 --- misc/liblangtag-0.4.0/liblangtag/Makefile.in 2013-06-14 15:06:13.636182512 +0100
+++ misc/build/liblangtag-0.4.0/liblangtag/Makefile.in 2012-11-06 14:35:11.226099206 +0100 +++ misc/liblangtag-0.4.0/liblangtag/Makefile.in 2013-06-14 15:09:07.204223994 +0100
@@ -548,6 +548,7 @@ @@ -576,6 +576,7 @@
liblangtag_la_LDFLAGS = \ liblangtag_la_LDFLAGS = \
$(LDFLAGS) \ $(LDFLAGS) \
-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
+ -no-undefined \ + -no-undefined \
$(NULL) $(NULL)
all: $(BUILT_SOURCES) all: $(BUILT_SOURCES)
--- misc/liblangtag-0.4.0/liblangtag-gobject/Makefile.am 2012-10-22 05:35:13.000000000 +0200 --- misc/liblangtag-0.4.0/liblangtag-gobject/Makefile.am 2013-06-14 15:06:13.648182653 +0100
+++ misc/build/liblangtag-0.4.0/liblangtag-gobject/Makefile.am 2012-11-06 14:35:11.225099235 +0100 +++ misc/liblangtag-0.4.0/liblangtag-gobject/Makefile.am 2013-06-14 15:09:27.122458271 +0100
@@ -145,6 +145,7 @@ @@ -149,6 +149,7 @@
liblangtag_gobject_la_LDFLAGS = \ liblangtag_gobject_la_LDFLAGS = \
$(LDFLAGS) \ $(LDFLAGS) \
-version-info $(LT_G_CURRENT):$(LT_G_REVISION):$(LT_G_AGE) \ -version-info $(LT_G_CURRENT):$(LT_G_REVISION):$(LT_G_AGE) \
+ -no-undefined \ + -no-undefined \
$(NULL) $(NULL)
# #
if HAVE_INTROSPECTION if HAVE_INTROSPECTION
--- misc/liblangtag-0.4.0/liblangtag-gobject/Makefile.in 2012-10-22 05:47:23.000000000 +0200 --- misc/liblangtag-0.4.0/liblangtag-gobject/Makefile.in 2013-06-14 15:06:13.648182653 +0100
+++ misc/build/liblangtag-0.4.0/liblangtag-gobject/Makefile.in 2012-11-06 14:35:11.225099235 +0100 +++ misc/liblangtag-0.4.0/liblangtag-gobject/Makefile.in 2013-06-14 15:09:33.099528574 +0100
@@ -461,6 +461,7 @@ @@ -476,6 +476,7 @@
liblangtag_gobject_la_LDFLAGS = \ liblangtag_gobject_la_LDFLAGS = \
$(LDFLAGS) \ $(LDFLAGS) \
-version-info $(LT_G_CURRENT):$(LT_G_REVISION):$(LT_G_AGE) \ -version-info $(LT_G_CURRENT):$(LT_G_REVISION):$(LT_G_AGE) \
+ -no-undefined \ + -no-undefined \
$(NULL) $(NULL)
# #
--- misc/liblangtag-0.4.0/Makefile.am 2012-10-22 05:26:12.000000000 +0200 --- misc/liblangtag-0.4.0/Makefile.am 2013-06-14 15:06:13.652182700 +0100
+++ misc/build/liblangtag-0.4.0/Makefile.am 2012-11-06 14:35:11.225099235 +0100 +++ misc/liblangtag-0.4.0/Makefile.am 2013-06-14 15:06:43.539534228 +0100
@@ -6,7 +6,7 @@ @@ -6,7 +6,7 @@
SUBDIRS += liblangtag-gobject SUBDIRS += liblangtag-gobject
endif endif
...@@ -60,5 +60,5 @@ ...@@ -60,5 +60,5 @@
-SUBDIRS += tests -SUBDIRS += tests
+#SUBDIRS += tests +#SUBDIRS += tests
ACLOCAL_AMFLAGS = \ ACLOCAL_AMFLAGS = -I m4macros
-I m4macros \
nss/nss-3.13.3-build.patch.3
Dosyayı görüntüle @ 373d873c
--- misc/build/nss-3.13.5/mozilla/security/coreconf/rules.mk 2010-04-26 01:37:40.000000000 +0200 --- misc/build/nss-3.13.5/mozilla/security/coreconf/rules.mk 2013-06-14 13:31:28.569204870 +0100
+++ misc/build/nss-3.13.5/mozilla/security/coreconf/rules.mk 2011-11-11 21:39:26.576273015 +0100 +++ misc/build/nss-3.13.5/mozilla/security/coreconf/rules.mk 2013-06-14 13:31:59.277567709 +0100
@@ -400,7 +400,7 @@ @@ -400,7 +400,7 @@
PWD := $(shell pwd) PWD := $(shell pwd)
ifeq (,$(findstring ;,$(PATH))) ifeq (,$(findstring ;,$(PATH)))
...@@ -9,8 +9,8 @@ ...@@ -9,8 +9,8 @@
endif endif
endif endif
--- misc/build/nss-3.13.5/mozilla/security/coreconf/WIN32.mk 2011-09-14 19:59:43.000000000 +0200 --- misc/build/nss-3.13.5/mozilla/security/coreconf/WIN32.mk 2013-06-14 13:31:28.557204728 +0100
+++ misc/build/nss-3.13.5/mozilla/security/coreconf/WIN32.mk 2011-11-11 21:41:44.941584692 +0100 +++ misc/build/nss-3.13.5/mozilla/security/coreconf/WIN32.mk 2013-06-14 13:31:59.278567724 +0100
@@ -124,7 +124,7 @@ @@ -124,7 +124,7 @@
# The -mnop-fun-dllimport flag allows us to avoid a drawback of # The -mnop-fun-dllimport flag allows us to avoid a drawback of
# the dllimport attribute that a pointer to a function marked as # the dllimport attribute that a pointer to a function marked as
...@@ -20,8 +20,8 @@ ...@@ -20,8 +20,8 @@
_GEN_IMPORT_LIB=-Wl,--out-implib,$(IMPORT_LIBRARY) _GEN_IMPORT_LIB=-Wl,--out-implib,$(IMPORT_LIBRARY)
DLLFLAGS += -mwindows -o $@ -shared -Wl,--export-all-symbols $(if $(IMPORT_LIBRARY),$(_GEN_IMPORT_LIB)) DLLFLAGS += -mwindows -o $@ -shared -Wl,--export-all-symbols $(if $(IMPORT_LIBRARY),$(_GEN_IMPORT_LIB))
ifdef BUILD_OPT ifdef BUILD_OPT
--- misc/build/nss-3.13.5/mozilla/security/coreconf/WINNT.mk 2009-02-14 06:51:10.000000000 +0100 --- misc/build/nss-3.13.5/mozilla/security/coreconf/WINNT.mk 2013-06-14 13:31:28.560204763 +0100
+++ misc/build/nss-3.13.5/mozilla/security/coreconf/WINNT.mk 2011-11-11 21:39:26.580272977 +0100 +++ misc/build/nss-3.13.5/mozilla/security/coreconf/WINNT.mk 2013-06-14 13:31:59.278567724 +0100
@@ -46,7 +46,7 @@ @@ -46,7 +46,7 @@
# #
# Win NT needs -GT so that fibers can work # Win NT needs -GT so that fibers can work
...@@ -31,8 +31,8 @@ ...@@ -31,8 +31,8 @@
# WINNT uses the lib prefix, Win95 and WinCE don't # WINNT uses the lib prefix, Win95 and WinCE don't
NSPR31_LIB_PREFIX = lib NSPR31_LIB_PREFIX = lib
--- misc/build/nss-3.13.5/mozilla/security/nss/cmd/crmftest/Makefile 2005-11-14 01:17:21.000000000 +0100 --- misc/build/nss-3.13.5/mozilla/security/nss/cmd/crmftest/Makefile 2013-06-14 13:31:28.678206158 +0100
+++ misc/build/nss-3.13.5/mozilla/security/nss/cmd/crmftest/Makefile 2011-11-11 21:39:26.596273012 +0100 +++ misc/build/nss-3.13.5/mozilla/security/nss/cmd/crmftest/Makefile 2013-06-14 13:31:59.278567724 +0100
@@ -90,7 +90,7 @@ @@ -90,7 +90,7 @@
LDDIST = $(DIST)/lib LDDIST = $(DIST)/lib
...@@ -42,8 +42,8 @@ ...@@ -42,8 +42,8 @@
endif endif
include ../platrules.mk include ../platrules.mk
--- misc/build/nss-3.13.5/mozilla/security/nss/cmd/pk11mode/Makefile 2009-03-31 01:40:52.000000000 +0200 --- misc/build/nss-3.13.5/mozilla/security/nss/cmd/pk11mode/Makefile 2013-06-14 13:31:28.709206524 +0100
+++ misc/build/nss-3.13.5/mozilla/security/nss/cmd/pk11mode/Makefile 2011-11-11 21:39:26.596273012 +0100 +++ misc/build/nss-3.13.5/mozilla/security/nss/cmd/pk11mode/Makefile 2013-06-14 13:31:59.279567738 +0100
@@ -61,9 +61,9 @@ @@ -61,9 +61,9 @@
ifeq ($(OS_ARCH), WINNT) ifeq ($(OS_ARCH), WINNT)
...@@ -57,8 +57,8 @@ ...@@ -57,8 +57,8 @@
$(NULL) $(NULL)
else else
--- misc/build/nss-3.13.5/mozilla/security/nss/cmd/shlibsign/Makefile 2009-08-07 21:06:37.000000000 +0200 --- misc/build/nss-3.13.5/mozilla/security/nss/cmd/shlibsign/Makefile 2013-06-14 13:31:28.680206181 +0100
+++ misc/build/nss-3.13.5/mozilla/security/nss/cmd/shlibsign/Makefile 2011-11-11 21:39:26.596273012 +0100 +++ misc/build/nss-3.13.5/mozilla/security/nss/cmd/shlibsign/Makefile 2013-06-14 13:31:59.279567738 +0100
@@ -59,9 +59,9 @@ @@ -59,9 +59,9 @@
ifeq ($(OS_ARCH), WINNT) ifeq ($(OS_ARCH), WINNT)
...@@ -72,7 +72,7 @@ ...@@ -72,7 +72,7 @@
$(NULL) $(NULL)
else else
@@ -85,8 +85,8 @@ @@ -93,8 +93,8 @@
endif endif
CHECKLOC = $(CHECKLIBS:.$(DLL_SUFFIX)=.chk) CHECKLOC = $(CHECKLIBS:.$(DLL_SUFFIX)=.chk)
...@@ -83,15 +83,15 @@ ...@@ -83,15 +83,15 @@
####################################################################### #######################################################################
@@ -120,5 +120,5 @@ @@ -128,5 +128,5 @@
$(call core_abspath,$(NSPR_LIB_DIR)) $(call core_abspath,$<) $(call core_abspath,$(NSPR_LIB_DIR)) $(call core_abspath,$<)
endif endif
-libs install :: $(CHECKLOC) -libs install :: $(CHECKLOC)
+libs install :: #$(CHECKLOC) +libs install :: #$(CHECKLOC)
--- misc/build/nss-3.13.5/mozilla/security/nss/cmd/shlibsign/mangle/Makefile 2008-11-20 16:44:24.000000000 +0100 --- misc/build/nss-3.13.5/mozilla/security/nss/cmd/shlibsign/mangle/Makefile 2013-06-14 13:31:28.681206193 +0100
+++ misc/build/nss-3.13.5/mozilla/security/nss/cmd/shlibsign/mangle/Makefile 2011-11-11 21:39:26.600273013 +0100 +++ misc/build/nss-3.13.5/mozilla/security/nss/cmd/shlibsign/mangle/Makefile 2013-06-14 13:31:59.279567738 +0100
@@ -59,9 +59,9 @@ @@ -59,9 +59,9 @@
ifeq ($(OS_ARCH), WINNT) ifeq ($(OS_ARCH), WINNT)
...@@ -105,8 +105,8 @@ ...@@ -105,8 +105,8 @@
$(NULL) $(NULL)
else else
--- misc/build/nss-3.13.5/mozilla/security/nss/lib/ckfw/builtins/config.mk 2009-06-11 02:55:34.000000000 +0200 --- misc/build/nss-3.13.5/mozilla/security/nss/lib/ckfw/builtins/config.mk 2013-06-14 13:31:28.666206016 +0100
+++ misc/build/nss-3.13.5/mozilla/security/nss/lib/ckfw/builtins/config.mk 2011-11-11 21:39:26.600273013 +0100 +++ misc/build/nss-3.13.5/mozilla/security/nss/lib/ckfw/builtins/config.mk 2013-06-14 13:31:59.280567750 +0100
@@ -48,7 +48,7 @@ @@ -48,7 +48,7 @@
ifeq (,$(filter-out WIN%,$(OS_TARGET))) ifeq (,$(filter-out WIN%,$(OS_TARGET)))
...@@ -116,8 +116,8 @@ ...@@ -116,8 +116,8 @@
RESNAME = $(LIBRARY_NAME).rc RESNAME = $(LIBRARY_NAME).rc
endif endif
--- misc/build/nss-3.13.5/mozilla/security/nss/lib/ckfw/capi/Makefile 2009-07-29 22:15:19.000000000 +0200 --- misc/build/nss-3.13.5/mozilla/security/nss/lib/ckfw/capi/Makefile 2013-06-14 13:31:28.669206051 +0100
+++ misc/build/nss-3.13.5/mozilla/security/nss/lib/ckfw/capi/Makefile 2011-11-11 21:39:26.608273006 +0100 +++ misc/build/nss-3.13.5/mozilla/security/nss/lib/ckfw/capi/Makefile 2013-06-14 13:31:59.280567750 +0100
@@ -75,6 +75,9 @@ @@ -75,6 +75,9 @@
-lplc4 \ -lplc4 \
-lplds4 \ -lplds4 \
...@@ -128,8 +128,8 @@ ...@@ -128,8 +128,8 @@
$(NULL) $(NULL)
endif endif
--- misc/build/nss-3.13.5/mozilla/security/nss/lib/freebl/config.mk 2010-08-18 00:27:12.000000000 +0200 --- misc/build/nss-3.13.5/mozilla/security/nss/lib/freebl/config.mk 2013-06-14 13:31:28.593205153 +0100
+++ misc/build/nss-3.13.5/mozilla/security/nss/lib/freebl/config.mk 2011-11-11 21:39:26.608273006 +0100 +++ misc/build/nss-3.13.5/mozilla/security/nss/lib/freebl/config.mk 2013-06-14 13:31:59.280567750 +0100
@@ -82,7 +82,7 @@ @@ -82,7 +82,7 @@
# don't want the 32 in the shared library name # don't want the 32 in the shared library name
SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX) SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
...@@ -139,9 +139,9 @@ ...@@ -139,9 +139,9 @@
RESNAME = freebl.rc RESNAME = freebl.rc
ifndef WINCE ifndef WINCE
--- misc/build/nss-3.13.5/mozilla/security/nss/lib/freebl/Makefile 2011-02-06 11:13:27.000000000 +0100 --- misc/build/nss-3.13.5/mozilla/security/nss/lib/freebl/Makefile 2013-06-14 13:31:28.588205094 +0100
+++ misc/build/nss-3.13.5/mozilla/security/nss/lib/freebl/Makefile 2011-11-11 21:39:26.608273006 +0100 +++ misc/build/nss-3.13.5/mozilla/security/nss/lib/freebl/Makefile 2013-06-14 13:31:59.281567762 +0100
@@ -167,6 +167,17 @@ @@ -171,6 +171,17 @@
endif endif
endif endif
else else
...@@ -159,7 +159,7 @@ ...@@ -159,7 +159,7 @@
# -DMP_NO_MP_WORD # -DMP_NO_MP_WORD
ifdef BUILD_OPT ifdef BUILD_OPT
OPTIMIZER += -Ox # maximum optimization for freebl OPTIMIZER += -Ox # maximum optimization for freebl
@@ -178,6 +189,7 @@ @@ -182,6 +193,7 @@
MPI_SRCS += mpi_amd64.c MPI_SRCS += mpi_amd64.c
endif endif
endif endif
...@@ -167,8 +167,8 @@ ...@@ -167,8 +167,8 @@
ifeq ($(OS_TARGET),WINCE) ifeq ($(OS_TARGET),WINCE)
DEFINES += -DMP_ARGCHK=0 # no assert in WinCE DEFINES += -DMP_ARGCHK=0 # no assert in WinCE
--- misc/build/nss-3.13.5/mozilla/security/nss/lib/freebl/mpi/mpi-priv.h 2010-07-20 03:26:02.000000000 +0200 --- misc/build/nss-3.13.5/mozilla/security/nss/lib/freebl/mpi/mpi-priv.h 2013-06-14 13:31:28.605205295 +0100
+++ misc/build/nss-3.13.5/mozilla/security/nss/lib/freebl/mpi/mpi-priv.h 2011-11-11 21:39:26.632273000 +0100 +++ misc/build/nss-3.13.5/mozilla/security/nss/lib/freebl/mpi/mpi-priv.h 2013-06-14 13:31:59.281567762 +0100
@@ -254,7 +254,7 @@ @@ -254,7 +254,7 @@
#define MPI_ASM_DECL #define MPI_ASM_DECL
#endif #endif
...@@ -178,66 +178,66 @@ ...@@ -178,66 +178,66 @@
mp_digit MPI_ASM_DECL s_mpv_mul_set_vec64(mp_digit*, mp_digit *, mp_size, mp_digit); mp_digit MPI_ASM_DECL s_mpv_mul_set_vec64(mp_digit*, mp_digit *, mp_size, mp_digit);
mp_digit MPI_ASM_DECL s_mpv_mul_add_vec64(mp_digit*, const mp_digit*, mp_size, mp_digit); mp_digit MPI_ASM_DECL s_mpv_mul_add_vec64(mp_digit*, const mp_digit*, mp_size, mp_digit);
--- misc/build/nss-3.13.5/mozilla/security/nss/lib/nss/config.mk 2009-12-15 23:22:31.000000000 +0100 --- misc/build/nss-3.13.5/mozilla/security/nss/lib/nss/config.mk 2013-06-14 13:31:28.620205472 +0100
+++ misc/build/nss-3.13.5/mozilla/security/nss/lib/nss/config.mk 2011-11-11 21:39:26.632273000 +0100 +++ misc/build/nss-3.13.5/mozilla/security/nss/lib/nss/config.mk 2013-06-14 13:31:59.281567762 +0100
@@ -42,7 +42,7 @@ @@ -42,7 +42,7 @@
SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX) SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(IMPORT_LIB_SUFFIX) IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION)$(IMPORT_LIB_SUFFIX)
-RES = $(OBJDIR)/$(LIBRARY_NAME).res -RES = $(OBJDIR)/$(LIBRARY_NAME).res
+RES = $(OBJDIR)/$(LIBRARY_NAME).res.o +RES = $(OBJDIR)/$(LIBRARY_NAME).res.o
RESNAME = $(LIBRARY_NAME).rc RESNAME = $(LIBRARY_NAME).rc
ifdef NS_USE_GCC ifdef NS_USE_GCC
--- misc/build/nss-3.13.5/mozilla/security/nss/lib/smime/config.mk 2009-06-11 02:55:47.000000000 +0200 --- misc/build/nss-3.13.5/mozilla/security/nss/lib/smime/config.mk 2013-06-14 13:31:28.580205000 +0100
+++ misc/build/nss-3.13.5/mozilla/security/nss/lib/smime/config.mk 2011-11-11 21:39:26.632273000 +0100 +++ misc/build/nss-3.13.5/mozilla/security/nss/lib/smime/config.mk 2013-06-14 13:31:59.282567773 +0100
@@ -43,7 +43,7 @@ @@ -43,7 +43,7 @@
SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX) SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(IMPORT_LIB_SUFFIX) IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION)$(IMPORT_LIB_SUFFIX)
-RES = $(OBJDIR)/smime.res -RES = $(OBJDIR)/smime.res
+RES = $(OBJDIR)/smime.res.o +RES = $(OBJDIR)/smime.res.o
RESNAME = smime.rc RESNAME = smime.rc
ifdef NS_USE_GCC ifdef NS_USE_GCC
--- misc/build/nss-3.13.5/mozilla/security/nss/lib/softoken/config.mk 2010-06-12 02:58:33.000000000 +0200 --- misc/build/nss-3.13.5/mozilla/security/nss/lib/softoken/config.mk 2013-06-14 13:31:28.662205969 +0100
+++ misc/build/nss-3.13.5/mozilla/security/nss/lib/softoken/config.mk 2011-11-11 21:39:26.632273000 +0100 +++ misc/build/nss-3.13.5/mozilla/security/nss/lib/softoken/config.mk 2013-06-14 13:31:59.282567773 +0100
@@ -49,7 +49,7 @@ @@ -49,7 +49,7 @@
SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX) SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(IMPORT_LIB_SUFFIX) IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION)$(IMPORT_LIB_SUFFIX)
-RES = $(OBJDIR)/$(LIBRARY_NAME).res -RES = $(OBJDIR)/$(LIBRARY_NAME).res
+RES = $(OBJDIR)/$(LIBRARY_NAME).res.o +RES = $(OBJDIR)/$(LIBRARY_NAME).res.o
RESNAME = $(LIBRARY_NAME).rc RESNAME = $(LIBRARY_NAME).rc
ifdef NS_USE_GCC ifdef NS_USE_GCC
--- misc/build/nss-3.13.5/mozilla/security/nss/lib/softoken/legacydb/config.mk 2009-06-11 02:55:49.000000000 +0200 --- misc/build/nss-3.13.5/mozilla/security/nss/lib/softoken/legacydb/config.mk 2013-06-14 13:31:28.660205945 +0100
+++ misc/build/nss-3.13.5/mozilla/security/nss/lib/softoken/legacydb/config.mk 2011-11-11 21:39:26.632273000 +0100 +++ misc/build/nss-3.13.5/mozilla/security/nss/lib/softoken/legacydb/config.mk 2013-06-14 13:31:59.282567773 +0100
@@ -51,7 +51,7 @@ @@ -50,7 +50,7 @@
SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX) SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(IMPORT_LIB_SUFFIX) IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION)$(IMPORT_LIB_SUFFIX)
-RES = $(OBJDIR)/$(LIBRARY_NAME).res -RES = $(OBJDIR)/$(LIBRARY_NAME).res
+RES = $(OBJDIR)/$(LIBRARY_NAME).res.o +RES = $(OBJDIR)/$(LIBRARY_NAME).res.o
RESNAME = $(LIBRARY_NAME).rc RESNAME = $(LIBRARY_NAME).rc
ifdef NS_USE_GCC ifdef NS_USE_GCC
--- misc/build/nss-3.13.5/mozilla/security/nss/lib/ssl/config.mk 2010-02-04 20:09:08.000000000 +0100 --- misc/build/nss-3.13.5/mozilla/security/nss/lib/ssl/config.mk 2013-06-14 13:31:28.614205402 +0100
+++ misc/build/nss-3.13.5/mozilla/security/nss/lib/ssl/config.mk 2011-11-11 21:39:26.632273000 +0100 +++ misc/build/nss-3.13.5/mozilla/security/nss/lib/ssl/config.mk 2013-06-14 13:31:59.283567784 +0100
@@ -55,7 +55,7 @@ @@ -55,7 +55,7 @@
SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX) SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(IMPORT_LIB_SUFFIX) IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION)$(IMPORT_LIB_SUFFIX)
-RES = $(OBJDIR)/ssl.res -RES = $(OBJDIR)/ssl.res
+RES = $(OBJDIR)/ssl.res.o +RES = $(OBJDIR)/ssl.res.o
RESNAME = ssl.rc RESNAME = ssl.rc
ifdef NS_USE_GCC ifdef NS_USE_GCC
--- misc/build/nss-3.13.5/mozilla/security/nss/lib/sysinit/config.mk 2010-02-16 20:38:42.000000000 +0100 --- misc/build/nss-3.13.5/mozilla/security/nss/lib/sysinit/config.mk 2013-06-14 13:31:28.674206110 +0100
+++ misc/build/nss-3.13.5/mozilla/security/nss/lib/sysinit/config.mk 2011-11-11 21:39:26.636273000 +0100 +++ misc/build/nss-3.13.5/mozilla/security/nss/lib/sysinit/config.mk 2013-06-14 13:31:59.283567784 +0100
@@ -47,8 +47,8 @@ @@ -47,8 +47,8 @@
SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX) SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(IMPORT_LIB_SUFFIX) IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION)$(IMPORT_LIB_SUFFIX)
-RES = $(OBJDIR)/$(LIBRARY_NAME).res -RES = $(OBJDIR)/$(LIBRARY_NAME).res
-RESNAME = $(LIBRARY_NAME).rc -RESNAME = $(LIBRARY_NAME).rc
...@@ -246,11 +246,11 @@ ...@@ -246,11 +246,11 @@
ifdef NS_USE_GCC ifdef NS_USE_GCC
EXTRA_SHARED_LIBS += \ EXTRA_SHARED_LIBS += \
--- misc/build/nss-3.13.5/mozilla/security/nss/lib/util/config.mk 2009-12-15 23:22:31.000000000 +0100 --- misc/build/nss-3.13.5/mozilla/security/nss/lib/util/config.mk 2013-06-14 13:31:28.629205579 +0100
+++ misc/build/nss-3.13.5/mozilla/security/nss/lib/util/config.mk 2011-11-11 21:39:26.636273000 +0100 +++ misc/build/nss-3.13.5/mozilla/security/nss/lib/util/config.mk 2013-06-14 13:31:59.283567784 +0100
@@ -42,7 +42,7 @@ @@ -42,7 +42,7 @@
SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX) SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(IMPORT_LIB_SUFFIX) IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION)$(IMPORT_LIB_SUFFIX)
-RES = $(OBJDIR)/$(LIBRARY_NAME).res -RES = $(OBJDIR)/$(LIBRARY_NAME).res
+RES = $(OBJDIR)/$(LIBRARY_NAME).res.o +RES = $(OBJDIR)/$(LIBRARY_NAME).res.o
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment