| 1 |
--- mozilla/security/coreconf/Linux.mk.orig 2005-09-16 17:09:23.000000000 +0000 |
| 2 |
+++ mozilla/security/coreconf/Linux.mk 2006-02-09 05:27:36.000000000 +0000 |
| 3 |
@@ -37,6 +37,8 @@ |
| 4 |
|
| 5 |
include $(CORE_DEPTH)/coreconf/UNIX.mk |
| 6 |
|
| 7 |
+NSS_VERSION_MINOR=12 |
| 8 |
+ |
| 9 |
# |
| 10 |
# The default implementation strategy for Linux is now pthreads |
| 11 |
# |
| 12 |
--- mozilla/security/coreconf/Linux2.6.mk.orig 2005-09-16 17:09:23.000000000 +0000 |
| 13 |
+++ mozilla/security/coreconf/Linux2.6.mk 2006-02-09 05:38:16.000000000 +0000 |
| 14 |
@@ -38,8 +38,7 @@ |
| 15 |
include $(CORE_DEPTH)/coreconf/Linux.mk |
| 16 |
|
| 17 |
OS_REL_CFLAGS += -DLINUX2_1 |
| 18 |
-MKSHLIB = $(CC) $(DSO_LDOPTS) -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so) |
| 19 |
- |
| 20 |
+MKSHLIB = $(CC) $(DSO_LDOPTS) -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so).$(NSS_VERSION_MINOR) |
| 21 |
ifdef MAPFILE |
| 22 |
MKSHLIB += -Wl,--version-script,$(MAPFILE) |
| 23 |
endif |
| 24 |
--- mozilla/security/coreconf/rules.mk.orig 2005-10-10 23:46:12.000000000 +0000 |
| 25 |
+++ mozilla/security/coreconf/rules.mk 2006-02-09 06:27:46.000000000 +0000 |
| 26 |
@@ -113,7 +113,10 @@ |
| 27 |
$(INSTALL) -m 664 $(LIBRARY) $(SOURCE_LIB_DIR) |
| 28 |
endif |
| 29 |
ifdef SHARED_LIBRARY |
| 30 |
+ mv $(SHARED_LIBRARY) $(SHARED_LIBRARY).$(NSS_VERSION_MINOR) |
| 31 |
+ ln -s $(shell pwd)/$(SHARED_LIBRARY).$(NSS_VERSION_MINOR) $(shell pwd)/$(SHARED_LIBRARY) |
| 32 |
$(INSTALL) -m 775 $(SHARED_LIBRARY) $(SOURCE_LIB_DIR) |
| 33 |
+ $(INSTALL) -m 775 $(SHARED_LIBRARY).$(NSS_VERSION_MINOR) $(SOURCE_LIB_DIR) |
| 34 |
ifdef MOZ_DEBUG_SYMBOLS |
| 35 |
ifeq (,$(filter-out _WIN%,$(NS_USE_GCC)_$(OS_TARGET))) |
| 36 |
$(INSTALL) -m 644 $(SHARED_LIBRARY:$(DLL_SUFFIX)=pdb) $(SOURCE_LIB_DIR) |
| 37 |
|