← Back to branch summary

~ubuntu-branches/ubuntu/saucy/nspr/saucy-updates

« back to all changes in this revision

Viewing changes to debian/patches/81_sonames.patch

  • Committer: Package Import Robot
  • Author(s): Timo Aaltonen
  • Date: 2012-11-27 17:39:22 UTC
  • mfrom: (1.1.15) (27.1.1 raring-proposed)
  • Revision ID: package-import@ubuntu.com-20121127173922-1zfbtwmy1vczqwxq
Tags: 2:4.9.3-1ubuntu1
* Merge from Debian unstable.  Remaining changes:
  - rules: Enable Thumb2 build on armel, armhf.
  - control: Change Vcs-* to XS-Debian-Vcs-*.
  - control: Add conflicts to evolution-documentation-*,
    language-support-translation-*.
  - control: Add Breaks: evolution-plugins.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/81_sonames.patch
1
 
#! /bin/sh /usr/share/dpatch/dpatch-run
2
 
## 81_sonames.dpatch by Mike Hommey <glandium@debian.org>
3
 
##
4
 
## All lines beginning with `## DP:' are a description of the patch.
5
 
## DP: Add soname support
6
 
 
7
 
@DPATCH@
8
 
 
9
 
Index: nspr/mozilla/nsprpub/config/rules.mk
10
 
===================================================================
11
 
--- nspr.orig/mozilla/nsprpub/config/rules.mk   2011-08-12 11:50:08.000000000 +0200
12
 
+++ nspr/mozilla/nsprpub/config/rules.mk        2011-08-12 11:51:14.512673956 +0200
13
 
@@ -132,6 +132,29 @@
14
 
 else
15
 
 ifdef MKSHLIB
16
 
 SHARED_LIBRARY = $(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
17
 
+SONAME         = $(notdir $(SHARED_LIBRARY))
18
 
+
19
 
+ifdef SO_VERSION
20
 
+ifneq (,$(findstring $(SONAME),$(MKSHLIB)))
21
 
+SO_VERSION_MAJOR       := $(shell echo $(SO_VERSION) | sed 's/^\([^.]*\)\(\.[^.]*\)\?\(\.[^.]*\)\?/\1/')
22
 
+SO_VERSION_MINOR       := $(shell echo $(SO_VERSION) | sed 's/^\([^.]*\)\(\.[^.]*\)\?\(\.[^.]*\)\?/\2/')
23
 
+SO_VERSION_MICRO       := $(shell echo $(SO_VERSION) | sed 's/^\([^.]*\)\(\.[^.]*\)\?\(\.[^.]*\)\?/\3/')
24
 
+
25
 
+SHARED_LIBRARY_LINKS   := $(SONAME)
26
 
+ifdef SO_VERSION_MINOR
27
 
+SHARED_LIBRARY_LINKS   += $(SONAME).$(SO_VERSION_MAJOR)
28
 
+endif
29
 
+ifdef SO_VERSION_MICRO
30
 
+SHARED_LIBRARY_LINKS   += $(SHARED_LIBRARY).$(SO_VERSION_MAJOR)$(SO_VERSION_MINOR)
31
 
+endif
32
 
+
33
 
+SONAME                 := $(SONAME).$(SO_VERSION_MAJOR)
34
 
+SHARED_LIBRARY         := $(SHARED_LIBRARY).$(SO_VERSION)
35
 
+
36
 
+MKSHLINKS              = (cd $(1) && for link in $(SHARED_LIBRARY_LINKS); do rm -f $$link; ln -s $(notdir $(SHARED_LIBRARY)) $$link; done)
37
 
+endif
38
 
+endif
39
 
+
40
 
 endif
41
 
 endif
42
 
 
43
 
@@ -165,7 +188,7 @@
44
 
 endif
45
 
 
46
 
 ALL_TRASH              = $(TARGETS) $(OBJS) $(RES) $(filter-out . .., $(OBJDIR)) LOGS TAGS $(GARBAGE) \
47
 
-                         $(NOSUCHFILE) \
48
 
+                         $(SHARED_LIBRARY_LINKS) $(NOSUCHFILE) \
49
 
                          so_locations
50
 
 
51
 
 ifndef RELEASE_LIBS_DEST
52
 
@@ -215,6 +238,7 @@
53
 
 endif
54
 
 ifdef RELEASE_LIBS
55
 
        $(NSINSTALL) -t -m 0755 $(RELEASE_LIBS) $(DESTDIR)$(libdir)/$(lib_subdir)
56
 
+       $(call MKSHLINKS,$(DESTDIR)$(libdir)/$(lib_subdir))
57
 
 endif
58
 
        +$(LOOP_OVER_DIRS)
59
 
 
60
 
@@ -325,6 +349,8 @@
61
 
 endif
62
 
 endif
63
 
 
64
 
+$(SHARED_LIBRARY_LINKS): %: $(SHARED_LIBRARY)
65
 
+
66
 
 $(SHARED_LIBRARY): $(OBJS) $(RES) $(MAPFILE)
67
 
        @$(MAKE_OBJDIR)
68
 
        rm -f $@
69
 
@@ -354,6 +380,7 @@
70
 
 endif  # MOZ_PROFILE_GENERATE
71
 
 else   # WINNT && !GCC
72
 
        $(MKSHLIB) $(OBJS) $(RES) $(LDFLAGS) $(EXTRA_LIBS)
73
 
+       $(call MKSHLINKS,.)
74
 
 endif  # WINNT && !GCC
75
 
 endif  # AIX 4.1
76
 
 ifdef ENABLE_STRIP
77
 
Index: nspr/mozilla/nsprpub/configure.in
78
 
===================================================================
79
 
--- nspr.orig/mozilla/nsprpub/configure.in      2011-08-12 11:50:34.000000000 +0200
80
 
+++ nspr/mozilla/nsprpub/configure.in   2011-08-12 11:51:36.656635307 +0200
81
 
@@ -1192,7 +1192,7 @@
82
 
     PR_MD_CSRCS=linux.c
83
 
     MKSHLIB='$(CC) $(DSO_LDOPTS) $(WRAP_MALLOC_LIB) -o $@'
84
 
     DSO_CFLAGS=-fPIC
85
 
-    DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)'
86
 
