1 |
anarchy 09/11/30 15:07:33 |
2 |
|
3 |
Added: nspr-4.8-config.patch |
4 |
nspr-4.8-pkgconfig-gentoo.patch |
5 |
Log: |
6 |
version bump |
7 |
(Portage version: 2.1.7.9/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.1 dev-libs/nspr/files/nspr-4.8-config.patch |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/nspr/files/nspr-4.8-config.patch?rev=1.1&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/nspr/files/nspr-4.8-config.patch?rev=1.1&content-type=text/plain |
14 |
|
15 |
Index: nspr-4.8-config.patch |
16 |
=================================================================== |
17 |
--- mozilla/nsprpub/lib/libc/src/Makefile.in.orig 2005-06-01 14:28:26.000000000 +0000 |
18 |
+++ mozilla/nsprpub/lib/libc/src/Makefile.in 2006-01-15 02:50:39.000000000 +0000 |
19 |
@@ -112,6 +112,10 @@ |
20 |
MKSHLIB += -R '$$ORIGIN' |
21 |
endif |
22 |
|
23 |
+ifeq ($(OS_ARCH), Linux) |
24 |
+DSO_LDOPTS +=-Wl,-R,'$$ORIGIN' |
25 |
+endif |
26 |
+ |
27 |
ifeq ($(OS_ARCH),OS2) |
28 |
MAPFILE = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).def |
29 |
GARBAGE += $(MAPFILE) |
30 |
--- mozilla/nsprpub/lib/ds/Makefile.in.orig 2005-06-01 14:28:25.000000000 +0000 |
31 |
+++ mozilla/nsprpub/lib/ds/Makefile.in 2006-01-15 02:52:30.000000000 +0000 |
32 |
@@ -102,6 +102,10 @@ |
33 |
MKSHLIB += -R '$$ORIGIN' |
34 |
endif |
35 |
|
36 |
+ifeq ($(OS_ARCH), Linux) |
37 |
+DSO_LDOPTS += -Wl,-R,'$$ORIGIN' |
38 |
+endif |
39 |
+ |
40 |
ifeq ($(OS_ARCH),OS2) |
41 |
MAPFILE = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).def |
42 |
GARBAGE += $(MAPFILE) |
43 |
--- mozilla/nsprpub/pr/src/Makefile.in.orig 2005-06-01 14:28:27.000000000 +0000 |
44 |
+++ mozilla/nsprpub/pr/src/Makefile.in 2006-01-15 03:29:36.000000000 +0000 |
45 |
@@ -168,6 +168,7 @@ |
46 |
else |
47 |
OS_LIBS = -ldl |
48 |
endif |
49 |
+DSO_LDOPTS +=-Wl,-R,'$$ORIGIN' |
50 |
endif |
51 |
|
52 |
ifeq ($(OS_ARCH),HP-UX) |
53 |
--- mozilla/nsprpub/config/nspr-config.in.orig 2005-05-11 00:53:41.000000000 +0000 |
54 |
+++ mozilla/nsprpub/config/nspr-config.in 2006-01-15 06:37:58.000000000 +0000 |
55 |
@@ -122,7 +122,7 @@ |
56 |
fi |
57 |
|
58 |
if test "$echo_libs" = "yes"; then |
59 |
- libdirs=-L$libdir |
60 |
+ libdirs="-Wl,-R$libdir -L$libdir" |
61 |
if test -n "$lib_plds"; then |
62 |
libdirs="$libdirs -lplds${major_version}" |
63 |
fi |
64 |
|
65 |
|
66 |
|
67 |
1.1 dev-libs/nspr/files/nspr-4.8-pkgconfig-gentoo.patch |
68 |
|
69 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/nspr/files/nspr-4.8-pkgconfig-gentoo.patch?rev=1.1&view=markup |
70 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/nspr/files/nspr-4.8-pkgconfig-gentoo.patch?rev=1.1&content-type=text/plain |
71 |
|
72 |
Index: nspr-4.8-pkgconfig-gentoo.patch |
73 |
=================================================================== |
74 |
diff -urN nspr-4.8-orig/mozilla/nsprpub/config/config.mk nspr-4.8/mozilla/nsprpub/config/config.mk |
75 |
--- nspr-4.8-orig/mozilla/nsprpub/config/config.mk 2009-09-12 00:43:47.678357452 -0500 |
76 |
+++ nspr-4.8/mozilla/nsprpub/config/config.mk 2009-09-12 00:44:19.383381757 -0500 |
77 |
@@ -162,3 +162,4 @@ |
78 |
RELEASE_INCLUDE_DIR = $(RELEASE_DIR)/$(BUILD_NUMBER)/$(OBJDIR_NAME)/include |
79 |
RELEASE_BIN_DIR = $(RELEASE_DIR)/$(BUILD_NUMBER)/$(OBJDIR_NAME)/bin |
80 |
RELEASE_LIB_DIR = $(RELEASE_DIR)/$(BUILD_NUMBER)/$(OBJDIR_NAME)/lib |
81 |
+RELEASE_PC_DIR = $(RELEASE_LIB_DIR)/pkgconfig |
82 |
diff -urN nspr-4.8-orig/mozilla/nsprpub/config/Makefile.in nspr-4.8/mozilla/nsprpub/config/Makefile.in |
83 |
--- nspr-4.8-orig/mozilla/nsprpub/config/Makefile.in 2009-09-12 00:43:47.678357452 -0500 |
84 |
+++ nspr-4.8/mozilla/nsprpub/config/Makefile.in 2009-09-12 00:44:19.384379661 -0500 |
85 |
@@ -52,9 +52,10 @@ |
86 |
|
87 |
# autoconf.mk must be deleted last (from the top-level directory) |
88 |
# because it is included by every makefile. |
89 |
-DIST_GARBAGE = nsprincl.mk nsprincl.sh nspr-config |
90 |
+DIST_GARBAGE = nsprincl.mk nsprincl.sh nspr-config nspr.pc |
91 |
|
92 |
RELEASE_BINS = nspr-config |
93 |
+RELEASE_PC = nspr.pc |
94 |
|
95 |
include $(topsrcdir)/config/config.mk |
96 |
|
97 |
diff -urN nspr-4.8-orig/mozilla/nsprpub/config/nspr-config.in nspr-4.8/mozilla/nsprpub/config/nspr-config.in |
98 |
--- nspr-4.8-orig/mozilla/nsprpub/config/nspr-config.in 2009-09-12 00:43:47.677356194 -0500 |
99 |
+++ nspr-4.8/mozilla/nsprpub/config/nspr-config.in 2009-09-12 00:45:53.723359547 -0500 |
100 |
@@ -92,13 +92,13 @@ |
101 |
|
102 |
# Set variables that may be dependent upon other variables |
103 |
if test -z "$exec_prefix"; then |
104 |
- exec_prefix=@exec_prefix@ |
105 |
+ exec_prefix=`pkg-config --variable=exec_prefix nspr` |
106 |
fi |
107 |
if test -z "$includedir"; then |
108 |
- includedir=@includedir@ |
109 |
+ includedir=`pkg-config --variable=includedir nspr` |
110 |
fi |
111 |
if test -z "$libdir"; then |
112 |
- libdir=@libdir@ |
113 |
+ libdir=`pkg-config --variable=libdir nspr` |
114 |
fi |
115 |
|
116 |
if test "$echo_prefix" = "yes"; then |
117 |
diff -urN nspr-4.8-orig/mozilla/nsprpub/config/nspr.pc.in nspr-4.8/mozilla/nsprpub/config/nspr.pc.in |
118 |
--- nspr-4.8-orig/mozilla/nsprpub/config/nspr.pc.in 1969-12-31 18:00:00.000000000 -0600 |
119 |
+++ nspr-4.8/mozilla/nsprpub/config/nspr.pc.in 2009-09-12 00:44:19.410432811 -0500 |
120 |
@@ -0,0 +1,11 @@ |
121 |
+prefix=@prefix@ |
122 |
+exec_prefix=@exec_prefix@ |
123 |
+libdir=@libdir@ |
124 |
+includedir=@includedir@ |
125 |
+ |
126 |
+Name: NSPR |
127 |
+Description: The Netscape Portable Runtime |
128 |
+Version: @MOD_MAJOR_VERSION@.@MOD_MINOR_VERSION@.@MOD_PATCH_VERSION@ |
129 |
+Libs: -L${libdir} -lplds@MOD_MAJOR_VERSION@ -lplc@MOD_MAJOR_VERSION@ -lnspr@MOD_MAJOR_VERSION@ -lpthread |
130 |
+Cflags: -I${includedir} |
131 |
+ |
132 |
diff -urN nspr-4.8-orig/mozilla/nsprpub/config/rules.mk nspr-4.8/mozilla/nsprpub/config/rules.mk |
133 |
--- nspr-4.8-orig/mozilla/nsprpub/config/rules.mk 2009-09-12 00:43:47.677356194 -0500 |
134 |
+++ nspr-4.8/mozilla/nsprpub/config/rules.mk 2009-09-12 00:44:19.435517111 -0500 |
135 |
@@ -211,7 +211,7 @@ |
136 |
rm -rf $(wildcard *.OBJ *.OBJD) dist $(ALL_TRASH) $(DIST_GARBAGE) |
137 |
+$(LOOP_OVER_DIRS) |
138 |
|
139 |
-install:: $(RELEASE_BINS) $(RELEASE_HEADERS) $(RELEASE_LIBS) |
140 |
+install:: $(RELEASE_BINS) $(RELEASE_HEADERS) $(RELEASE_LIBS) $(RELEASE_PC) |
141 |
ifdef RELEASE_BINS |
142 |
$(NSINSTALL) -t -m 0755 $(RELEASE_BINS) $(DESTDIR)$(bindir) |
143 |
endif |
144 |
@@ -221,6 +221,9 @@ |
145 |
ifdef RELEASE_LIBS |
146 |
$(NSINSTALL) -t -m 0755 $(RELEASE_LIBS) $(DESTDIR)$(libdir)/$(lib_subdir) |
147 |
endif |
148 |
+ifdef RELEASE_PC |
149 |
+ $(NSINSTALL) -t -m 0644 $(RELEASE_PC) $(DESTDIR)$(libdir)/pkgconfig/ |
150 |
+endif |
151 |
+$(LOOP_OVER_DIRS) |
152 |
|
153 |
release:: export |
154 |
@@ -272,6 +275,23 @@ |
155 |
fi |
156 |
cp $(RELEASE_HEADERS) $(RELEASE_HEADERS_DEST) |
157 |
endif |
158 |
+ifdef RELEASE_PC |
159 |
+ @echo "Copying pkg-config files to release directory" |
160 |
+ @if test -z "$(BUILD_NUMBER)"; then \ |
161 |
+ echo "BUILD_NUMBER must be defined"; \ |
162 |
+ false; \ |
163 |
+ else \ |
164 |
+ true; \ |
165 |
+ fi |
166 |
+ @if test ! -d $(RELEASE_PC_DEST); then \ |
167 |
+ rm -rf $(RELEASE_PC_DEST); \ |
168 |
+ $(NSINSTALL) -D $(RELEASE_PC_DEST);\ |
169 |
+ else \ |
170 |
+ true; \ |
171 |
+ fi |
172 |
+ cp $(RELEASE_PC) $(RELEASE_PC_DEST) |
173 |
+endif |
174 |
+ |
175 |
+$(LOOP_OVER_DIRS) |
176 |
|
177 |
alltags: |
178 |
diff -urN nspr-4.8-orig/mozilla/nsprpub/configure nspr-4.8/mozilla/nsprpub/configure |
179 |
--- nspr-4.8-orig/mozilla/nsprpub/configure 2009-09-12 00:43:47.600359058 -0500 |
180 |
+++ nspr-4.8/mozilla/nsprpub/configure 2009-09-12 00:44:19.444380569 -0500 |
181 |
@@ -6037,6 +6037,7 @@ |
182 |
config/nsprincl.mk |
183 |
config/nsprincl.sh |
184 |
config/nspr-config |
185 |
+config/nspr.pc |
186 |
lib/Makefile |
187 |
lib/ds/Makefile |
188 |
lib/libc/Makefile |
189 |
diff -urN nspr-4.8-orig/mozilla/nsprpub/configure.in nspr-4.8/mozilla/nsprpub/configure.in |
190 |
--- nspr-4.8-orig/mozilla/nsprpub/configure.in 2009-09-12 00:43:47.678357452 -0500 |
191 |
+++ nspr-4.8/mozilla/nsprpub/configure.in 2009-09-12 00:44:19.451396074 -0500 |
192 |
@@ -2871,6 +2871,7 @@ |
193 |
config/nsprincl.mk |
194 |
config/nsprincl.sh |
195 |
config/nspr-config |
196 |
+config/nspr.pc |
197 |
lib/Makefile |
198 |
lib/ds/Makefile |
199 |
lib/libc/Makefile |