1 |
commit: 0625099413811021f37a1cbeabee2183c3a22d58 |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Sep 28 10:09:18 2016 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Sep 28 10:09:37 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06250994 |
7 |
|
8 |
dev-libs/nspr: Bump to version 4.13 |
9 |
|
10 |
Package-Manager: portage-2.3.1 |
11 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
12 |
|
13 |
dev-libs/nspr/Manifest | 1 + |
14 |
dev-libs/nspr/files/nspr-4.10.6-solaris.patch | 4 +- |
15 |
dev-libs/nspr/files/nspr-4.7.0-prtime.patch | 4 +- |
16 |
dev-libs/nspr/files/nspr-4.7.1-solaris.patch | 4 +- |
17 |
.../files/nspr-4.8.4-darwin-install_name.patch | 8 +- |
18 |
dev-libs/nspr/files/nspr-4.8.9-link-flags.patch | 8 +- |
19 |
dev-libs/nspr/files/nspr-4.9.5_nspr_config.patch | 5 +- |
20 |
dev-libs/nspr/nspr-4.13.ebuild | 125 +++++++++++++++++++++ |
21 |
8 files changed, 142 insertions(+), 17 deletions(-) |
22 |
|
23 |
diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest |
24 |
index 5a07789..f17b8ae 100644 |
25 |
--- a/dev-libs/nspr/Manifest |
26 |
+++ b/dev-libs/nspr/Manifest |
27 |
@@ -2,3 +2,4 @@ DIST nspr-4.10.10.tar.gz 1134164 SHA256 343614971c30520d0fa55f4af0a72578e2d8674b |
28 |
DIST nspr-4.10.8.tar.gz 1131130 SHA256 507ea57c525c0c524dae4857a642b4ef5c9d795518754c7f83422d22fe544a15 SHA512 f14e3bd46cd1dee9d7163adbf3b09a450ea8c6c65499c5b6696eba7e85b6b12d3f90561a1dfe0dc0dc5fe1b14758b4191e546d9f0e29a66f33c69dd6ed6f50d9 WHIRLPOOL 67be897d54e2446d563cfe505047b23880025bd3f1ea5492964f8d286f56776e41a8e63bd9d197d3115efae0d63bd0c7005fb9fc56abdfce0702c27e6a9e872c |
29 |
DIST nspr-4.11.tar.gz 1134106 SHA256 cb320a9eee7028275ac0fce7adc39dee36f14f02fd8432fce1b7e1aa5e3685c2 SHA512 26c47ba618f5a7748cacc5152348b6fd37bdcc82806bbff485ed4d485aecad13d202270a837c735670030e96380ec3177f3bc8a47e0dca359cfb097a84242c02 WHIRLPOOL f8707154d1981a09140d31d359d5a40867eaad447620a4731a11c770cae13b8e9a64ef45c82123083e37e2effedfb0c367cc57969a3baf65628ff1e9ccf41517 |
30 |
DIST nspr-4.12.tar.gz 1135458 SHA256 e0b10a1e569153668ff8bdea6c7e491b389fab69c2f18285a1ebf7c2ea4269de SHA512 138072be98dea6e97ea38f3e562c8ee383626c2136ec1adb854a81315468cd484c4b994c3ccaf6a39327b3fe121f77d698bf85c2764ec4b6231828b8a9ec5460 WHIRLPOOL d85d74e6287ed9578bc565c5e699f7201fbf38cb55e6dfa487f1c8b4684c161b6c6a5c8cb06627575d7a417bf35b15c64d231878dab32b5bbcc8223b7356c32d |
31 |
+DIST nspr-4.13.tar.gz 1136571 SHA256 19c33334bb3fa6d24800ffa65d7d806c54ad5f8c3758a5c11352ad43212ab181 SHA512 6af8671aa32d2dd08e900f235950c200e27c7052be2456651cbd8d508f376f60bdbdaa2ac984397027706618e0c794749c9dbf09c1972d9ba5280dadec37a562 WHIRLPOOL 5b93db16eb4bf1e8ee3e39b2df7f880cf42d80583a8b191395d5602090120eab83881eb2459869ff12de070cbd4be969f97d94445b40ac56ae810682008b16e3 |
32 |
|
33 |
diff --git a/dev-libs/nspr/files/nspr-4.10.6-solaris.patch b/dev-libs/nspr/files/nspr-4.10.6-solaris.patch |
34 |
index 3ae8052..6ae04f4 100644 |
35 |
--- a/dev-libs/nspr/files/nspr-4.10.6-solaris.patch |
36 |
+++ b/dev-libs/nspr/files/nspr-4.10.6-solaris.patch |
37 |
@@ -1,7 +1,7 @@ |
38 |
* drop Solaris linker stuff |
39 |
|
40 |
---- nspr-4.7.4/mozilla/nsprpub/configure.in |
41 |
-+++ nspr-4.7.4/mozilla/nsprpub/configure.in |
42 |
+--- a/configure.in |
43 |
++++ b/configure.in |
44 |
@@ -1988,26 +1988,14 @@ |
45 |
CPU_ARCH=`uname -p` |
46 |
MDCPUCFG_H=_solaris.cfg |
47 |
|
48 |
diff --git a/dev-libs/nspr/files/nspr-4.7.0-prtime.patch b/dev-libs/nspr/files/nspr-4.7.0-prtime.patch |
49 |
index ac509ef..2de3ba3 100644 |
50 |
--- a/dev-libs/nspr/files/nspr-4.7.0-prtime.patch |
51 |
+++ b/dev-libs/nspr/files/nspr-4.7.0-prtime.patch |
52 |
@@ -1,5 +1,5 @@ |
53 |
---- mozilla/nsprpub/pr/src/misc/prtime.c.orig 2007-09-14 19:41:08.000000000 +0200 |
54 |
-+++ mozilla/nsprpub/pr/src/misc/prtime.c 2007-09-14 19:42:17.000000000 +0200 |
55 |
+--- a/pr/src/misc/prtime.c |
56 |
++++ b/pr/src/misc/prtime.c |
57 |
@@ -1536,7 +1536,7 @@ |
58 |
case TT_EET: zone_offset = 2 * 60; break; |
59 |
case TT_JST: zone_offset = 9 * 60; break; |
60 |
|
61 |
diff --git a/dev-libs/nspr/files/nspr-4.7.1-solaris.patch b/dev-libs/nspr/files/nspr-4.7.1-solaris.patch |
62 |
index 5d9e810..1afab1d 100644 |
63 |
--- a/dev-libs/nspr/files/nspr-4.7.1-solaris.patch |
64 |
+++ b/dev-libs/nspr/files/nspr-4.7.1-solaris.patch |
65 |
@@ -1,8 +1,8 @@ |
66 |
Same magic as haubi did for glib compilation, which works again here |
67 |
resolving a linker problem on Solaris with GNU ld. Bug #222625 |
68 |
|
69 |
---- mozilla/nsprpub/pr/src/Makefile.in.orig 2008-06-22 22:24:56.671065000 +0200 |
70 |
-+++ mozilla/nsprpub/pr/src/Makefile.in 2008-06-23 14:38:52.320417000 +0200 |
71 |
+--- a/pr/src/Makefile.in |
72 |
++++ b/pr/src/Makefile.in |
73 |
@@ -95,7 +95,7 @@ |
74 |
endif |
75 |
|
76 |
|
77 |
diff --git a/dev-libs/nspr/files/nspr-4.8.4-darwin-install_name.patch b/dev-libs/nspr/files/nspr-4.8.4-darwin-install_name.patch |
78 |
index 1258b60..4045e90 100644 |
79 |
--- a/dev-libs/nspr/files/nspr-4.8.4-darwin-install_name.patch |
80 |
+++ b/dev-libs/nspr/files/nspr-4.8.4-darwin-install_name.patch |
81 |
@@ -1,8 +1,8 @@ |
82 |
Don't use @executable_path, it messed up linking against nspr from e.g. |
83 |
nss. |
84 |
|
85 |
---- mozilla/nsprpub/configure.in |
86 |
-+++ mozilla/nsprpub/configure.in |
87 |
+--- a/configure.in |
88 |
++++ b/configure.in |
89 |
@@ -1007,7 +1007,7 @@ |
90 |
;; |
91 |
esac |
92 |
@@ -12,8 +12,8 @@ nss. |
93 |
_OPTIMIZE_FLAGS=-O2 |
94 |
MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@' |
95 |
STRIP="$STRIP -x -S" |
96 |
---- mozilla/nsprpub/configure |
97 |
-+++ mozilla/nsprpub/configure |
98 |
+--- a/configure |
99 |
++++ b/configure |
100 |
@@ -1007,7 +1007,7 @@ |
101 |
;; |
102 |
esac |
103 |
|
104 |
diff --git a/dev-libs/nspr/files/nspr-4.8.9-link-flags.patch b/dev-libs/nspr/files/nspr-4.8.9-link-flags.patch |
105 |
index dd3b132..5d37018 100644 |
106 |
--- a/dev-libs/nspr/files/nspr-4.8.9-link-flags.patch |
107 |
+++ b/dev-libs/nspr/files/nspr-4.8.9-link-flags.patch |
108 |
@@ -5,8 +5,8 @@ autoparallelization). Other flags are required when building and linking |
109 |
|
110 |
https://bugs.gentoo.org/365975 |
111 |
|
112 |
---- a/mozilla/nsprpub/config/autoconf.mk.in |
113 |
-+++ b/mozilla/nsprpub/config/autoconf.mk.in |
114 |
+--- a/config/autoconf.mk.in |
115 |
++++ b/config/autoconf.mk.in |
116 |
@@ -81,6 +81,7 @@ OS_DLLFLAGS = @OS_DLLFLAGS@ |
117 |
DLLFLAGS = @DLLFLAGS@ |
118 |
EXEFLAGS = @EXEFLAGS@ |
119 |
@@ -15,8 +15,8 @@ https://bugs.gentoo.org/365975 |
120 |
|
121 |
PROFILE_GEN_CFLAGS = @PROFILE_GEN_CFLAGS@ |
122 |
PROFILE_GEN_LDFLAGS = @PROFILE_GEN_LDFLAGS@ |
123 |
---- a/mozilla/nsprpub/config/config.mk |
124 |
-+++ b/mozilla/nsprpub/config/config.mk |
125 |
+--- a/config/config.mk |
126 |
++++ b/config/config.mk |
127 |
@@ -72,7 +72,7 @@ NOMD_CFLAGS = $(CC_ONLY_FLAGS) $(OPTIMIZER) $(NOMD_OS_CFLAGS)\ |
128 |
NOMD_CCFLAGS = $(CCC_ONLY_FLAGS) $(OPTIMIZER) $(NOMD_OS_CFLAGS)\ |
129 |
$(XP_DEFINE) $(DEFINES) $(INCLUDES) $(XCFLAGS) |
130 |
|
131 |
diff --git a/dev-libs/nspr/files/nspr-4.9.5_nspr_config.patch b/dev-libs/nspr/files/nspr-4.9.5_nspr_config.patch |
132 |
index d4f9a7e..a22b0b9 100644 |
133 |
--- a/dev-libs/nspr/files/nspr-4.9.5_nspr_config.patch |
134 |
+++ b/dev-libs/nspr/files/nspr-4.9.5_nspr_config.patch |
135 |
@@ -1,6 +1,5 @@ |
136 |
-diff -urN a/mozilla/nsprpub/config/nspr-config.in b/mozilla/nsprpub/config/nspr-config.in |
137 |
---- a/mozilla/nsprpub/config/nspr-config.in 2012-03-06 07:13:39.000000000 -0600 |
138 |
-+++ b/mozilla/nsprpub/config/nspr-config.in 2013-02-16 20:53:53.893489345 -0600 |
139 |
+--- a/config/nspr-config.in |
140 |
++++ b/config/nspr-config.in |
141 |
@@ -126,7 +126,7 @@ |
142 |
fi |
143 |
|
144 |
|
145 |
diff --git a/dev-libs/nspr/nspr-4.13.ebuild b/dev-libs/nspr/nspr-4.13.ebuild |
146 |
new file mode 100644 |
147 |
index 00000000..cc2f965 |
148 |
--- /dev/null |
149 |
+++ b/dev-libs/nspr/nspr-4.13.ebuild |
150 |
@@ -0,0 +1,125 @@ |
151 |
+# Copyright 1999-2016 Gentoo Foundation |
152 |
+# Distributed under the terms of the GNU General Public License v2 |
153 |
+# $Id$ |
154 |
+ |
155 |
+EAPI=6 |
156 |
+WANT_AUTOCONF="2.5" |
157 |
+ |
158 |
+inherit autotools eutils multilib toolchain-funcs versionator multilib-minimal |
159 |
+ |
160 |
+MIN_PV="$(get_version_component_range 2)" |
161 |
+ |
162 |
+DESCRIPTION="Netscape Portable Runtime" |
163 |
+HOMEPAGE="http://www.mozilla.org/projects/nspr/" |
164 |
+SRC_URI="https://archive.mozilla.org/pub/nspr/releases/v${PV}/src/${P}.tar.gz" |
165 |
+ |
166 |
+LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )" |
167 |
+SLOT="0" |
168 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" |
169 |
+IUSE="debug" |
170 |
+ |
171 |
+RDEPEND=" |
172 |
+ abi_x86_32? ( |
173 |
+ !<=app-emulation/emul-linux-x86-baselibs-20140508-r12 |
174 |
+ !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] |
175 |
+ )" |
176 |
+ |
177 |
+MULTILIB_CHOST_TOOLS=( |
178 |
+ /usr/bin/nspr-config |
179 |
+) |
180 |
+ |
181 |
+PATCHES=( |
182 |
+ "${FILESDIR}"/${PN}-4.7.0-prtime.patch |
183 |
+ "${FILESDIR}"/${PN}-4.7.1-solaris.patch |
184 |
+ "${FILESDIR}"/${PN}-4.10.6-solaris.patch |
185 |
+ "${FILESDIR}"/${PN}-4.8.4-darwin-install_name.patch |
186 |
+ "${FILESDIR}"/${PN}-4.8.9-link-flags.patch |
187 |
+ # We do not need to pass -L$libdir via nspr-config --libs |
188 |
+ "${FILESDIR}"/${PN}-4.9.5_nspr_config.patch |
189 |
+) |
190 |
+ |
191 |
+src_prepare() { |
192 |
+ cd "${S}"/nspr || die |
193 |
+ |
194 |
+ default |
195 |
+ |
196 |
+ # rename configure.in to configure.ac for new autotools compatibility |
197 |
+ if [[ -e "${S}"/nspr/configure.in ]] ; then |
198 |
+ einfo "Renaming configure.in to configure.ac" |
199 |
+ mv "${S}"/nspr/configure.{in,ac} || die |
200 |
+ fi |
201 |
+ # We must run eautoconf to regenerate configure |
202 |
+ eautoconf |
203 |
+ |
204 |
+ # make sure it won't find Perl out of Prefix |
205 |
+ sed -i -e "s/perl5//g" "${S}"/nspr/configure || die |
206 |
+ |
207 |
+ # Respect LDFLAGS |
208 |
+ sed -i -e 's/\$(MKSHLIB) \$(OBJS)/\$(MKSHLIB) \$(LDFLAGS) \$(OBJS)/g' \ |
209 |
+ "${S}"/nspr/config/rules.mk || die |
210 |
+} |
211 |
+ |
212 |
+multilib_src_configure() { |
213 |
+ # We use the standard BUILD_xxx but nspr uses HOST_xxx |
214 |
+ tc-export_build_env BUILD_CC |
215 |
+ export HOST_CC=${BUILD_CC} HOST_CFLAGS=${BUILD_CFLAGS} HOST_LDFLAGS=${BUILD_LDFLAGS} |
216 |
+ tc-export AR CC CXX RANLIB |
217 |
+ [[ ${CBUILD} != ${CHOST} ]] \ |
218 |
+ && export CROSS_COMPILE=1 \ |
219 |
+ || unset CROSS_COMPILE |
220 |
+ |
221 |
+ local myconf=() |
222 |
+ |
223 |
+ # The configure has some fancy --enable-{{n,x}32,64bit} switches |
224 |
+ # that trigger some code conditional to platform & arch. This really |
225 |
+ # matters for the few common arches (x86, ppc) but we pass a little |
226 |
+ # more of them to be future-proof. |
227 |
+ |
228 |
+ # use ABI first, this will work for most cases |
229 |
+ case "${ABI}" in |
230 |
+ alpha|arm|hppa|m68k|o32|ppc|s390|sh|sparc|x86) ;; |
231 |
+ n32) myconf+=( --enable-n32 );; |
232 |
+ x32) myconf+=( --enable-x32 );; |
233 |
+ s390x|*64) myconf+=( --enable-64bit );; |
234 |
+ default) # no abi actually set, fall back to old check |
235 |
+ einfo "Running a short build test to determine 64bit'ness" |
236 |
+ echo > "${T}"/test.c || die |
237 |
+ ${CC} ${CFLAGS} ${CPPFLAGS} -c "${T}"/test.c -o "${T}"/test.o || die |
238 |
+ case $(file "${T}"/test.o) in |
239 |
+ *32-bit*x86-64*) myconf+=( --enable-x32 );; |
240 |
+ *64-bit*|*ppc64*|*x86_64*) myconf+=( --enable-64bit );; |
241 |
+ *32-bit*|*ppc*|*i386*) ;; |
242 |
+ *) die "Failed to detect whether your arch is 64bits or 32bits, disable distcc if you're using it, please";; |
243 |
+ esac ;; |
244 |
+ *) ;; |
245 |
+ esac |
246 |
+ |
247 |
+ # Ancient autoconf needs help finding the right tools. |
248 |
+ LC_ALL="C" ECONF_SOURCE="${S}/nspr" \ |
249 |
+ ac_cv_path_AR="${AR}" \ |
250 |
+ econf \ |
251 |
+ --libdir="${EPREFIX}/usr/$(get_libdir)" \ |
252 |
+ $(use_enable debug) \ |
253 |
+ $(use_enable !debug optimize) \ |
254 |
+ "${myconf[@]}" |
255 |
+} |
256 |
+ |
257 |
+multilib_src_install() { |
258 |
+ # Their build system is royally confusing, as usual |
259 |
+ MINOR_VERSION=${MIN_PV} # Used for .so version |
260 |
+ emake DESTDIR="${D}" install |
261 |
+ |
262 |
+ einfo "removing static libraries as upstream has requested!" |
263 |
+ rm -f "${ED}"/usr/$(get_libdir)/*.a || die "failed to remove static libraries." |
264 |
+ |
265 |
+ # install nspr-config |
266 |
+ dobin config/nspr-config |
267 |
+ |
268 |
+ # Remove stupid files in /usr/bin |
269 |
+ rm "${ED}"/usr/bin/prerr.properties || die |
270 |
+ |
271 |
+ # This is used only to generate prerr.c and prerr.h at build time. |
272 |
+ # No other projects use it, and we don't want to depend on perl. |
273 |
+ # Talked to upstream and they agreed w/punting. |
274 |
+ rm "${ED}"/usr/bin/compile-et.pl || die |
275 |
+} |