Fixed bashism in Makefile (bug #183060)

Package-Manager: portage-2.1.3_rc7

4 files changed, 76 insertions, 10 deletions

diff --git a/dev-libs/STLport/ChangeLog b/dev-libs/STLport/ChangeLog
index 3791debf63ff..29766ea074bc 100644
--- a/dev-libs/STLport/ChangeLog
+++ b/dev-libs/STLport/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/STLport
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/STLport/ChangeLog,v 1.61 2007/04/15 20:17:56 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/STLport/ChangeLog,v 1.62 2007/07/11 20:09:02 dev-zero Exp $
+
+  11 Jul 2007; Tiziano Müller <dev-zero@gentoo.org>
+  +files/STLport-5.1.2-fix_bashism.patch, STLport-5.1.2.ebuild:
+  Fixed bashism in Makefile (bug #183060)
 
   15 Apr 2007; Markus Rothe <corsair@gentoo.org> STLport-5.1.2.ebuild:
   Stable on ppc64
diff --git a/dev-libs/STLport/Manifest b/dev-libs/STLport/Manifest
index 18a21c545944..dd0bfcab6cb7 100644
--- a/dev-libs/STLport/Manifest
+++ b/dev-libs/STLport/Manifest
@@ -18,6 +18,10 @@ AUX STLport-5.1.0-wrong_russian_currency_name.patch 1049 RMD160 f27ff8b99c711a61
 MD5 5ba46827492c629d15d03d47b5da1bc1 files/STLport-5.1.0-wrong_russian_currency_name.patch 1049
 RMD160 f27ff8b99c711a61312ea36707e313b1d2ba158a files/STLport-5.1.0-wrong_russian_currency_name.patch 1049
 SHA256 5ffed03f2d867b4079f6d2b88f42b3fe45821043a9db4c910a8179bb912800c1 files/STLport-5.1.0-wrong_russian_currency_name.patch 1049
+AUX STLport-5.1.2-fix_bashism.patch 3380 RMD160 e75b86bf16d688a702fe23be781f8d903226f8cd SHA1 0e78e50dae1801abece7088cb6cfc491c0947312 SHA256 b32e22a987679c849bbe7998ab819ba789ba4543dcc6c611897dfb178553dbdb
+MD5 38b136b9e7dc8bbfefe1d802985f35bf files/STLport-5.1.2-fix_bashism.patch 3380
+RMD160 e75b86bf16d688a702fe23be781f8d903226f8cd files/STLport-5.1.2-fix_bashism.patch 3380
+SHA256 b32e22a987679c849bbe7998ab819ba789ba4543dcc6c611897dfb178553dbdb files/STLport-5.1.2-fix_bashism.patch 3380
 AUX STLport-5.1.2-wrong_russian_currency_name.patch 1050 RMD160 66bd42c7d7ee7a14a6be3f69a057162d5f8abacc SHA1 2f0e3291cb538c66531c2a7e037ca245a170b61c SHA256 07658cdd06c472fb6fa84254517db48931662fcd26f0bc56d41687fe9f8c115c
 MD5 04f8780be2ff13682f65ad590528a2af files/STLport-5.1.2-wrong_russian_currency_name.patch 1050
 RMD160 66bd42c7d7ee7a14a6be3f69a057162d5f8abacc files/STLport-5.1.2-wrong_russian_currency_name.patch 1050
@@ -33,14 +37,14 @@ EBUILD STLport-5.1.0.ebuild 2607 RMD160 df25db8ba8c8c1be42a870e0a77eb2a32924d5a9
 MD5 4addf88ec3f59ded96ae4ed86788e209 STLport-5.1.0.ebuild 2607
 RMD160 df25db8ba8c8c1be42a870e0a77eb2a32924d5a9 STLport-5.1.0.ebuild 2607
 SHA256 503f3b1bd75120e1ad2ab1b0bd95e9561a7b5f4e9e81c11878fbdc767dbc88aa STLport-5.1.0.ebuild 2607
-EBUILD STLport-5.1.2.ebuild 2553 RMD160 c637ca1ba3c67d1c4fab61ee3cd7712cfd41a6ae SHA1 638a4875fc6a24205e5d6bd327f2978763ba1439 SHA256 acf85bca3bb8dbf6215a4256a416a85bfc319ad6e978e9eed122ef44d5ea683b
-MD5 3b937722181b14636aa27b0dcc088150 STLport-5.1.2.ebuild 2553
-RMD160 c637ca1ba3c67d1c4fab61ee3cd7712cfd41a6ae STLport-5.1.2.ebuild 2553
-SHA256 acf85bca3bb8dbf6215a4256a416a85bfc319ad6e978e9eed122ef44d5ea683b STLport-5.1.2.ebuild 2553
-MISC ChangeLog 8555 RMD160 a94f6e135baf84ec8d264b4492d32f6124fa14f1 SHA1 94d0923a347ec908651d99d8046cbab3666d232e SHA256 5e271e05c5f13c891a0443b8f82802896e052f61676054ef7fdac2afa715d8a9
-MD5 348705370e2b6a3f2657020b748ff4df ChangeLog 8555
-RMD160 a94f6e135baf84ec8d264b4492d32f6124fa14f1 ChangeLog 8555
-SHA256 5e271e05c5f13c891a0443b8f82802896e052f61676054ef7fdac2afa715d8a9 ChangeLog 8555
+EBUILD STLport-5.1.2.ebuild 2599 RMD160 df56419fc8f6b4b72b9ac2819d75eafe08e6b92e SHA1 32e30625c0759cc9c734eac5a740f75f936bab1f SHA256 b1cdedde2f8ca571b210031dd35f3c9aae6c48b4fbd1a6575d26795d1a20b386
+MD5 c18c4fa6b619ab6d162765c2444092fc STLport-5.1.2.ebuild 2599
+RMD160 df56419fc8f6b4b72b9ac2819d75eafe08e6b92e STLport-5.1.2.ebuild 2599
+SHA256 b1cdedde2f8ca571b210031dd35f3c9aae6c48b4fbd1a6575d26795d1a20b386 STLport-5.1.2.ebuild 2599
+MISC ChangeLog 8716 RMD160 97a70be6f62a48e953199218a21bc964267d719b SHA1 f24c8148b7e13ac945d11b9b76e77e43c005f1c3 SHA256 bf1266c0b19590a5aef2028c00208a9b45c23ab29c789b99ca3e9a2fe224ce15
+MD5 6f5633484a147dd3c1435c9dd0fe4117 ChangeLog 8716
+RMD160 97a70be6f62a48e953199218a21bc964267d719b ChangeLog 8716
+SHA256 bf1266c0b19590a5aef2028c00208a9b45c23ab29c789b99ca3e9a2fe224ce15 ChangeLog 8716
 MISC metadata.xml 156 RMD160 537178ef5a820896e97475fb9aded47d50474bef SHA1 2a4ef4879b918a28132d21cd6d1bbaa2a30dccde SHA256 0e8490f9c62cb74e5894b52f643a02de0024d97dbfebad43082dce6bcb39555f
 MD5 41d7ac32dc54956e937401bb5a2c3810 metadata.xml 156
 RMD160 537178ef5a820896e97475fb9aded47d50474bef metadata.xml 156
diff --git a/dev-libs/STLport/STLport-5.1.2.ebuild b/dev-libs/STLport/STLport-5.1.2.ebuild
index 283694ca5a79..60bb6bafeb47 100644
--- a/dev-libs/STLport/STLport-5.1.2.ebuild
+++ b/dev-libs/STLport/STLport-5.1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/STLport/STLport-5.1.2.ebuild,v 1.7 2007/04/15 20:17:56 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/STLport/STLport-5.1.2.ebuild,v 1.8 2007/07/11 20:09:02 dev-zero Exp $
 
 inherit eutils versionator eutils toolchain-funcs multilib flag-o-matic
 
@@ -21,6 +21,7 @@ src_unpack() {
 	cd "${S}"
 
 	epatch "${FILESDIR}/${P}-wrong_russian_currency_name.patch"
+	epatch "${FILESDIR}/${P}-fix_bashism.patch"
 
 	sed -i \
 		-e 's/\(OPT += \)-O2/\1/' \
diff --git a/dev-libs/STLport/files/STLport-5.1.2-fix_bashism.patch b/dev-libs/STLport/files/STLport-5.1.2-fix_bashism.patch
new file mode 100644
index 000000000000..b85b39a571dd
--- /dev/null
+++ b/dev-libs/STLport/files/STLport-5.1.2-fix_bashism.patch
@@ -0,0 +1,57 @@
+diff -Naur STLport-5.1.2.orig/build/Makefiles/gmake/app/gcc.mak STLport-5.1.2/build/Makefiles/gmake/app/gcc.mak
+--- STLport-5.1.2.orig/build/Makefiles/gmake/app/gcc.mak	2007-07-11 21:12:21.000000000 +0200
++++ STLport-5.1.2/build/Makefiles/gmake/app/gcc.mak	2007-07-11 21:13:45.000000000 +0200
+@@ -104,12 +104,12 @@
+ endif
+ 
+ ifeq ($(OSNAME),linux)
+-START_OBJ := $(shell for o in crt{1,i,begin}.o; do ${CXX} -print-file-name=$$o; done)
+-END_OBJ := $(shell for o in crt{end,n}.o; do ${CXX} -print-file-name=$$o; done)
++START_OBJ := $(shell for o in crt1.o crti.o crtbegin.o; do ${CXX} -print-file-name=$$o; done)
++END_OBJ := $(shell for o in crtend.o crtn.o; do ${CXX} -print-file-name=$$o; done)
+ STDLIBS = ${STLPORT_LIB} ${_LGCC_S} -lpthread -lc -lm
+ endif
+ ifeq ($(OSNAME),openbsd)
+-START_OBJ := $(shell for o in crt{0,begin}.o; do ${CXX} -print-file-name=$$o; done)
++START_OBJ := $(shell for o in crt0.o crtbegin.o; do ${CXX} -print-file-name=$$o; done)
+ END_OBJ := $(shell for o in crtend.o; do ${CXX} -print-file-name=$$o; done)
+ STDLIBS = ${STLPORT_LIB} ${_LGCC_S} -lpthread -lc -lm
+ endif
+@@ -121,8 +121,8 @@
+ STDLIBS = ${STLPORT_LIB} ${_LGCC_S} -l${PTHR} -lc -lm
+ endif
+ ifeq ($(OSNAME),netbsd)
+-START_OBJ := $(shell for o in crt{1,i,begin}.o; do ${CXX} -print-file-name=$$o; done)
+-END_OBJ := $(shell for o in crt{end,n}.o; do ${CXX} -print-file-name=$$o; done)
++START_OBJ := $(shell for o in crt1.o crti.o crtbegin.o; do ${CXX} -print-file-name=$$o; done)
++END_OBJ := $(shell for o in crtend.o crtn.o; do ${CXX} -print-file-name=$$o; done)
+ STDLIBS = ${STLPORT_LIB} ${_LGCC_S} -lpthread -lc -lm
+ endif
+ ifeq ($(OSNAME),sunos)
+diff -Naur STLport-5.1.2.orig/build/Makefiles/gmake/lib/gcc.mak STLport-5.1.2/build/Makefiles/gmake/lib/gcc.mak
+--- STLport-5.1.2.orig/build/Makefiles/gmake/lib/gcc.mak	2007-07-11 21:12:21.000000000 +0200
++++ STLport-5.1.2/build/Makefiles/gmake/lib/gcc.mak	2007-07-11 21:14:41.000000000 +0200
+@@ -89,9 +89,9 @@
+ # Include whole language support archive (libsupc++.a) into libstlport:
+ # all C++ issues are in libstlport now.
+ ifeq ($(OSNAME),linux)
+-START_OBJ := $(shell for o in crt{i,beginS}.o; do ${CXX} -print-file-name=$$o; done)
+-#START_A_OBJ := $(shell for o in crt{i,beginT}.o; do ${CXX} -print-file-name=$$o; done)
+-END_OBJ := $(shell for o in crt{endS,n}.o; do ${CXX} -print-file-name=$$o; done)
++START_OBJ := $(shell for o in crti.o crtbeginS.o; do ${CXX} -print-file-name=$$o; done)
++#START_A_OBJ := $(shell for o in crti.o crtbeginT.o; do ${CXX} -print-file-name=$$o; done)
++END_OBJ := $(shell for o in crtendS.o crtn.o; do ${CXX} -print-file-name=$$o; done)
+ STDLIBS := -Wl,--whole-archive -lsupc++ ${_LGCC_EH} -Wl,--no-whole-archive ${_LGCC_S} -lpthread -lc -lm
+ endif
+ ifeq ($(OSNAME),openbsd)
+@@ -107,8 +107,8 @@
+ STDLIBS := -Wl,--whole-archive -lsupc++ ${_LGCC_EH} -Wl,--no-whole-archive ${_LGCC_S} -l${PTHR} -lc -lm
+ endif
+ ifeq ($(OSNAME),netbsd)
+-START_OBJ := $(shell for o in crt{i,beginS}.o; do ${CXX} -print-file-name=$$o; done)
+-END_OBJ := $(shell for o in crt{endS,n}.o; do ${CXX} -print-file-name=$$o; done)
++START_OBJ := $(shell for o in crti.o crtbeginS.o; do ${CXX} -print-file-name=$$o; done)
++END_OBJ := $(shell for o in crtendS.o crtn.o; do ${CXX} -print-file-name=$$o; done)
+ STDLIBS := -Wl,--whole-archive -lsupc++ ${_LGCC_EH} -Wl,--no-whole-archive ${_LGCC_S} -lpthread -lc -lm
+ endif
+ ifeq ($(OSNAME),sunos)