From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A1F9B138330 for ; Mon, 5 Sep 2016 01:22:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F0AE321C08E; Mon, 5 Sep 2016 01:22:11 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 46CF221C072 for ; Mon, 5 Sep 2016 01:22:11 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 684A6340836 for ; Mon, 5 Sep 2016 01:22:09 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EC5492473 for ; Sun, 4 Sep 2016 23:00:01 +0000 (UTC) From: "Jory Pratt" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jory Pratt" Message-ID: <1473029925.17e2d66110c1a1d6e27ab3261e93e897267e4b7a.anarchy@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/nspr/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/nspr/files/nspr-4.6.1-lang.patch dev-libs/nspr/files/nspr-4.7.4-solaris.patch X-VCS-Directories: dev-libs/nspr/files/ X-VCS-Committer: anarchy X-VCS-Committer-Name: Jory Pratt X-VCS-Revision: 17e2d66110c1a1d6e27ab3261e93e897267e4b7a X-VCS-Branch: master Date: Sun, 4 Sep 2016 23:00:01 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 543909d2-7758-4ab7-af0e-d71072fecf3d X-Archives-Hash: 2aff2b361c5f48d6d5b9329cc8150e30 commit: 17e2d66110c1a1d6e27ab3261e93e897267e4b7a Author: Michael Mair-Keimberger (asterix) gmail com> AuthorDate: Sun Sep 4 11:50:49 2016 +0000 Commit: Jory Pratt gentoo org> CommitDate: Sun Sep 4 22:58:45 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17e2d661 dev-libs/nspr: remove unused patches Closes: https://github.com/gentoo/gentoo/pull/2230 Signed-off-by: Jory A. Pratt gentoo.org> dev-libs/nspr/files/nspr-4.6.1-lang.patch | 41 ------------------ dev-libs/nspr/files/nspr-4.7.4-solaris.patch | 62 ---------------------------- 2 files changed, 103 deletions(-) diff --git a/dev-libs/nspr/files/nspr-4.6.1-lang.patch b/dev-libs/nspr/files/nspr-4.6.1-lang.patch deleted file mode 100644 index 46fe15b..00000000 --- a/dev-libs/nspr/files/nspr-4.6.1-lang.patch +++ /dev/null @@ -1,41 +0,0 @@ -The LANG vars aren't reset early enough so when sed tries to use [a-zA-Z] in -option parsing, it may break. - -http://bugs.gentoo.org/103483 - ---- mozilla/nsprpub/configure -+++ mozilla/nsprpub/configure -@@ -54,6 +54,16 @@ - infodir='${prefix}/info' - mandir='${prefix}/man' - -+# NLS nuisances. -+# Only set these to C if already set. These must not be set unconditionally -+# because not all systems understand e.g. LANG=C (notably SCO). -+# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'! -+# Non-C LC_CTYPE values break the ctype check. -+if test "${LANG+set}" = set; then LANG=C; export LANG; fi -+if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi -+if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi -+if test "${LC_CTYPE+set}" = set; then LC_CTYPE=C; export LC_CTYPE; fi -+ - # Initialize some other variables. - subdirs= - MFLAGS= MAKEFLAGS= -@@ -452,16 +463,6 @@ - esac - done - --# NLS nuisances. --# Only set these to C if already set. These must not be set unconditionally --# because not all systems understand e.g. LANG=C (notably SCO). --# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'! --# Non-C LC_CTYPE values break the ctype check. --if test "${LANG+set}" = set; then LANG=C; export LANG; fi --if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi --if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi --if test "${LC_CTYPE+set}" = set; then LC_CTYPE=C; export LC_CTYPE; fi -- - # confdefs.h avoids OS command line length limits that DEFS can exceed. - rm -rf conftest* confdefs.h - # AIX cpp loses on an empty file, so make sure it contains at least a newline. diff --git a/dev-libs/nspr/files/nspr-4.7.4-solaris.patch b/dev-libs/nspr/files/nspr-4.7.4-solaris.patch deleted file mode 100644 index a0f14d5..00000000 --- a/dev-libs/nspr/files/nspr-4.7.4-solaris.patch +++ /dev/null @@ -1,62 +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' ---- nspr-4.7.4/mozilla/nsprpub/configure -+++ nspr-4.7.4/mozilla/nsprpub/configure -@@ -4765,26 +4765,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'