+    DSO_LDOPTS='-shared -Wl,-soname -Wl,$(SONAME)'
87
 
     _OPTIMIZE_FLAGS=-O2
88
 
     _DEBUG_FLAGS="-g -fno-inline"  # most people on linux use gcc/gdb, and that
89
 
                                    # combo is not yet good at debugging inlined
90
 
@@ -1278,7 +1278,7 @@
91
 
         AC_DEFINE(_PR_STAT_HAS_ST_ATIMESPEC)
92
 
         MKSHLIB='$(CC) -o $@ $(DSO_LDOPTS)'
93
 
         DSO_CFLAGS=-fPIC
94
 
-        DSO_LDOPTS='-shared -Wl,-soname,$(@:$(OBJDIR)/%.so=%.so)'
95
 
+        DSO_LDOPTS='-shared -Wl,-soname,$(SONAME)'
96
 
         STRIP="$STRIP -d"
97
 
         case "$target_os" in
98
 
         bsdi4.2* | bsdi4.3* | bsdi5.*)
99
 
@@ -1478,7 +1478,7 @@
100
 
     fi
101
 
     MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
102
 
     DSO_CFLAGS=-fPIC
103
 
-    DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)'
104
 
+    DSO_LDOPTS='-shared -Wl,-soname -Wl,$(SONAME)'
105
 
     MDCPUCFG_H=_freebsd.cfg
106
 
     PR_MD_CSRCS=freebsd.c
107
 
     ;;
108
 
@@ -1493,7 +1493,7 @@
109
 
     # workaround this problem.
110
 
     AC_DEFINE(_PR_POLL_WITH_SELECT)
111
 
     AC_DEFINE(_USE_BIG_FDS)
112
 
-    DSO_LDOPTS='-b +h $(notdir $@)'
113
 
+    DSO_LDOPTS='-b +h $(SONAME)'
114
 
     PR_MD_CSRCS=hpux.c
115
 
     if test "$OS_TEST" = "ia64"; then
116
 
         DLL_SUFFIX=so
117
 
@@ -1750,7 +1750,7 @@
118
 
     PR_MD_CSRCS=linux.c
119
 
     MKSHLIB='$(CC) $(DSO_LDOPTS) $(WRAP_MALLOC_LIB) -o $@'
120
 
     DSO_CFLAGS=-fPIC
121
 
-    DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)'
122
 
