| 1 |
commit: 17e2d66110c1a1d6e27ab3261e93e897267e4b7a |
| 2 |
Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sun Sep 4 11:50:49 2016 +0000 |
| 4 |
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Sep 4 22:58:45 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17e2d661 |
| 7 |
|
| 8 |
dev-libs/nspr: remove unused patches |
| 9 |
|
| 10 |
Closes: https://github.com/gentoo/gentoo/pull/2230 |
| 11 |
|
| 12 |
Signed-off-by: Jory A. Pratt <anarchy <AT> gentoo.org> |
| 13 |
|
| 14 |
dev-libs/nspr/files/nspr-4.6.1-lang.patch | 41 ------------------ |
| 15 |
dev-libs/nspr/files/nspr-4.7.4-solaris.patch | 62 ---------------------------- |
| 16 |
2 files changed, 103 deletions(-) |
| 17 |
|
| 18 |
diff --git a/dev-libs/nspr/files/nspr-4.6.1-lang.patch b/dev-libs/nspr/files/nspr-4.6.1-lang.patch |
| 19 |
deleted file mode 100644 |
| 20 |
index 46fe15b..00000000 |
| 21 |
--- a/dev-libs/nspr/files/nspr-4.6.1-lang.patch |
| 22 |
+++ /dev/null |
| 23 |
@@ -1,41 +0,0 @@ |
| 24 |
-The LANG vars aren't reset early enough so when sed tries to use [a-zA-Z] in |
| 25 |
-option parsing, it may break. |
| 26 |
- |
| 27 |
-http://bugs.gentoo.org/103483 |
| 28 |
- |
| 29 |
---- mozilla/nsprpub/configure |
| 30 |
-+++ mozilla/nsprpub/configure |
| 31 |
-@@ -54,6 +54,16 @@ |
| 32 |
- infodir='${prefix}/info' |
| 33 |
- mandir='${prefix}/man' |
| 34 |
- |
| 35 |
-+# NLS nuisances. |
| 36 |
-+# Only set these to C if already set. These must not be set unconditionally |
| 37 |
-+# because not all systems understand e.g. LANG=C (notably SCO). |
| 38 |
-+# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'! |
| 39 |
-+# Non-C LC_CTYPE values break the ctype check. |
| 40 |
-+if test "${LANG+set}" = set; then LANG=C; export LANG; fi |
| 41 |
-+if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi |
| 42 |
-+if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi |
| 43 |
-+if test "${LC_CTYPE+set}" = set; then LC_CTYPE=C; export LC_CTYPE; fi |
| 44 |
-+ |
| 45 |
- # Initialize some other variables. |
| 46 |
- subdirs= |
| 47 |
- MFLAGS= MAKEFLAGS= |
| 48 |
-@@ -452,16 +463,6 @@ |
| 49 |
- esac |
| 50 |
- done |
| 51 |
- |
| 52 |
--# NLS nuisances. |
| 53 |
--# Only set these to C if already set. These must not be set unconditionally |
| 54 |
--# because not all systems understand e.g. LANG=C (notably SCO). |
| 55 |
--# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'! |
| 56 |
--# Non-C LC_CTYPE values break the ctype check. |
| 57 |
--if test "${LANG+set}" = set; then LANG=C; export LANG; fi |
| 58 |
--if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi |
| 59 |
--if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi |
| 60 |
--if test "${LC_CTYPE+set}" = set; then LC_CTYPE=C; export LC_CTYPE; fi |
| 61 |
-- |
| 62 |
- # confdefs.h avoids OS command line length limits that DEFS can exceed. |
| 63 |
- rm -rf conftest* confdefs.h |
| 64 |
- # AIX cpp loses on an empty file, so make sure it contains at least a newline. |
| 65 |
|
| 66 |
diff --git a/dev-libs/nspr/files/nspr-4.7.4-solaris.patch b/dev-libs/nspr/files/nspr-4.7.4-solaris.patch |
| 67 |
deleted file mode 100644 |
| 68 |
index a0f14d5..00000000 |
| 69 |
--- a/dev-libs/nspr/files/nspr-4.7.4-solaris.patch |
| 70 |
+++ /dev/null |
| 71 |
@@ -1,62 +0,0 @@ |
| 72 |
-* drop Solaris linker stuff |
| 73 |
- |
| 74 |
---- nspr-4.7.4/mozilla/nsprpub/configure.in |
| 75 |
-+++ nspr-4.7.4/mozilla/nsprpub/configure.in |
| 76 |
-@@ -1988,26 +1988,14 @@ |
| 77 |
- CPU_ARCH=`uname -p` |
| 78 |
- MDCPUCFG_H=_solaris.cfg |
| 79 |
- PR_MD_CSRCS=solaris.c |
| 80 |
-- LD=/usr/ccs/bin/ld |
| 81 |
- MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@' |
| 82 |
- RESOLVE_LINK_SYMBOLS=1 |
| 83 |
-- case "${OS_RELEASE}" in |
| 84 |
-- 5.8|5.9) |
| 85 |
-- ;; |
| 86 |
-- *) |
| 87 |
-- # It is safe to use the -Bdirect linker flag on Solaris 10 or later. |
| 88 |
-- USE_B_DIRECT=1 |
| 89 |
-- ;; |
| 90 |
-- esac |
| 91 |
- if test -n "$GNU_CC"; then |
| 92 |
- DSO_CFLAGS=-fPIC |
| 93 |
- if `$CC -print-prog-name=ld` -v 2>&1 | grep -c GNU >/dev/null; then |
| 94 |
- GCC_USE_GNU_LD=1 |
| 95 |
- fi |
| 96 |
-- DSO_LDOPTS='-shared -Wl,-h,$(notdir $@),-z,combreloc,-z,defs,-z,ignore' |
| 97 |
-- if test -n "$USE_B_DIRECT"; then |
| 98 |
-- DSO_LDOPTS="$DSO_LDOPTS,-Bdirect" |
| 99 |
-- fi |
| 100 |
-+ DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)' |
| 101 |
- else |
| 102 |
- DSO_CFLAGS=-KPIC |
| 103 |
- DSO_LDOPTS='-G -h $(notdir $@) -z combreloc -z defs -z ignore' |
| 104 |
---- nspr-4.7.4/mozilla/nsprpub/configure |
| 105 |
-+++ nspr-4.7.4/mozilla/nsprpub/configure |
| 106 |
-@@ -4765,26 +4765,14 @@ |
| 107 |
- CPU_ARCH=`uname -p` |
| 108 |
- MDCPUCFG_H=_solaris.cfg |
| 109 |
- PR_MD_CSRCS=solaris.c |
| 110 |
-- LD=/usr/ccs/bin/ld |
| 111 |
- MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@' |
| 112 |
- RESOLVE_LINK_SYMBOLS=1 |
| 113 |
-- case "${OS_RELEASE}" in |
| 114 |
-- 5.8|5.9) |
| 115 |
-- ;; |
| 116 |
-- *) |
| 117 |
-- # It is safe to use the -Bdirect linker flag on Solaris 10 or later. |
| 118 |
-- USE_B_DIRECT=1 |
| 119 |
-- ;; |
| 120 |
-- esac |
| 121 |
- if test -n "$GNU_CC"; then |
| 122 |
- DSO_CFLAGS=-fPIC |
| 123 |
- if `$CC -print-prog-name=ld` -v 2>&1 | grep -c GNU >/dev/null; then |
| 124 |
- GCC_USE_GNU_LD=1 |
| 125 |
- fi |
| 126 |
-- DSO_LDOPTS='-shared -Wl,-h,$(notdir $@),-z,combreloc,-z,defs,-z,ignore' |
| 127 |
-- if test -n "$USE_B_DIRECT"; then |
| 128 |
-- DSO_LDOPTS="$DSO_LDOPTS,-Bdirect" |
| 129 |
-- fi |
| 130 |
-+ DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)' |
| 131 |
- else |
| 132 |
- DSO_CFLAGS=-KPIC |
| 133 |
- DSO_LDOPTS='-G -h $(notdir $@) -z combreloc -z defs -z ignore' |
Archives