diff options
| author |   Jory A. Pratt <anarchy@gentoo.org> | 2013-01-29 19:49:37 -0600 |
|---|---|---|
| committer | Jory A. Pratt <anarchy@gentoo.org> | 2013-01-29 19:49:37 -0600 |
| commit | 2ec671376b065f993ee2d2551e70fdaf8a41088e (patch) | |
| tree | 9f267db9d069db181678a67f4b27eb1213b82944 /dev-libs/nspr | |
| parent | jemalloc: misc upstream bug fixes (diff) | |
| download | mozilla-2ec671376b065f993ee2d2551e70fdaf8a41088e.tar.gz mozilla-2ec671376b065f993ee2d2551e70fdaf8a41088e.tar.bz2 mozilla-2ec671376b065f993ee2d2551e70fdaf8a41088e.zip | |
Address bug #454576,454578
Diffstat (limited to 'dev-libs/nspr')
| -rw-r--r-- | dev-libs/nspr/Manifest | 3 | ||||
| -rw-r--r-- | dev-libs/nspr/files/nspr-4.8-config.patch | 47 | ||||
| -rw-r--r-- | dev-libs/nspr/nspr-4.9.4-r1.ebuild (renamed from dev-libs/nspr/nspr-4.9.4.ebuild) | 1 |
3 files changed, 1 insertions, 50 deletions
diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest index 1980e86a..17547b90 100644 --- a/dev-libs/nspr/Manifest +++ b/dev-libs/nspr/Manifest @@ -3,10 +3,9 @@ AUX nspr-4.6.1-lang.patch 1718 SHA256 326f5f9d020e73a6ed8e949124eb075f21d856d0b0 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.7.4-solaris.patch 2011 SHA256 9e72078c941229e7112b4bc184e195821c9243bfb9411e9eeefcdb889866ff9f SHA512 ff8b6403470e9eec401eafb33b109a850ca72e3b6e05e31514e68e9b0ca77aaf7dc0e8062f45406f5abd96671d3c352d9690b8da09454555929422a86d9c4fd4 WHIRLPOOL ea7a6543f474ccd45cfd6448d75ebf17057d9952fdb6d7610ad33603e94bcce0fe1c60b07d80570e49d35c0828748f239aacdce588514aeae472927fecaa8490 -AUX nspr-4.8-config.patch 1429 SHA256 7cb63ea677ad9c92dde4513b16258f092b463738cb145edd95dd671bcfaa2150 SHA512 0180b026a89080c557ff39496f015195127343319d054904274fa118c4394b567b1e79bf72ddffe4d6ce821b831a72926fc40a55897976a6cdaee0cea52d070b WHIRLPOOL 1f31f98e552a771a77acd731b4e071386aad4a94c71d638f6074224f0f79eb8f4f49763ded4282d910f2a7fea8c05000c1428b7d895c8204a2982775022b42d3 AUX nspr-4.8.3-aix-gcc.patch 3673 SHA256 b801bc5e93c57e54a076f1b1ed85fc6c4d5d6f344e830929e0a2c4046930a17f SHA512 08a1625bb4ca7263e9f98289355e6def516e4b31a4bc856e75686a808575f2603056490b6b5dd6f33e616923c6e035cafec89ff86bcc4b9ceb0b9a5c10334f48 WHIRLPOOL f42200ebdd0ac5b6739c61a2673345a63a33eb1b9d0c471d6700c5b9f7a305a3a518d0d0715041e3aedb80a923e6ff183d035da151c0c51457a2e628317887ea AUX nspr-4.8.3-aix-soname.patch 1164 SHA256 cec2e8b1cdf9e81f6b36c7981a5cb017fbf18192586c00d3e80ad897917bfcaa SHA512 8c82c281ebc3ffade81445bef28323a89199e47a95b7ec8351cf14dc441f71d1126f112d564431e6c73657ae2de0c7cbdc701ff133d7086fd970e6c61cd58add WHIRLPOOL 90dca0ac6ae7931468d5b3835e786a817deaae1c4021fb033f127dd9aabae42975bcc8c4ccb3ea7db713b3224ec90669179cbb71a8492910a5aa75e0f8d1beac 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 DIST nspr-4.9.4.tar.gz 1160641 SHA256 749046c75be17f2f8b3874d288873d3355cedcb37abe7b6eb7b3bc374440d4a4 SHA512 5c1caf290bbe6cec7fddd40ae1eefbe54608a0f6fce908b1680513c50661dde40f4c1638ddca56b8a7125b20be6945aa2b4507fa0dde09e3e9eb0b08e90cfe2b WHIRLPOOL a9fd7a0c4b17240c746312cdab1495a5d5ebcabcc945a7c2f1a3df435db2d4e5e80e3086d20bd658a94c573abb916611327ad877430c9cd0282e8d192217d707 -EBUILD nspr-4.9.4.ebuild 4020 SHA256 986dce490c4d52eea53bbd0350e9416a28cf60225f0317ed9bcc1b08f9aae150 SHA512 ce8356d7855e25027cb001bb19f7730c5b37305fc7d6620b21cd83fe1df9d9f2801826bc24c3875374dc2a6e3e775218cf235a8360b9ce4d301845dc8c34bea2 WHIRLPOOL a4fe3006f826e8ba0cc98fabde2ae67124c3f1d27e98c5aa17ad3197ec753d69035551ea70edd9feb2ac031f1fe34eaddc763bba0e716165fc1852d026fe5906 +EBUILD nspr-4.9.4-r1.ebuild 3975 SHA256 70c73749c64340dcb75c8915486cceb682a6d84fd5f7c86861da9ae952b7d252 SHA512 558689f724284f1fcfc135ca443257f2a50fd4ddfa6ca4c0a777e11846b21d1b96d71a20e51a860fc6065e2501a84f4ff079369ddc7c95859630236607095fe0 WHIRLPOOL 27408c962e1355219838c4c3dfb9e3f2c32f3e4bde70ec83351e4fcdfbf5da25e85a812565d4978f60a4d0da9f6e8f4361e511b8ae25a6f1dabfa6f026be057b diff --git a/dev-libs/nspr/files/nspr-4.8-config.patch b/dev-libs/nspr/files/nspr-4.8-config.patch deleted file mode 100644 index e8fc6c11..00000000 --- a/dev-libs/nspr/files/nspr-4.8-config.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- mozilla/nsprpub/lib/libc/src/Makefile.in.orig 2005-06-01 14:28:26.000000000 +0000 -+++ mozilla/nsprpub/lib/libc/src/Makefile.in 2006-01-15 02:50:39.000000000 +0000 -@@ -112,6 +112,10 @@ - MKSHLIB += -R '$$ORIGIN' - endif - -+ifeq ($(OS_ARCH), Linux) -+DSO_LDOPTS +=-Wl,-R,'$$ORIGIN' -+endif -+ - ifeq ($(OS_ARCH),OS2) - MAPFILE = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).def - GARBAGE += $(MAPFILE) ---- mozilla/nsprpub/lib/ds/Makefile.in.orig 2005-06-01 14:28:25.000000000 +0000 -+++ mozilla/nsprpub/lib/ds/Makefile.in 2006-01-15 02:52:30.000000000 +0000 -@@ -102,6 +102,10 @@ - MKSHLIB += -R '$$ORIGIN' - endif - -+ifeq ($(OS_ARCH), Linux) -+DSO_LDOPTS += -Wl,-R,'$$ORIGIN' -+endif -+ - ifeq ($(OS_ARCH),OS2) - MAPFILE = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).def - GARBAGE += $(MAPFILE) ---- mozilla/nsprpub/pr/src/Makefile.in.orig 2005-06-01 14:28:27.000000000 +0000 -+++ mozilla/nsprpub/pr/src/Makefile.in 2006-01-15 03:29:36.000000000 +0000 -@@ -168,6 +168,7 @@ - else - OS_LIBS = -ldl - endif -+DSO_LDOPTS +=-Wl,-R,'$$ORIGIN' - endif - - ifeq ($(OS_ARCH),HP-UX) ---- mozilla/nsprpub/config/nspr-config.in.orig 2005-05-11 00:53:41.000000000 +0000 -+++ mozilla/nsprpub/config/nspr-config.in 2006-01-15 06:37:58.000000000 +0000 -@@ -122,7 +122,7 @@ - fi - - if test "$echo_libs" = "yes"; then -- libdirs=-L$libdir -+ libdirs="-Wl,-R$libdir -L$libdir" - if test -n "$lib_plds"; then - libdirs="$libdirs -lplds${major_version}" - fi diff --git a/dev-libs/nspr/nspr-4.9.4.ebuild b/dev-libs/nspr/nspr-4.9.4-r1.ebuild index 5c82efcd..233b0b12 100644 --- a/dev-libs/nspr/nspr-4.9.4.ebuild +++ b/dev-libs/nspr/nspr-4.9.4-r1.ebuild @@ -20,7 +20,6 @@ IUSE="debug" src_prepare() { mkdir build inst - epatch "${FILESDIR}"/${PN}-4.8-config.patch epatch "${FILESDIR}"/${PN}-4.6.1-config-1.patch epatch "${FILESDIR}"/${PN}-4.6.1-lang.patch epatch "${FILESDIR}"/${PN}-4.7.0-prtime.patch |