+    DSO_LDOPTS='-shared -Wl,-soname -Wl,$(SONAME)'
123
 
     _OPTIMIZE_FLAGS=-O2
124
 
     _DEBUG_FLAGS="-g -fno-inline"  # most people on linux use gcc/gdb, and that
125
 
                                    # combo is not yet good at debugging inlined
126
 
@@ -2087,7 +2087,7 @@
127
 
         else
128
 
             OBJECT_FMT=ELF
129
 
             DLL_SUFFIX=so
130
 
-            DSO_LDOPTS='-shared -Wl,-soname,$(notdir $@)'
131
 
+            DSO_LDOPTS='-shared -Wl,-soname,$(SONAME)'
132
 
         fi
133
 
     fi
134
 
 
135
 
@@ -2133,7 +2133,7 @@
136
 
     AC_DEFINE(HAVE_POINTER_LOCALTIME_R)
137
 
     MDCPUCFG_H=_nto.cfg
138
 
     PR_MD_CSRCS=nto.c
139
 
-    MKSHLIB='$(CC) $(DSO_LDOPTS) -Wl,-soname -Wl,$(notdir $@) -o $@'
140
 
+    MKSHLIB='$(CC) $(DSO_LDOPTS) -Wl,-soname -Wl,$(SONAME) -o $@'
141
 
     DSO_CFLAGS=-fPIC
142
 
     DSO_LDOPTS=-shared
143
 
     OS_LIBS="$OS_LIBS -lsocket"
144
 
@@ -2196,7 +2196,7 @@
145
 
     if echo $OS_RELEASE | grep -c V4.0 >/dev/null; then
146
 
         AC_DEFINE(OSF1V4_MAP_PRIVATE_BUG)
147
 
     fi
148
 
-    DSO_LDOPTS='-shared -all -expect_unresolved "*" -soname $(notdir $@)'
149
 
+    DSO_LDOPTS='-shared -all -expect_unresolved "*" -soname $(SONAME)'
150
 
     MDCPUCFG_H=_osf1.cfg
151
 
     PR_MD_CSRCS=osf1.c
152
 
     ;;
153
 
@@ -2263,7 +2263,7 @@
154
 
         _OPTIMIZE_FLAGS='-O -F Olimit,4000'
155
 
     fi
156
 
 
157
 
-    DSO_LDOPTS='-G -z defs -h $(@:$(OBJDIR)/%.so=%.so)'
158
 
+    DSO_LDOPTS='-G -z defs -h $(SONAME)'
159
 
 
160
 
     if test "$OS_RELEASE" = "5.43"; then
161
 
         AC_DEFINE(IP_MULTICAST)
162
 
@@ -2328,13 +2328,13 @@
163
 
         if `$CC -print-prog-name=ld` -v 2>&1 | grep -c GNU >/dev/null; then
164
 
             GCC_USE_GNU_LD=1
165
 
         fi
166
 
-        DSO_LDOPTS='-shared -Wl,-h,$(notdir $@),-z,combreloc,-z,defs,-z,ignore' 
167
 
+        DSO_LDOPTS='-shared -Wl,-h,$(SONAME),-z,combreloc,-z,defs,-z,ignore' 
168
 
         if test -n "$USE_B_DIRECT"; then
169
 
             DSO_LDOPTS="$DSO_LDOPTS,-Bdirect"
170
 
         fi
171
 
     else
172
 
         DSO_CFLAGS=-KPIC
173
 
-        DSO_LDOPTS='-G -h $(notdir $@) -z combreloc -z defs -z ignore'
174
 
+        DSO_LDOPTS='-G -h $(SONAME) -z combreloc -z defs -z ignore'
175
 
         if test -n "$USE_B_DIRECT"; then
176
 
             DSO_LDOPTS="$DSO_LDOPTS -Bdirect"
177
 
         fi
178
 
Index: nspr/mozilla/nsprpub/lib/ds/Makefile.in
179
 
===================================================================
180
 
--- nspr.orig/mozilla/nsprpub/lib/ds/Makefile.in        2011-08-12 11:49:04.000000000 +0200
181
 
+++ nspr/mozilla/nsprpub/lib/ds/Makefile.in     2011-08-12 11:51:14.512673956 +0200
182
 
@@ -122,6 +122,7 @@
183
 
 
184
 
 LIBRARY_NAME   = plds
185
 
 LIBRARY_VERSION        = $(MOD_MAJOR_VERSION)
