1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355
|
## 81_sonames.patch by Mike Hommey <glandium@debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Add soname support
Index: nss/mozilla/security/coreconf/BSD_OS.mk
===================================================================
--- nss.orig/mozilla/security/coreconf/BSD_OS.mk 2009-09-03 06:56:59.000000000 +0200
+++ nss/mozilla/security/coreconf/BSD_OS.mk 2010-08-06 13:36:35.517577075 +0200
@@ -71,7 +71,7 @@
ARCH = bsdos
DSO_CFLAGS = -fPIC -DPIC
-DSO_LDOPTS = -shared -Wl,-soname,lib$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
+DSO_LDOPTS = -shared -Wl,-soname,$(SONAME)
ifdef LIBRUNPATH
DSO_LDOPTS += -Wl,-R$(LIBRUNPATH)
Index: nss/mozilla/security/coreconf/BeOS.mk
===================================================================
--- nss.orig/mozilla/security/coreconf/BeOS.mk 2009-09-03 06:56:59.000000000 +0200
+++ nss/mozilla/security/coreconf/BeOS.mk 2010-08-06 13:36:35.517577075 +0200
@@ -59,7 +59,7 @@
CPU_ARCH = x86
endif
-MKSHLIB = $(CC) -nostart -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so)
+MKSHLIB = $(CC) -nostart -Wl,-soname -Wl,$(SONAME)
ifdef BUILD_OPT
OPTIMIZER = -O2
endif
Index: nss/mozilla/security/coreconf/FreeBSD.mk
===================================================================
--- nss.orig/mozilla/security/coreconf/FreeBSD.mk 2009-08-22 07:33:09.000000000 +0200
+++ nss/mozilla/security/coreconf/FreeBSD.mk 2010-08-06 13:36:35.517577075 +0200
@@ -56,7 +56,7 @@
OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -Wno-switch -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK
DSO_CFLAGS = -fPIC
-DSO_LDOPTS = -shared -Wl,-soname -Wl,$(notdir $@)
+DSO_LDOPTS = -shared -Wl,-soname -Wl,$(SONAME)
#
# The default implementation strategy for FreeBSD is pthreads.
Index: nss/mozilla/security/coreconf/HP-UX.mk
===================================================================
--- nss.orig/mozilla/security/coreconf/HP-UX.mk 2010-08-06 13:34:51.000000000 +0200
+++ nss/mozilla/security/coreconf/HP-UX.mk 2010-08-06 13:37:34.869553395 +0200
@@ -94,10 +94,10 @@
sed -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,,' -e 's,^,+e ,' > $@
ifndef NS_USE_GCC
-DSO_LDOPTS = -b +h $(notdir $@)
+DSO_LDOPTS = -b +h $(SONAME)
RPATH = +b '$$ORIGIN'
else
-DSO_LDOPTS = -shared -Wl,+h,$(notdir $@)
+DSO_LDOPTS = -shared -Wl,+h,$(SONAME)
RPATH = -Wl,+b,'$$ORIGIN'
endif
ifneq ($(OS_TEST),ia64)
Index: nss/mozilla/security/coreconf/IRIX.mk
===================================================================
--- nss.orig/mozilla/security/coreconf/IRIX.mk 2007-11-22 05:39:56.000000000 +0100
+++ nss/mozilla/security/coreconf/IRIX.mk 2010-08-06 13:36:35.517577075 +0200
@@ -102,7 +102,7 @@
SHLIB_LD_OPTS += -n32 -mips3
endif
-MKSHLIB += $(LD) $(SHLIB_LD_OPTS) -shared -soname $(@:$(OBJDIR)/%.so=%.so)
+MKSHLIB += $(LD) $(SHLIB_LD_OPTS) -shared -soname $(SONAME)
ifdef MAPFILE
# Add LD options to restrict exported symbols to those in the map file
endif
Index: nss/mozilla/security/coreconf/Linux.mk
===================================================================
--- nss.orig/mozilla/security/coreconf/Linux.mk 2010-08-06 13:36:19.000000000 +0200
+++ nss/mozilla/security/coreconf/Linux.mk 2010-08-06 13:36:35.517577075 +0200
@@ -107,7 +107,7 @@
ifeq ($(KERNEL)-$(OS_RELEASE),linux-2.0)
OS_REL_CFLAGS += -DLINUX2_0
- MKSHLIB = $(CC) -shared -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so) $(RPATH)
+ MKSHLIB = $(CC) -shared -Wl,-soname -Wl,$(SONAME) $(RPATH)
ifdef MAPFILE
MKSHLIB += -Wl,--version-script,$(MAPFILE)
endif
Index: nss/mozilla/security/coreconf/Linux2.1.mk
===================================================================
--- nss.orig/mozilla/security/coreconf/Linux2.1.mk 2009-06-11 02:55:32.000000000 +0200
+++ nss/mozilla/security/coreconf/Linux2.1.mk 2010-08-06 13:36:35.517577075 +0200
@@ -38,7 +38,7 @@
include $(CORE_DEPTH)/coreconf/Linux.mk
ifeq ($(OS_RELEASE),2.1)
OS_REL_CFLAGS += -DLINUX2_1
- MKSHLIB = $(CC) $(DSO_LDOPTS) -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so) $(RPATH)
+ MKSHLIB = $(CC) $(DSO_LDOPTS) -Wl,-soname -Wl,$(SONAME) $(RPATH)
ifdef MAPFILE
MKSHLIB += -Wl,--version-script,$(MAPFILE)
endif
Index: nss/mozilla/security/coreconf/Linux2.2.mk
===================================================================
--- nss.orig/mozilla/security/coreconf/Linux2.2.mk 2009-06-11 02:55:32.000000000 +0200
+++ nss/mozilla/security/coreconf/Linux2.2.mk 2010-08-06 13:36:35.517577075 +0200
@@ -38,7 +38,7 @@
include $(CORE_DEPTH)/coreconf/Linux.mk
OS_REL_CFLAGS += -DLINUX2_1
-MKSHLIB = $(CC) $(DSO_LDOPTS) -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so) $(RPATH)
+MKSHLIB = $(CC) $(DSO_LDOPTS) -Wl,-soname -Wl,$(SONAME) $(RPATH)
ifdef MAPFILE
MKSHLIB += -Wl,--version-script,$(MAPFILE)
Index: nss/mozilla/security/coreconf/Linux2.4.mk
===================================================================
--- nss.orig/mozilla/security/coreconf/Linux2.4.mk 2009-08-26 00:35:11.000000000 +0200
+++ nss/mozilla/security/coreconf/Linux2.4.mk 2010-08-06 13:36:35.517577075 +0200
@@ -38,7 +38,7 @@
include $(CORE_DEPTH)/coreconf/Linux.mk
OS_REL_CFLAGS += -DLINUX2_1
-MKSHLIB = $(CC) $(DSO_LDOPTS) -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so) $(RPATH)
+MKSHLIB = $(CC) $(DSO_LDOPTS) -Wl,-soname -Wl,$(SONAME) $(RPATH)
ifdef MAPFILE
MKSHLIB += -Wl,--version-script,$(MAPFILE)
Index: nss/mozilla/security/coreconf/Linux2.5.mk
===================================================================
--- nss.orig/mozilla/security/coreconf/Linux2.5.mk 2009-06-11 02:55:32.000000000 +0200
+++ nss/mozilla/security/coreconf/Linux2.5.mk 2010-08-06 13:36:35.521569953 +0200
@@ -38,7 +38,7 @@
include $(CORE_DEPTH)/coreconf/Linux.mk
OS_REL_CFLAGS += -DLINUX2_1
-MKSHLIB = $(CC) $(DSO_LDOPTS) -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so) $(RPATH)
+MKSHLIB = $(CC) $(DSO_LDOPTS) -Wl,-soname -Wl,$(SONAME) $(RPATH)
ifdef MAPFILE
MKSHLIB += -Wl,--version-script,$(MAPFILE)
Index: nss/mozilla/security/coreconf/Linux2.6.mk
===================================================================
--- nss.orig/mozilla/security/coreconf/Linux2.6.mk 2010-08-06 13:36:19.000000000 +0200
+++ nss/mozilla/security/coreconf/Linux2.6.mk 2010-08-06 13:36:35.521569953 +0200
@@ -41,7 +41,7 @@
OS_REL_CFLAGS += -DLINUX2_1
endif
-MKSHLIB = $(CC) $(DSO_LDOPTS) -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so) $(RPATH)
+MKSHLIB = $(CC) $(DSO_LDOPTS) -Wl,-soname -Wl,$(SONAME) $(RPATH)
ifdef MAPFILE
MKSHLIB += -Wl,--version-script,$(MAPFILE)
Index: nss/mozilla/security/coreconf/NetBSD.mk
===================================================================
--- nss.orig/mozilla/security/coreconf/NetBSD.mk 2009-09-03 06:57:00.000000000 +0200
+++ nss/mozilla/security/coreconf/NetBSD.mk 2010-08-06 13:36:35.521569953 +0200
@@ -67,7 +67,7 @@
DSO_CFLAGS = -fPIC -DPIC
DSO_LDOPTS = -shared
ifeq ($(OBJECT_FMT),ELF)
-DSO_LDOPTS += -Wl,-soname,lib$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
+DSO_LDOPTS += -Wl,-soname,$(SONAME)
endif
ifdef LIBRUNPATH
Index: nss/mozilla/security/coreconf/OSF1.mk
===================================================================
--- nss.orig/mozilla/security/coreconf/OSF1.mk 2009-04-10 00:25:09.000000000 +0200
+++ nss/mozilla/security/coreconf/OSF1.mk 2010-08-06 13:36:35.521569953 +0200
@@ -64,7 +64,7 @@
endif
# The command to build a shared library on OSF1.
-MKSHLIB += ld -shared -expect_unresolved "*" -soname $(notdir $@)
+MKSHLIB += ld -shared -expect_unresolved "*" -soname $(SONAME)
ifdef MAPFILE
MKSHLIB += -hidden -input $(MAPFILE)
endif
Index: nss/mozilla/security/coreconf/OpenBSD.mk
===================================================================
--- nss.orig/mozilla/security/coreconf/OpenBSD.mk 2009-09-03 06:57:00.000000000 +0200
+++ nss/mozilla/security/coreconf/OpenBSD.mk 2010-08-06 13:36:35.521569953 +0200
@@ -65,7 +65,7 @@
ARCH = openbsd
DSO_CFLAGS = -fPIC -DPIC
-DSO_LDOPTS = -shared -fPIC -Wl,-soname,lib$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
+DSO_LDOPTS = -shared -fPIC -Wl,-soname,$(SONAME)
MKSHLIB = $(CC) $(DSO_LDOPTS)
Index: nss/mozilla/security/coreconf/QNX.mk
===================================================================
--- nss.orig/mozilla/security/coreconf/QNX.mk 2009-09-03 06:57:00.000000000 +0200
+++ nss/mozilla/security/coreconf/QNX.mk 2010-08-06 13:36:35.521569953 +0200
@@ -54,7 +54,7 @@
CPU_ARCH = x86
endif
-MKSHLIB = $(CC) -shared -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so)
+MKSHLIB = $(CC) -shared -Wl,-soname -Wl,$(SONAME)
ifdef BUILD_OPT
OPTIMIZER = -O2
endif
Index: nss/mozilla/security/coreconf/ReliantUNIX.mk
===================================================================
--- nss.orig/mozilla/security/coreconf/ReliantUNIX.mk 2007-11-22 05:39:56.000000000 +0100
+++ nss/mozilla/security/coreconf/ReliantUNIX.mk 2010-08-06 13:36:35.521569953 +0200
@@ -51,7 +51,7 @@
OPTIMIZER += -O6
endif
MKSHLIB = $(LD)
- MKSHLIB += -G -h $(@:$(OBJDIR)/%.so=%.so)
+ MKSHLIB += -G -h $(SONAME)
DSO_LDOPTS += -G -Xlinker -Blargedynsym
else
## native compiler (CDS++ 1.0)
Index: nss/mozilla/security/coreconf/SunOS5.mk
===================================================================
--- nss.orig/mozilla/security/coreconf/SunOS5.mk 2009-06-11 02:55:32.000000000 +0200
+++ nss/mozilla/security/coreconf/SunOS5.mk 2010-08-06 13:36:35.521569953 +0200
@@ -143,7 +143,7 @@
ifeq ($(USE_64), 1)
DSO_LDOPTS += -m64
endif
- DSO_LDOPTS += -shared -h $(notdir $@)
+ DSO_LDOPTS += -shared -h $(SONAME)
else
ifeq ($(USE_64), 1)
ifeq ($(OS_TEST),i86pc)
@@ -152,7 +152,7 @@
DSO_LDOPTS +=-xarch=v9
endif
endif
- DSO_LDOPTS += -G -h $(notdir $@)
+ DSO_LDOPTS += -G -h $(SONAME)
endif
DSO_LDOPTS += -z combreloc -z defs -z ignore
Index: nss/mozilla/security/coreconf/rules.mk
===================================================================
--- nss.orig/mozilla/security/coreconf/rules.mk 2010-08-06 13:34:51.000000000 +0200
+++ nss/mozilla/security/coreconf/rules.mk 2010-08-06 13:36:35.521569953 +0200
@@ -115,6 +115,7 @@
$(INSTALL) -m 644 $(SHARED_LIBRARY:$(DLL_SUFFIX)=pdb) $(SOURCE_LIB_DIR)
endif
endif
+ $(call MKSHLINKS,$(SOURCE_LIB_DIR))
endif
ifdef IMPORT_LIBRARY
$(INSTALL) -m 775 $(IMPORT_LIBRARY) $(SOURCE_LIB_DIR)
@@ -258,6 +259,7 @@
release_md::
ifneq ($(MD_LIB_RELEASE_FILES),)
$(INSTALL) -m 444 $(MD_LIB_RELEASE_FILES) $(SOURCE_RELEASE_PREFIX)/$(SOURCE_RELEASE_LIB_DIR)
+ $(call MKSHLINKS,$(SOURCE_RELEASE_PREFIX)/$(SOURCE_RELEASE_LIB_DIR))
endif
ifneq ($(MD_BIN_RELEASE_FILES),)
$(INSTALL) -m 555 $(MD_BIN_RELEASE_FILES) $(SOURCE_RELEASE_PREFIX)/$(SOURCE_RELEASE_BIN_DIR)
@@ -313,6 +315,8 @@
endif
endif
+$(SHARED_LIBRARY_LINKS): %: $(SHARED_LIBRARY)
+
$(SHARED_LIBRARY): $(OBJS) $(RES) $(MAPFILE) $(SUB_SHLOBJS)
@$(MAKE_OBJDIR)
rm -f $@
Index: nss/mozilla/security/coreconf/ruleset.mk
===================================================================
--- nss.orig/mozilla/security/coreconf/ruleset.mk 2009-07-08 20:15:21.000000000 +0200
+++ nss/mozilla/security/coreconf/ruleset.mk 2010-08-06 13:36:35.521569953 +0200
@@ -123,6 +123,25 @@
ifndef SHARED_LIBRARY
SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION)$(JDK_DEBUG_SUFFIX).$(DLL_SUFFIX)
endif
+ SONAME = $(notdir $(SHARED_LIBRARY))
+ ifdef SO_VERSION
+ ifneq (,$(findstring $(SONAME),$(MKSHLIB)))
+ SO_VERSION_MAJOR := $(shell echo $(SO_VERSION) | sed 's/^\([^.]*\)\(\.[^.]*\)\?\(\.[^.]*\)\?/\1/')
+ SO_VERSION_MINOR := $(shell echo $(SO_VERSION) | sed 's/^\([^.]*\)\(\.[^.]*\)\?\(\.[^.]*\)\?/\2/')
+ SO_VERSION_MICRO := $(shell echo $(SO_VERSION) | sed 's/^\([^.]*\)\(\.[^.]*\)\?\(\.[^.]*\)\?/\3/')
+
+ SHARED_LIBRARY_LINKS := $(SONAME)
+ ifdef SO_VERSION_MINOR
+ SHARED_LIBRARY_LINKS += $(SONAME).$(SO_VERSION_MAJOR)
+ endif
+
+ SONAME := $(SONAME).$(SO_VERSION_MAJOR)
+ SHARED_LIBRARY := $(SHARED_LIBRARY).$(SO_VERSION)
+
+ MKSHLINKS = (cd $(1) && for link in $(SHARED_LIBRARY_LINKS); do rm -f $$link; ln -s $(notdir $(SHARED_LIBRARY)) $$link; done)
+ endif
+ endif
+
ifndef MAPFILE_SOURCE
MAPFILE_SOURCE = $(LIBRARY_NAME).def
endif
@@ -189,7 +208,7 @@
endif
ALL_TRASH = $(TARGETS) $(OBJS) $(OBJDIR) LOGS TAGS $(GARBAGE) \
- so_locations $(BUILT_SRCS) $(NOSUCHFILE)
+ so_locations $(BUILT_SRCS) $(NOSUCHFILE) $(SHARED_LIBRARY_LINKS)
ifdef NS_USE_JDK
ALL_TRASH += $(JDK_HEADER_CFILES) $(JDK_STUB_CFILES) \
Index: nss/mozilla/security/nss/lib/nss/manifest.mn
===================================================================
--- nss.orig/mozilla/security/nss/lib/nss/manifest.mn 2007-10-12 03:44:45.000000000 +0200
+++ nss/mozilla/security/nss/lib/nss/manifest.mn 2010-08-06 13:36:35.521569953 +0200
@@ -58,6 +58,7 @@
LIBRARY_NAME = nss
LIBRARY_VERSION = 3
+SO_VERSION = 1d
# This part of the code, including all sub-dirs, can be optimized for size
export ALLOW_OPT_CODE_SIZE = 1
Index: nss/mozilla/security/nss/lib/smime/manifest.mn
===================================================================
--- nss.orig/mozilla/security/nss/lib/smime/manifest.mn 2007-08-15 17:30:03.000000000 +0200
+++ nss/mozilla/security/nss/lib/smime/manifest.mn 2010-08-06 13:36:35.521569953 +0200
@@ -79,6 +79,7 @@
LIBRARY_NAME = smime
LIBRARY_VERSION = 3
+SO_VERSION = 1d
# This part of the code, including all sub-dirs, can be optimized for size
export ALLOW_OPT_CODE_SIZE = 1
Index: nss/mozilla/security/nss/lib/ssl/manifest.mn
===================================================================
--- nss.orig/mozilla/security/nss/lib/ssl/manifest.mn 2008-09-23 01:47:00.000000000 +0200
+++ nss/mozilla/security/nss/lib/ssl/manifest.mn 2010-08-06 13:36:35.521569953 +0200
@@ -78,6 +78,7 @@
LIBRARY_NAME = ssl
LIBRARY_VERSION = 3
+SO_VERSION = 1d
# This part of the code, including all sub-dirs, can be optimized for size
export ALLOW_OPT_CODE_SIZE = 1
Index: nss/mozilla/security/nss/lib/util/manifest.mn
===================================================================
--- nss.orig/mozilla/security/nss/lib/util/manifest.mn 2010-02-11 03:39:47.000000000 +0100
+++ nss/mozilla/security/nss/lib/util/manifest.mn 2010-08-06 13:36:35.521569953 +0200
@@ -106,6 +106,7 @@
LIBRARY_NAME = nssutil
LIBRARY_VERSION = 3
+SO_VERSION = 1d
# This part of the code, including all sub-dirs, can be optimized for size
export ALLOW_OPT_CODE_SIZE = 1
|