commit: 602c8b31e4a0e46232bf5d12cd8c1402d8634307
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 15 00:14:17 2016 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Tue Mar 15 00:14:17 2016 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=602c8b31
dev-libs/nspr: in tree version 4.12 works
Package-Manager: portage-2.2.26
dev-libs/nspr/Manifest | 10 --
.../files/nspr-4.10.6-no-getprotobyname_r.patch | 11 --
dev-libs/nspr/files/nspr-4.10.6-solaris.patch | 32 ------
dev-libs/nspr/files/nspr-4.7.0-prtime.patch | 26 -----
dev-libs/nspr/files/nspr-4.7.1-solaris.patch | 14 ---
.../files/nspr-4.8.4-darwin-install_name.patch | 25 -----
dev-libs/nspr/files/nspr-4.8.9-link-flags.patch | 28 -----
dev-libs/nspr/files/nspr-4.9.5_nspr_config.patch | 12 --
dev-libs/nspr/metadata.xml | 8 --
dev-libs/nspr/nspr-4.10.10-r99.ebuild | 122 ---------------------
10 files changed, 288 deletions(-)
diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest
deleted file mode 100644
index d6e3dcb..0000000
--- a/dev-libs/nspr/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-AUX nspr-4.10.6-no-getprotobyname_r.patch 408 SHA256
56a69e868c4e0c4fd9aaaadda8a62537ec23d1881abb784b9c50def0ab247162 SHA512
a7c2389013f02a7e670f59b1a47ef0aaae8a3e5fd6eb264588d5f2cacf187295c1a456ef5ba851b6032be3d95c0047b6171f90f26612a4e201de2e68f494e349
WHIRLPOOL
eb1baa09a281b77c5d8f4865550a0950b34a21d64c0050fea48e4da086cc1085c30a219644b454ffd3bcbc5482df006d29b95450aa48a530921f9420692b4378
-AUX nspr-4.10.6-solaris.patch 1023 SHA256
c9baea43015c0f8fe436b2fef044b542d5ea05ad795accd022a21dd6953298bf SHA512
f6bd055f0945cf21e333489c9ddb230cb568ad24dc11173a6aa5c09883ca83a2e40aa70ff48e846fc5f36e8b5dabda91d32bcc04495b4d6d78ff95223d2803fc
WHIRLPOOL
7525fd90818bc98247e5afed56ad62eca9b4860f821cce97b50d7e97ef4a8a1a1ed320652aaa85fe191cb50d29399c96e72300a549590ec8ae192ead990c0657
-AUX nspr-4.7.0-prtime.patch 964 SHA256
3fd4f3c68257dced021c0bfa00245d0da2d6c64205135b1cc89f96a3375dffc7 SHA512
f8e09dda87e1d4a226fcf48ebc2cdfb20e67c351ffd227603b150636b19df49471ca0c617005e515ccee715df248363ed2e2162563ea6bce978e8607b6aba001
WHIRLPOOL
0090d17ebc287a39d18dbe531dc31522601ce4fc32ddd9a45bd9024987c328aa9fab7c7606673a1220c9b8602ee76c7f58bd7c4d3d639e8edb356d4d0efbd32e
-AUX nspr-4.7.1-solaris.patch 516 SHA256
e47a0abb5b106af38fdfab2ca8661b4a1596d48ff7ca988280728dc6b8a49447 SHA512
864b842e77353b29f7d0b44cdd64d1a0f613fafa2d074f10adc30a1f1c2b69c5270646c25faa64a7b072e3f7d0f68134fe23eeaafd7bdf46d12f889074a8ef78
WHIRLPOOL
b2caa24d39bb372a184a60f1a775d6787b6d6aec65db5d32772de5c70953b4a53ab6244b569bd5c1da63f5a6e00a7a50da6bd7e807085e3f3483aa90810ffe64
-AUX nspr-4.8.4-darwin-install_name.patch 1102 SHA256
ca17efc9a60f4372b5da9c29ddf1143726381b9825907f8e3162974224636fab SHA512
1c62eaea00c4eebe6885bfffca41131cfd5cd1c848d7564ccae32a39f012834684b2d3113dcb1a3d4607629dbec9909d6754491dc7caa977203e6010623fef4d
WHIRLPOOL
1f5674fe691d75dbf7b9549d58700fef973a8fd6f805a389727843ffb336392587833bbb19af9c22b1388b3d3dcd2c760978676c9a55d894b646e029f8ba7280
-AUX nspr-4.8.9-link-flags.patch 995 SHA256
f986c69ff6250f54eb291339ab5503e73cc5cc68af4c3c3ed5a25812bf47b610 SHA512
3c20019b5a378bc0cec1925c2324fc1b72bd1427e9262065952632c406bc6a8f9303fc55aabad472713f5e8656973db5c503dd9072ea01283a6f671dcd26b049
WHIRLPOOL
695310cfd54140b2c333f0b6556d8c049441b246a006cc885d2149a6d73d8d6223964d47d5af87c949ab2693fd320c4ecf67fd120b09862972a39df0cc00c7ca
-AUX nspr-4.9.5_nspr_config.patch 445 SHA256
7414eaac7630ba3aa9f3c44b439471abb195c96796f78cf5ddfd4e10c68389e8 SHA512
3d3dc60b4bb4a6b469e992239ca7e5702949880bbe3e603691bf7cab199a80e6b9fd89aa3184c26d99185b43785f6f2f7a9a16e061080e13ca02146dd2f172bf
WHIRLPOOL
d807bc98ca6f47d943f0b6f9a4d33dee387eddf9ae4a9d6a8863697d96c82ae1560d871b76c866b6a85b4eb1d31e9e9f1ce59caa4f66c02bd68a913f822d5a16
-DIST nspr-4.10.10.tar.gz 1134164 SHA256
343614971c30520d0fa55f4af0a72578e2d8674bb71caf7187490c3379523107 SHA512
60e035c4bd037bbf4bfacc97e2b1097ea78a179969fccead6a964069d826e917f07aaa35a26f123b7297521910728c11e27556fc9bbc09e385c1e8aef9dbf376
WHIRLPOOL
db63a6d1e0c9d57dfa059aecf8eeff8e36d0385f598290665d525a85eb6fe173cd899bba017c82b26815d894d8ea6e728dbb7a77483036551c06c78c900d7ee3
-EBUILD nspr-4.10.10-r99.ebuild 3948 SHA256
b130c4dd9bb23095ee8f9323854e79f56a177d6fcd2627f44a73b9a1938db2b2 SHA512
c57f37ed48b4f8663953cbe5c6374a6d47583eb256248e78b137ec6610d4adc4216e066f06f58c8b7bef5f4e24e158346f3d03b57e9a51e87cb64917f62118bf
WHIRLPOOL
4a284517140cc4fc8d7a9342b64399c2fe1f59f0b2c61ef5ccb2e595d76e442ce0cff6e61a8801b7a2625d077d90e70def6fd8d1fa55ada22c56bb50cd99fd88
-MISC metadata.xml 250 SHA256
6482f1f0210d1b5be8fa75dfbe107df6da702461e36abe6ee77808b4118d5bab SHA512
ba5e7c1f6ee117471a3804bc54211e7f89c75e965a865f45f85015a0a28ec7d511ef9bbc196eef8245dc9259f54b04eb3563d83811a293bb946cf0977563892b
WHIRLPOOL
bbdc6963f21df602d4bbaec882e9ac860417eccf7528546f4ec24f13368b9b86a1b6830c51feb0bb46bb384fc1aa0e8751c4be88103f9b4895ff9ed4e1d52bbc
diff --git a/dev-libs/nspr/files/nspr-4.10.6-no-getprotobyname_r.patch
b/dev-libs/nspr/files/nspr-4.10.6-no-getprotobyname_r.patch
deleted file mode 100644
index 40f38a5..0000000
--- a/dev-libs/nspr/files/nspr-4.10.6-no-getprotobyname_r.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/nspr-4.10.6/nspr/pr/src/misc/prnetdb.c 2014-06-05 23:42:08.000000000
-0200
-+++ b/nspr-4.10.6/nspr/pr/src/misc/prnetdb.c 2014-07-29 19:02:42.037638550
-0200
-@@ -65,8 +65,6 @@
- || (defined(LINUX) && defined(_REENTRANT) \
- && !(defined(__GLIBC__) && __GLIBC__ >= 2) \
- && !defined(ANDROID))
--#define _PR_HAVE_GETPROTO_R
--#define _PR_HAVE_GETPROTO_R_POINTER
- #endif
-
- #if defined(OSF1) \
diff --git a/dev-libs/nspr/files/nspr-4.10.6-solaris.patch
b/dev-libs/nspr/files/nspr-4.10.6-solaris.patch
deleted file mode 100644
index 3ae8052..0000000
--- a/dev-libs/nspr/files/nspr-4.10.6-solaris.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-* drop Solaris linker stuff
-
---- nspr-4.7.4/mozilla/nsprpub/configure.in
-+++ nspr-4.7.4/mozilla/nsprpub/configure.in
-@@ -1988,26 +1988,14 @@
- CPU_ARCH=`uname -p`
- MDCPUCFG_H=_solaris.cfg
- PR_MD_CSRCS=solaris.c
-- LD=/usr/ccs/bin/ld
- MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
- RESOLVE_LINK_SYMBOLS=1
-- case "${OS_RELEASE}" in
-- 5.8|5.9)
-- ;;
-- *)
-- # It is safe to use the -Bdirect linker flag on Solaris 10 or later.
-- USE_B_DIRECT=1
-- ;;
-- esac
- if test -n "$GNU_CC"; then
- DSO_CFLAGS=-fPIC
- if `$CC -print-prog-name=ld` -v 2>&1 | grep -c GNU >/dev/null; then
- GCC_USE_GNU_LD=1
- fi
-- DSO_LDOPTS='-shared -Wl,-h,$(notdir
$@),-z,combreloc,-z,defs,-z,ignore'
-- if test -n "$USE_B_DIRECT"; then
-- DSO_LDOPTS="$DSO_LDOPTS,-Bdirect"
-- fi
-+ DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)'
- else
- DSO_CFLAGS=-KPIC
- DSO_LDOPTS='-G -h $(notdir $@) -z combreloc -z defs -z ignore'
diff --git a/dev-libs/nspr/files/nspr-4.7.0-prtime.patch
b/dev-libs/nspr/files/nspr-4.7.0-prtime.patch
deleted file mode 100644
index ac509ef..0000000
--- a/dev-libs/nspr/files/nspr-4.7.0-prtime.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- mozilla/nsprpub/pr/src/misc/prtime.c.orig 2007-09-14 19:41:08.000000000
+0200
-+++ mozilla/nsprpub/pr/src/misc/prtime.c 2007-09-14 19:42:17.000000000
+0200
-@@ -1536,7 +1536,7 @@
- case TT_EET: zone_offset = 2 * 60; break;
- case TT_JST: zone_offset = 9 * 60; break;
- default:
-- PR_ASSERT (0);
-+ return PR_FAILURE;
- break;
- }
- }
-@@ -1578,11 +1578,12 @@
- struct tm localTime;
- time_t secs;
-
-- PR_ASSERT(result->tm_month > -1 &&
-+ if (!(result->tm_month > -1 &&
- result->tm_mday > 0 &&
- result->tm_hour > -1 &&
- result->tm_min > -1 &&
-- result->tm_sec > -1);
-+ result->tm_sec > -1))
-+ return PR_FAILURE;
-
- /*
- * To obtain time_t from a tm structure representing the local
diff --git a/dev-libs/nspr/files/nspr-4.7.1-solaris.patch
b/dev-libs/nspr/files/nspr-4.7.1-solaris.patch
deleted file mode 100644
index 5d9e810..0000000
--- a/dev-libs/nspr/files/nspr-4.7.1-solaris.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Same magic as haubi did for glib compilation, which works again here
-resolving a linker problem on Solaris with GNU ld. Bug #222625
-
---- mozilla/nsprpub/pr/src/Makefile.in.orig 2008-06-22 22:24:56.671065000
+0200
-+++ mozilla/nsprpub/pr/src/Makefile.in 2008-06-23 14:38:52.320417000 +0200
-@@ -95,7 +95,7 @@
- endif
-
- ifdef USE_PTHREADS
--OS_LIBS = -lpthread ${LIBRT} -lsocket -lnsl -ldl -lc
-+OS_LIBS = -pthread ${LIBRT} -lsocket -lnsl -ldl -lc
- else
- ifdef LOCAL_THREADS_ONLY
- OS_LIBS = -lsocket -lnsl -ldl -lc
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
deleted file mode 100644
index 1258b60..0000000
--- a/dev-libs/nspr/files/nspr-4.8.4-darwin-install_name.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Don't use @executable_path, it messed up linking against nspr from e.g.
-nss.
-
---- mozilla/nsprpub/configure.in
-+++ mozilla/nsprpub/configure.in
-@@ -1007,7 +1007,7 @@
- ;;
- esac
- DSO_CFLAGS=-fPIC
-- DSO_LDOPTS='-dynamiclib -compatibility_version 1 -current_version 1
-all_load -install_name @executable_path/$@ -headerpad_max_install_names'
-+ DSO_LDOPTS='-dynamiclib -compatibility_version 1 -current_version 1
-all_load -install_name $(libdir)/$@ -headerpad_max_install_names'
- _OPTIMIZE_FLAGS=-O2
- MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
- STRIP="$STRIP -x -S"
---- mozilla/nsprpub/configure
-+++ mozilla/nsprpub/configure
-@@ -1007,7 +1007,7 @@
- ;;
- esac
- DSO_CFLAGS=-fPIC
-- DSO_LDOPTS='-dynamiclib -compatibility_version 1 -current_version 1
-all_load -install_name @executable_path/$@ -headerpad_max_install_names'
-+ DSO_LDOPTS='-dynamiclib -compatibility_version 1 -current_version 1
-all_load -install_name $(libdir)/$@ -headerpad_max_install_names'
- _OPTIMIZE_FLAGS=-O2
- MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
- STRIP="$STRIP -x -S"
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
deleted file mode 100644
index dd3b132..0000000
--- a/dev-libs/nspr/files/nspr-4.8.9-link-flags.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Use CFLAGS when linking. Some flags can add functionality to generated
-code that requires extra libs to be linked in (eg. libgomp when using
-autoparallelization). Other flags are required when building and linking
-(eg. -flto).
-
-https://bugs.gentoo.org/365975
-
---- a/mozilla/nsprpub/config/autoconf.mk.in
-+++ b/mozilla/nsprpub/config/autoconf.mk.in
-@@ -81,6 +81,7 @@ OS_DLLFLAGS = @OS_DLLFLAGS@
- DLLFLAGS = @DLLFLAGS@
- EXEFLAGS = @EXEFLAGS@
- OPTIMIZER = @OPTIMIZER@
-+LD_CFLAGS = @CFLAGS@
-
- PROFILE_GEN_CFLAGS = @PROFILE_GEN_CFLAGS@
- PROFILE_GEN_LDFLAGS = @PROFILE_GEN_LDFLAGS@
---- a/mozilla/nsprpub/config/config.mk
-+++ b/mozilla/nsprpub/config/config.mk
-@@ -72,7 +72,7 @@ NOMD_CFLAGS = $(CC_ONLY_FLAGS) $(OPTIMIZER)
$(NOMD_OS_CFLAGS)\
- NOMD_CCFLAGS = $(CCC_ONLY_FLAGS) $(OPTIMIZER) $(NOMD_OS_CFLAGS)\
- $(XP_DEFINE) $(DEFINES) $(INCLUDES) $(XCFLAGS)
-
--LDFLAGS = $(OS_LDFLAGS)
-+LDFLAGS = $(LD_CFLAGS) $(OS_LDFLAGS)
-
- # Enable profile-guided optimization
- ifdef MOZ_PROFILE_GENERATE
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
deleted file mode 100644
index d4f9a7e..0000000
--- a/dev-libs/nspr/files/nspr-4.9.5_nspr_config.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN a/mozilla/nsprpub/config/nspr-config.in
b/mozilla/nsprpub/config/nspr-config.in
---- a/mozilla/nsprpub/config/nspr-config.in 2012-03-06 07:13:39.000000000
-0600
-+++ b/mozilla/nsprpub/config/nspr-config.in 2013-02-16 20:53:53.893489345
-0600
-@@ -126,7 +126,7 @@
- fi
-
- if test "$echo_libs" = "yes"; then
-- libdirs=-L$libdir
-+ libdirs=""
- if test -n "$lib_plds"; then
- libdirs="$libdirs -lplds${major_version}"
- fi
diff --git a/dev-libs/nspr/metadata.xml b/dev-libs/nspr/metadata.xml
deleted file mode 100644
index d9b367e..0000000
--- a/dev-libs/nspr/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
-<pkgmetadata>
-<maintainer type="project">
- <email>[email protected]</email>
- <name>Gentoo Mozilla Team</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-libs/nspr/nspr-4.10.10-r99.ebuild
b/dev-libs/nspr/nspr-4.10.10-r99.ebuild
deleted file mode 100644
index 02b3a77..0000000
--- a/dev-libs/nspr/nspr-4.10.10-r99.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-WANT_AUTOCONF="2.5"
-
-inherit autotools eutils multilib toolchain-funcs versionator multilib-minimal
-
-MIN_PV="$(get_version_component_range 2)"
-
-DESCRIPTION="Netscape Portable Runtime"
-HOMEPAGE="http://www.mozilla.org/projects/nspr/";
-SRC_URI="http://archive.mozilla.org/pub/mozilla.org/nspr/releases/v${PV}/src/${P}.tar.gz";
-
-LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
-SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc x86"
-IUSE="debug"
-
-RDEPEND="
- abi_x86_32? (
- !<=app-emulation/emul-linux-x86-baselibs-20140508-r12
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
- )"
-
-MULTILIB_CHOST_TOOLS=(
- /usr/bin/nspr-config
-)
-
-src_prepare() {
- cd "${S}"/nspr || die
- epatch "${FILESDIR}"/${PN}-4.7.0-prtime.patch
- epatch "${FILESDIR}"/${PN}-4.7.1-solaris.patch
- epatch "${FILESDIR}"/${PN}-4.10.6-solaris.patch
- epatch "${FILESDIR}"/${PN}-4.8.4-darwin-install_name.patch
- epatch "${FILESDIR}"/${PN}-4.8.9-link-flags.patch
- # We do not need to pass -L$libdir via nspr-config --libs
- epatch "${FILESDIR}"/${PN}-4.9.5_nspr_config.patch
-
- epatch "${FILESDIR}"/${PN}-4.10.6-no-getprotobyname_r.patch
-
- # rename configure.in to configure.ac for new autotools compatibility
- if [[ -e "${S}"/nspr/configure.in ]] ; then
- einfo "Renaming configure.in to configure.ac"
- mv "${S}"/nspr/configure.{in,ac} || die
- fi
- # We must run eautoconf to regenerate configure
- eautoconf
-
- # make sure it won't find Perl out of Prefix
- sed -i -e "s/perl5//g" "${S}"/nspr/configure || die
-
- # Respect LDFLAGS
- sed -i -e 's/\$(MKSHLIB) \$(OBJS)/\$(MKSHLIB) \$(LDFLAGS) \$(OBJS)/g' \
- "${S}"/nspr/config/rules.mk || die
-}
-
-multilib_src_configure() {
- # We use the standard BUILD_xxx but nspr uses HOST_xxx
- tc-export_build_env BUILD_CC
- export HOST_CC=${BUILD_CC} HOST_CFLAGS=${BUILD_CFLAGS}
HOST_LDFLAGS=${BUILD_LDFLAGS}
- tc-export AR CC CXX RANLIB
- [[ ${CBUILD} != ${CHOST} ]] \
- && export CROSS_COMPILE=1 \
- || unset CROSS_COMPILE
-
- local myconf=()
-
- # The configure has some fancy --enable-{{n,x}32,64bit} switches
- # that trigger some code conditional to platform & arch. This really
- # matters for the few common arches (x86, ppc) but we pass a little
- # more of them to be future-proof.
-
- # use ABI first, this will work for most cases
- case "${ABI}" in
- alpha|arm|hppa|m68k|o32|ppc|s390|sh|sparc|x86) ;;
- n32) myconf+=( --enable-n32 );;
- x32) myconf+=( --enable-x32 );;
- s390x|*64) myconf+=( --enable-64bit );;
- default) # no abi actually set, fall back to old check
- einfo "Running a short build test to determine
64bit'ness"
- echo > "${T}"/test.c || die
- ${CC} ${CFLAGS} ${CPPFLAGS} -c "${T}"/test.c -o
"${T}"/test.o || die
- case $(file "${T}"/test.o) in
- *32-bit*x86-64*) myconf+=( --enable-x32 );;
- *64-bit*|*ppc64*|*x86_64*) myconf+=(
--enable-64bit );;
- *32-bit*|*ppc*|*i386*) ;;
- *) die "Failed to detect whether your arch is
64bits or 32bits, disable distcc if you're using it, please";;
- esac ;;
- *) ;;
- esac
-
- # Ancient autoconf needs help finding the right tools.
- LC_ALL="C" ECONF_SOURCE="${S}/nspr" \
- ac_cv_path_AR="${AR}" \
- econf \
- --libdir="${EPREFIX}/usr/$(get_libdir)" \
- $(use_enable debug) \
- $(use_enable !debug optimize) \
- "${myconf[@]}"
-}
-
-multilib_src_install() {
- # Their build system is royally confusing, as usual
- MINOR_VERSION=${MIN_PV} # Used for .so version
- emake DESTDIR="${D}" install
-
- einfo "removing static libraries as upstream has requested!"
- rm -f "${ED}"/usr/$(get_libdir)/*.a || die "failed to remove static
libraries."
-
- # install nspr-config
- dobin config/nspr-config
-
- # Remove stupid files in /usr/bin
- rm "${ED}"/usr/bin/prerr.properties || die
-
- # This is used only to generate prerr.c and prerr.h at build time.
- # No other projects use it, and we don't want to depend on perl.
- # Talked to upstream and they agreed w/punting.
- rm "${ED}"/usr/bin/compile-et.pl || die
-}