186
 
+SO_VERSION     = 0d
187
 
 
188
 
 RELEASE_HEADERS = $(HEADERS)
189
 
 RELEASE_HEADERS_DEST = $(RELEASE_INCLUDE_DIR)
190
 
@@ -176,11 +177,13 @@
191
 
 export:: $(TARGETS)
192
 
        $(INSTALL) -m 444 $(HEADERS) $(dist_includedir)
193
 
        $(INSTALL) -m 444 $(TARGETS) $(dist_libdir)
194
 
+       $(call MKSHLINKS,$(dist_libdir))
195
 
 ifdef SHARED_LIBRARY
196
 
 ifeq ($(OS_ARCH),HP-UX)
197
 
        $(INSTALL) -m 755 $(SHARED_LIBRARY) $(dist_libdir)
198
 
        $(INSTALL) -m 755 $(SHARED_LIBRARY) $(dist_bindir)
199
 
 else
200
 
        $(INSTALL) -m 444 $(SHARED_LIBRARY) $(dist_bindir)
201
 
+       $(call MKSHLINKS,$(dist_bindir))
202
 
 endif
203
 
 endif
204
 
Index: nspr/mozilla/nsprpub/lib/libc/src/Makefile.in
205
 
===================================================================
206
 
--- nspr.orig/mozilla/nsprpub/lib/libc/src/Makefile.in  2011-08-12 11:49:04.000000000 +0200
207
 
+++ nspr/mozilla/nsprpub/lib/libc/src/Makefile.in       2011-08-12 11:51:14.516673947 +0200
208
 
@@ -68,6 +68,7 @@
209
 
 
210
 
 LIBRARY_NAME   = plc
211
 
 LIBRARY_VERSION        = $(MOD_MAJOR_VERSION)
212
 
+SO_VERSION     = 0d
213
 
 
214
 
 RELEASE_LIBS = $(TARGETS)
215
 
 
216
 
@@ -177,11 +178,13 @@
217
 
 
218
 
 export:: $(TARGETS)
219
 
        $(INSTALL) -m 444 $(TARGETS) $(dist_libdir)
220
 
+       $(call MKSHLINKS,$(dist_libdir))
221
 
 ifdef SHARED_LIBRARY
222
 
 ifeq ($(OS_ARCH),HP-UX)
223
 
        $(INSTALL) -m 755 $(SHARED_LIBRARY) $(dist_libdir)
224
 
        $(INSTALL) -m 755 $(SHARED_LIBRARY) $(dist_bindir)
225
 
 else
226
 
        $(INSTALL) -m 444 $(SHARED_LIBRARY) $(dist_bindir)
227
 
+       $(call MKSHLINKS,$(dist_bindir))
228
 
 endif
229
 
 endif
230
 
Index: nspr/mozilla/nsprpub/pr/src/Makefile.in
231
 
===================================================================
232
 
--- nspr.orig/mozilla/nsprpub/pr/src/Makefile.in        2011-08-12 11:49:04.000000000 +0200
233
 
+++ nspr/mozilla/nsprpub/pr/src/Makefile.in     2011-08-12 11:51:14.516673947 +0200
234
 
@@ -321,6 +321,7 @@
235
 
 
236
 
 LIBRARY_NAME = nspr
237
 
 LIBRARY_VERSION = $(MOD_MAJOR_VERSION)
238
 
+SO_VERSION = 0d
239
 
 
240
 
 RELEASE_LIBS = $(TARGETS)
241
 
 
242
 
@@ -394,12 +395,14 @@
243
 
 
244
 
 build:: $(TARGETS)
245
 
        $(INSTALL) -m 444 $(TARGETS) $(dist_libdir)
246
 
+       $(call MKSHLINKS,$(dist_libdir))
247
 
 ifdef SHARED_LIBRARY
248
 
 ifeq ($(OS_ARCH),HP-UX)
249
 
        $(INSTALL) -m 755 $(SHARED_LIBRARY) $(dist_libdir)
250
 
        $(INSTALL) -m 755 $(SHARED_LIBRARY) $(dist_bindir)
251
 
 else
252
 
        $(INSTALL) -m 444 $(SHARED_LIBRARY) $(dist_bindir)
253
 
+       $(call MKSHLINKS,$(dist_bindir))
254
 
 endif
255
 
 endif
256