diff options
author | Samuli Suominen <ssuominen@gentoo.org> | 2011-04-25 14:46:47 +0000 |
---|---|---|
committer | Samuli Suominen <ssuominen@gentoo.org> | 2011-04-25 14:46:47 +0000 |
commit | 140b4eeb0b3c0f78bc03ee7ac3cde833a62369a4 (patch) | |
tree | e13c7088f7c490358f9645f232e9cde1e2712845 /dev-libs/STLport | |
parent | Fix deps, add patch and keyword for ~ppc-macos, bug #353362 (diff) | |
download | historical-140b4eeb0b3c0f78bc03ee7ac3cde833a62369a4.tar.gz historical-140b4eeb0b3c0f78bc03ee7ac3cde833a62369a4.tar.bz2 historical-140b4eeb0b3c0f78bc03ee7ac3cde833a62369a4.zip |
old, fails to build with recent glibc anyway
Package-Manager: portage-2.2.0_alpha30/cvs/Linux x86_64
Diffstat (limited to 'dev-libs/STLport')
-rw-r--r-- | dev-libs/STLport/Manifest | 21 | ||||
-rw-r--r-- | dev-libs/STLport/STLport-5.1.5.ebuild | 133 | ||||
-rw-r--r-- | dev-libs/STLport/files/STLport-5.1.2-fix_bashism.patch | 57 | ||||
-rw-r--r-- | dev-libs/STLport/files/STLport-5.1.2-wrong_russian_currency_name.patch | 11 | ||||
-rw-r--r-- | dev-libs/STLport/files/STLport-5.1.5-alpha.patch | 21 | ||||
-rw-r--r-- | dev-libs/STLport/files/STLport-5.1.5-bashism.patch | 38 | ||||
-rw-r--r-- | dev-libs/STLport/files/STLport-5.1.5-cxx_use_c99.patch | 49 | ||||
-rw-r--r-- | dev-libs/STLport/files/STLport-5.1.5-fix-warnings.patch | 96 | ||||
-rw-r--r-- | dev-libs/STLport/files/STLport-5.1.5-gcc-4.3.patch | 40 | ||||
-rw-r--r-- | dev-libs/STLport/files/STLport-5.1.5-hppa.patch | 24 | ||||
-rw-r--r-- | dev-libs/STLport/files/STLport-5.1.5-portability-hack.patch | 26 |
11 files changed, 5 insertions, 511 deletions
diff --git a/dev-libs/STLport/Manifest b/dev-libs/STLport/Manifest index dfb96b086921..25ae2251911a 100644 --- a/dev-libs/STLport/Manifest +++ b/dev-libs/STLport/Manifest @@ -1,26 +1,15 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 +Hash: SHA256 -AUX STLport-5.1.2-fix_bashism.patch 3380 RMD160 e75b86bf16d688a702fe23be781f8d903226f8cd SHA1 0e78e50dae1801abece7088cb6cfc491c0947312 SHA256 b32e22a987679c849bbe7998ab819ba789ba4543dcc6c611897dfb178553dbdb -AUX STLport-5.1.2-wrong_russian_currency_name.patch 1050 RMD160 66bd42c7d7ee7a14a6be3f69a057162d5f8abacc SHA1 2f0e3291cb538c66531c2a7e037ca245a170b61c SHA256 07658cdd06c472fb6fa84254517db48931662fcd26f0bc56d41687fe9f8c115c -AUX STLport-5.1.5-alpha.patch 840 RMD160 de220df85c3ff598cb5c91452bca34bfe2b7f302 SHA1 d598db0da8db80b640545998a317e93c98e5e301 SHA256 2c7fd337165a301e50111a8d5305d6ec3c74b73940b1598d66ab703cebc633e4 -AUX STLport-5.1.5-bashism.patch 2210 RMD160 6db5caa622725378aa73c2942a72a8d5c125f908 SHA1 2c3e0153fc61aafddce7d8d13579ba4a80d5bc9d SHA256 5626718d9698300577bbecbef88f9c7e30d5e59797f01925c4e8bf1093275a78 -AUX STLport-5.1.5-cxx_use_c99.patch 1387 RMD160 e372afafa212ff6ff016cdef950303c32802976d SHA1 064a178eb7b43a48c1dc01a627505e89efc6a1a4 SHA256 d68ce2e9a19e3d86f6a96f8c5424f502814550a5086dbe8d99db12cdad8975bb -AUX STLport-5.1.5-fix-warnings.patch 4193 RMD160 d80618eb1cfb592117a106b7a04a1576de590a18 SHA1 109069f90181db7ef5b5169ed8cb49c98b5e982f SHA256 dfb1efe35f045779301c2b72a9d5d43a23081ac801f5767c3b2022e4a660e689 -AUX STLport-5.1.5-gcc-4.3.patch 1100 RMD160 75658abd5c083351e82aba5d4aa26757f3b66ebd SHA1 d6165ad989183ffdeb8748f214f5f7ea4ca7fc6c SHA256 df5f98b6548e9300b08cd599498bd46aa6b9bc8ed5015b9394bb050aef9979b9 -AUX STLport-5.1.5-hppa.patch 1222 RMD160 6bd77741f7a00b56b477b9dcc62ae997eebe6147 SHA1 b0468151c03337e97d273a61ad454c88498ce40f SHA256 95aebbae47356fe94068a6834a8e28c278e1c06e3e01ba581f8c615d9154a862 -AUX STLport-5.1.5-portability-hack.patch 693 RMD160 1336764fa42f7707238887c0eabbd519162bc1c1 SHA1 f9b55367cb17a34b5200ef765b6c22a3a72d584a SHA256 532eb37422adbe4b141487d0b14bf6e4f0ba87250c8ca44aa34578f4180b42a8 -DIST STLport-5.1.5.tar.bz2 682914 RMD160 bc24cbba247821a9b94fbc7cdf8d2b421bcc6afb SHA1 0c8b188fe74162998aea17ad689397adf99b2d93 SHA256 2470ca40adc89750c69affffde8a9e6ab6a03f4e3c93640067089f99e76f6dc5 DIST STLport-5.2.1.tar.bz2 717202 RMD160 ab972549d32513390cadb28f566a4a8fe034d8ec SHA1 98518859f538192245ab838d56107992b21ac469 SHA256 755b007b982c4545086c43affc8ed32c0acd577ee206eb1f6967e250c3546fc9 DIST STLport-patches-5.2.1-1.tbz2 4911 RMD160 0b09a03274ac21e337dec1e7fe118de4bb3042d3 SHA1 70e5c31051a471d36e31a9f231f34903f136656a SHA256 3b9741849a303afc1f4ae30f4748e7de729786c3630885d1ac70734846b55e61 -EBUILD STLport-5.1.5.ebuild 3562 RMD160 099f3592698a4e772f0f978acae30d3d5b26986d SHA1 bcb863920f6f1541b6b660322961ba7ef661f637 SHA256 956c0cccc07fd47c8e7d7fe66eb053f1ce2b6e534239561aa670097676ec78ee EBUILD STLport-5.2.1.ebuild 2636 RMD160 330b59d559ac99542dafe0c74b864df7de83f4ac SHA1 062427e8e7bad860684e2bc32b0ad365990d6170 SHA256 e9bdb5b25de780282961af1ec30a37ab1fda746cbf048a7b2da137a6c9ca90e4 MISC ChangeLog 11492 RMD160 d5e2906478a244997ae7f01ec8332e852a59494f SHA1 b05f23866133eb8c2d54c2580d25e358acde0e2f SHA256 ccf8d015171ff381f536e78242c4bb20d75c3470d93405cb9c885693a7e32071 MISC metadata.xml 243 RMD160 4c7b362fa5a0b3f13257e1826c40bf362c7f1b1c SHA1 91e79215f176c1d0c966927810d729c658604e92 SHA256 a127aa93730ed7bb90edca642be63155aeb752bd38dcbd3b874fa496f7a70cc2 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.16 (GNU/Linux) +Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk21h1UACgkQuQc30/atMkC7pACfSyTgyMG8E5vNVsBwDzOAlFvD -YhMAoL1QQhSvxh9c1ZCjKGcDey+Nm16F -=Irin +iF4EAREIAAYFAk21iaoACgkQXkR9YqOcLPE/LwD9E4vVTRxn9NS6GTPc6vyBIpFp +2JaaXDdspqkEP+sYn9gA/3AZbGS+Tly1PIlTHQZllwONrqH0TWF3AUGSm0n/UO5W +=a56I -----END PGP SIGNATURE----- diff --git a/dev-libs/STLport/STLport-5.1.5.ebuild b/dev-libs/STLport/STLport-5.1.5.ebuild deleted file mode 100644 index be57dad6a6ba..000000000000 --- a/dev-libs/STLport/STLport-5.1.5.ebuild +++ /dev/null @@ -1,133 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/STLport/STLport-5.1.5.ebuild,v 1.8 2010/01/06 22:38:20 jer Exp $ - -inherit eutils versionator eutils toolchain-funcs multilib flag-o-matic - -KEYWORDS="amd64 ~hppa ppc ppc64 sparc x86" - -DESCRIPTION="C++ STL library" -HOMEPAGE="http://stlport.sourceforge.net/" -SRC_URI="mirror://sourceforge/stlport/${P}.tar.bz2" -LICENSE="as-is" -SLOT="0" -IUSE="boost" - -DEPEND="boost? ( dev-libs/boost )" -RDEPEND="${DEPEND}" - -src_unpack() { - unpack ${A} - cd "${S}" - - #Debian bug 356570 http://bugs.debian.org/356570 - #Gentoo bug 183060 http://bugs.gentoo.org/183060 - #Debian bug 443234 http://bugs.debian.org/443234 - #Debian bug 389316 http://bugs.debian.org/389316 - #Debian bug 384247 http://bugs.debian.org/384247 - #Debian bug 465395 http://bugs.debian.org/465395 - #Debian bug 468063 http://bugs.debian.org/468063 - epatch "${FILESDIR}/${P}-portability-hack.patch" \ - "${FILESDIR}/${P}-bashism.patch" \ - "${FILESDIR}/${P}-cxx_use_c99.patch" \ - "${FILESDIR}/${P}-hppa.patch" \ - "${FILESDIR}/${P}-alpha.patch" \ - "${FILESDIR}/${P}-fix-warnings.patch" \ - "${FILESDIR}/${P}-gcc-4.3.patch" - - sed -i \ - -e 's/\(OPT += \)-O2/\1/' \ - build/Makefiles/gmake/*cc.mak \ - || die "sed opts failed" - - sed -i \ - -e 's/_STLP_VENDOR_CSTD::wcsftime/::wcsftime/' \ - stlport/stl/_cwchar.h || die "sed failed" - - # CXX_VERSION on gentoo has ( )s in them, they need to be quoted. - sed -i \ - -e 's/echo ${CXX_VERSION}/echo "${CXX_VERSION}"/' \ - build/Makefiles/gmake/*.mak \ - || die "sed CXX_VERSION failed" - - # We have to add this to host.h to make sure - # that dependencies of STLport use the same settings - cat <<- EOF >> stlport/stl/config/host.h - #define _STLP_NATIVE_INCLUDE_PATH ../g++-v$(gcc-major-version) - /* use pthreads for threading */ - #define _PTHREADS - /* enable largefile support */ - #define _FILE_OFFSET_BITS 64 - #define _LARGEFILE_SOURCE - #define _LARGEFILE64_SOURCE - EOF -} - -src_compile() { - - sed -i \ - -e "s|\(CC :=\) gcc|\1 $(tc-getCC)|" \ - -e "s|\(CXX :=\) c++|\1 $(tc-getCXX)|" \ - -e "s|^\(CFLAGS = \)|\1 ${CFLAGS} |" \ - -e "s|^\(CCFLAGS = \)|\1 ${CFLAGS} |" \ - -e "s|^\(CPPFLAGS = \)|\1 ${CPPFLAGS} |" \ - build/Makefiles/gmake/gcc.mak || die "sed failed" - - local myconf - if use boost ; then - myconf="${myconf} --with-boost=/usr/include" - sed -i \ - -e 'N;N;N;s:/\**\n\(#define _STLP_USE_BOOST_SUPPORT 1\)*\n\*/:\1:' \ - stlport/stl/config/user_config.h - fi - - cd "${S}/build/lib" - - # It's not an autoconf script - ./configure \ - ${myconf} \ - --with-extra-cxxflags="${CXXFLAGS}" || die "configure failed" - - cd "${S}" - - cat <<- EOF >> build/Makefiles/config.mak - CFLAGS := ${CFLAGS} - EOF - - local targets - targets="all-shared all-static" - - # The build-system is broken in respect to parallel builds, bug #161881 - emake \ - -j1 \ - -C build/lib \ - -f gcc.mak \ - depend ${targets} || die "Compile failed" - -} - -src_install() { - emake -C build/lib -f gcc.mak install - dolib.so lib/* - - emake -C build/lib -f gcc.mak install-static - dolib.a lib/*.a - - insinto /usr/include - doins -r stlport - - dodoc README etc/ChangeLog* etc/*.txt doc/* -} - -src_test() { - cd "${S}/build" - - sed -i \ - -e "1aLDFLAGS := -L${S}/build/lib/obj/gcc/so -L${S}/build/lib/obj/gcc/so_g -L${S}/build/lib/obj/gcc/so_stlg" \ - test/unit/gcc.mak || die "sed failed" - - emake -j1 -C test/unit -f gcc.mak || die "emake tests failed" - - export LD_LIBRARY_PATH="./lib/obj/gcc/so_stlg" - ./test/unit/obj/gcc/so_stlg/stl_unit_test || die "unit tests failed" -} 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 deleted file mode 100644 index b85b39a571dd..000000000000 --- a/dev-libs/STLport/files/STLport-5.1.2-fix_bashism.patch +++ /dev/null @@ -1,57 +0,0 @@ -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) diff --git a/dev-libs/STLport/files/STLport-5.1.2-wrong_russian_currency_name.patch b/dev-libs/STLport/files/STLport-5.1.2-wrong_russian_currency_name.patch deleted file mode 100644 index 1ba70bcf5665..000000000000 --- a/dev-libs/STLport/files/STLport-5.1.2-wrong_russian_currency_name.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- test/unit/locale_test.cpp.orig 2007-04-01 13:09:56.000000000 +0200 -+++ test/unit/locale_test.cpp 2007-04-01 13:10:37.000000000 +0200 -@@ -36,7 +36,7 @@ - # else - " " }, - # endif -- { "ru_RU.koi8r", ",", ".", "RUR ", "", "", "\xd2\xd5\xc2", ".", " " }, -+ { "ru_RU.koi8r", ",", ".", "RUB ", "RUR", "", "\xd2\xd5\xc2", ".", " " }, - { "en_GB", ".", ",", "GBP ", "", "\xa3", "", ".", "," }, - { "en_US", ".", ",", "USD ", "", "$", "", ".", "," }, - { "C", ".", ",", "", "", "", "", " ", " " }, diff --git a/dev-libs/STLport/files/STLport-5.1.5-alpha.patch b/dev-libs/STLport/files/STLport-5.1.5-alpha.patch deleted file mode 100644 index 93cfbf334747..000000000000 --- a/dev-libs/STLport/files/STLport-5.1.5-alpha.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- stlport5.1.orig/stlport/stl/_cwchar.h -+++ stlport5.1/stlport/stl/_cwchar.h -@@ -105,18 +105,6 @@ - # define WCHAR_MAX ((wchar_t)~0) - # endif - # endif --# if defined (__GNUC__) && defined (__alpha__) --/* Definition of WCHAR_MIN and MAX are wrong for alpha platform -- * as gcc consider wchar_t as an unsigned type. Static assertion are -- * here to check that a future alpha SDK or a future gcc won't change the -- * situation making this workaround useless. -- */ --_STLP_STATIC_ASSERT(((wchar_t)-1 > 0) && (WCHAR_MIN < 0)) --# undef WCHAR_MIN --# define WCHAR_MIN 0 --# undef WCHAR_MAX --# define WCHAR_MAX ((wchar_t)~0) --# endif - # if defined(__HP_aCC) && (__HP_aCC >= 60000) - /* Starting with B.11.31, HP-UX/ia64 provides C99-compliant definitions - * of WCHAR_MIN/MAX macros without having to define diff --git a/dev-libs/STLport/files/STLport-5.1.5-bashism.patch b/dev-libs/STLport/files/STLport-5.1.5-bashism.patch deleted file mode 100644 index 23abf2f3ab64..000000000000 --- a/dev-libs/STLport/files/STLport-5.1.5-bashism.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- STLport-5.1.5.orig/build/Makefiles/gmake/lib/gcc.mak -+++ STLport-5.1.5/build/Makefiles/gmake/lib/gcc.mak -@@ -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} ${CXXFLAGS} -print-file-name=$$o; done) -+START_OBJ := $(shell for o in crti.o crtbeginS.o; do ${CXX} ${CXXFLAGS} -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} ${CXXFLAGS} -print-file-name=$$o; done) -+END_OBJ := $(shell for o in crtendS.o crtn.o; do ${CXX} ${CXXFLAGS} -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} ${CXXFLAGS} -print-file-name=$$o; done) --END_OBJ := $(shell for o in crt{endS,n}.o; do ${CXX} ${CXXFLAGS} -print-file-name=$$o; done) -+START_OBJ := $(shell for o in crti.o crtbeginS.o; do ${CXX} ${CXXFLAGS} -print-file-name=$$o; done) -+END_OBJ := $(shell for o in crtendS.o crtn.o; do ${CXX} ${CXXFLAGS} -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) ---- STLport-5.1.5.orig/build/Makefiles/gmake/app/gcc.mak -+++ STLport-5.1.5/build/Makefiles/gmake/app/gcc.mak -@@ -104,8 +104,8 @@ - endif - - ifeq ($(OSNAME),linux) --START_OBJ := $(shell for o in crt{1,i,begin}.o; do ${CXX} ${CXXFLAGS} -print-file-name=$$o; done) --END_OBJ := $(shell for o in crt{end,n}.o; do ${CXX} ${CXXFLAGS} -print-file-name=$$o; done) -+START_OBJ := $(shell for o in crt1.o crti.o crtbegin.o; do ${CXX} ${CXXFLAGS} -print-file-name=$$o; done) -+END_OBJ := $(shell for o in crtend.o crtn.o; do ${CXX} ${CXXFLAGS} -print-file-name=$$o; done) - STDLIBS = ${STLPORT_LIB} ${_LGCC_S} -lpthread -lc -lm - endif - ifeq ($(OSNAME),openbsd) diff --git a/dev-libs/STLport/files/STLport-5.1.5-cxx_use_c99.patch b/dev-libs/STLport/files/STLport-5.1.5-cxx_use_c99.patch deleted file mode 100644 index 68fa98b9737d..000000000000 --- a/dev-libs/STLport/files/STLport-5.1.5-cxx_use_c99.patch +++ /dev/null @@ -1,49 +0,0 @@ ---- STLport-5.1.5.orig/stlport/stl/_cstdlib.h -+++ STLport-5.1.5/stlport/stl/_cstdlib.h -@@ -16,12 +16,27 @@ - #ifndef _STLP_INTERNAL_CSTDLIB - #define _STLP_INTERNAL_CSTDLIB - -+/* Work around inconsistent definition of _GLIBCXX_USE_C99 across arches; on -+ * these arches std::llabs is therefore not available. -+ * -+ * See http://bugs.debian.org/443234 -+ */ -+#ifndef _GLIBCXX_USE_C99 -+#define _GLIBCXX_USE_C99 1 -+#define _HACK_CXX_USE_C99 1 -+#endif -+ - #if defined (_STLP_USE_NEW_C_HEADERS) - # include _STLP_NATIVE_CPP_C_HEADER(cstdlib) - #else - # include <stdlib.h> - #endif - -+#ifdef _HACK_CXX_USE_C99 -+#undef _GLIBCXX_USE_C99 -+#undef _HACK_CXX_USE_C99 -+#endif -+ - #if defined (__BORLANDC__) - /* Borland process.h header do not bring anything here and is just included - * in order to avoid inclusion later. This header cannot be included later ---- STLport-5.1.5.orig/stlport/stl/_cmath.h -+++ STLport-5.1.5/stlport/stl/_cmath.h -@@ -21,7 +21,16 @@ - * so cstdlib has to be included first. - */ - #if defined (__GNUC__) && defined (_STLP_USE_NEW_C_HEADERS) -+/* See http://bugs.debian.org/443234 */ -+# ifndef _GLIBCXX_USE_C99 -+# define _GLIBCXX_USE_C99 1 -+# define _HACK_CXX_USE_C99 1 -+# endif - # include _STLP_NATIVE_CPP_C_HEADER(cstdlib) -+# ifdef _HACK_CXX_USE_C99 -+# undef _GLIBCXX_USE_C99 -+# undef _HACK_CXX_USE_C99 -+# endif - #endif - - #if defined (_STLP_USE_NEW_C_HEADERS) diff --git a/dev-libs/STLport/files/STLport-5.1.5-fix-warnings.patch b/dev-libs/STLport/files/STLport-5.1.5-fix-warnings.patch deleted file mode 100644 index fc155482f53f..000000000000 --- a/dev-libs/STLport/files/STLport-5.1.5-fix-warnings.patch +++ /dev/null @@ -1,96 +0,0 @@ ---- STLport-5.1.5.orig/stlport/stl/_num_put.c -+++ STLport-5.1.5/stlport/stl/_num_put.c -@@ -158,7 +158,7 @@ - //casting numeric_limits<ptrdiff_t>::max to streamsize only works is ptrdiff_t is signed or streamsize representation - //is larger than ptrdiff_t one. - _STLP_STATIC_ASSERT((sizeof(streamsize) > sizeof(ptrdiff_t)) || -- (sizeof(streamsize) == sizeof(ptrdiff_t)) && numeric_limits<ptrdiff_t>::is_signed) -+ ((sizeof(streamsize) == sizeof(ptrdiff_t)) && numeric_limits<ptrdiff_t>::is_signed)) - ptrdiff_t __pad = __STATIC_CAST(ptrdiff_t, (min) (__STATIC_CAST(streamsize, (numeric_limits<ptrdiff_t>::max)()), - __STATIC_CAST(streamsize, __wid - __len))); - ios_base::fmtflags __dir = __flg & ios_base::adjustfield; ---- STLport-5.1.5.orig/stlport/stl/_istream.c -+++ STLport-5.1.5/stlport/stl/_istream.c -@@ -647,7 +647,7 @@ - //casting numeric_limits<ptrdiff_t>::max to streamsize only works is ptrdiff_t is signed or streamsize representation - //is larger than ptrdiff_t one. - _STLP_STATIC_ASSERT((sizeof(streamsize) > sizeof(ptrdiff_t)) || -- (sizeof(streamsize) == sizeof(ptrdiff_t)) && numeric_limits<ptrdiff_t>::is_signed) -+ ((sizeof(streamsize) == sizeof(ptrdiff_t)) && numeric_limits<ptrdiff_t>::is_signed)) - ptrdiff_t __request = __STATIC_CAST(ptrdiff_t, (min) (__STATIC_CAST(streamsize, (numeric_limits<ptrdiff_t>::max)()), _Num - __n)); - - const _CharT* __p = __scan_delim(__first, __last); ---- STLport-5.1.5.orig/stlport/stl/_locale.h -+++ STLport-5.1.5/stlport/stl/_locale.h -@@ -308,11 +308,11 @@ - #endif - - template <class _Facet> --bool _HasFacet(const locale& __loc, const _Facet* __facet) _STLP_NOTHROW -+bool _HasFacet(const locale& __loc, const _Facet*) _STLP_NOTHROW - { return (__loc._M_get_facet(_Facet::id) != 0); } - - template <class _Facet> --_Facet* _UseFacet(const locale& __loc, const _Facet* __facet) -+_Facet* _UseFacet(const locale& __loc, const _Facet*) - { return __STATIC_CAST(_Facet*, __loc._M_use_facet(_Facet::id)); } - - _STLP_END_NAMESPACE ---- STLport-5.1.5.orig/stlport/stl/_algo.c -+++ STLport-5.1.5/stlport/stl/_algo.c -@@ -1342,7 +1342,7 @@ - template <class _ForwardIter, class _Tp, - class _Compare1, class _Compare2, class _Distance> - _ForwardIter __upper_bound(_ForwardIter __first, _ForwardIter __last, const _Tp& __val, -- _Compare1 __comp1, _Compare2 __comp2, _Distance*) { -+ _Compare1 _STLP_VERBOSE_PARAM(__comp1), _Compare2 __comp2, _Distance*) { - _Distance __len = distance(__first, __last); - _Distance __half; - ---- STLport-5.1.5.orig/stlport/stl/_algobase.c -+++ STLport-5.1.5/stlport/stl/_algobase.c -@@ -371,7 +371,7 @@ - - template <class _ForwardIter, class _Tp, class _Compare1, class _Compare2, class _Distance> - _ForwardIter __lower_bound(_ForwardIter __first, _ForwardIter __last, const _Tp& __val, -- _Compare1 __comp1, _Compare2 __comp2, _Distance*) { -+ _Compare1 __comp1, _Compare2 _STLP_VERBOSE_PARAM(__comp2), _Distance*) { - _Distance __len = distance(__first, __last); - _Distance __half; - _ForwardIter __middle; ---- STLport-5.1.5.orig/stlport/stl/config/features.h -+++ STLport-5.1.5/stlport/stl/config/features.h -@@ -415,6 +415,7 @@ - - #if !defined (_STLP_DEBUG) - # define _STLP_VERBOSE_ASSERT(expr,diagnostic) -+# define _STLP_VERBOSE_PARAM(param) - # define _STLP_DEBUG_CHECK(expr) - # define _STLP_DEBUG_DO(expr) - #endif ---- STLport-5.1.5.orig/stlport/stl/debug/_debug.h -+++ STLport-5.1.5/stlport/stl/debug/_debug.h -@@ -184,6 +184,7 @@ - } - # endif - -+# define _STLP_VERBOSE_PARAM(param) param - # define _STLP_DEBUG_CHECK(expr) _STLP_ASSERT(expr) - # define _STLP_DEBUG_DO(expr) expr; - ---- STLport-5.1.5.orig/src/strstream.cpp -+++ STLport-5.1.5/src/strstream.cpp -@@ -266,11 +266,12 @@ - } - - void strstreambuf::_M_free(char* p) { -- if (p) -+ if (p) { - if (_M_free_fun) - _M_free_fun(p); - else - delete[] p; -+ } - } - - void strstreambuf::_M_setup(char* get, char* put, streamsize n) { diff --git a/dev-libs/STLport/files/STLport-5.1.5-gcc-4.3.patch b/dev-libs/STLport/files/STLport-5.1.5-gcc-4.3.patch deleted file mode 100644 index 270890f80de9..000000000000 --- a/dev-libs/STLport/files/STLport-5.1.5-gcc-4.3.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- STLport-5.1.5.orig/build/Makefiles/gmake/gcc.mak -+++ STLport-5.1.5/build/Makefiles/gmake/gcc.mak -@@ -29,6 +29,11 @@ - CXX_VERSION := $(shell ${CXX} --version | grep GCC | awk '{ print $$3; }') - - ifeq ($(CXX_VERSION),) -+# Current g++-4.3 -+CXX_VERSION := $(shell ${CXX} --version | grep '^g++' | awk '{ print $$4; }') -+endif -+ -+ifeq ($(CXX_VERSION),) - # 2.95 report only version - CXX_VERSION := $(shell ${CXX} --version) - endif ---- STLport-5.1.5.orig/stlport/limits.h -+++ STLport-5.1.5/stlport/limits.h -@@ -24,7 +24,11 @@ - struct _exception; - #endif - --#include _STLP_NATIVE_C_HEADER(limits.h) -+#if defined (_STLP_HAS_INCLUDE_NEXT) -+# include_next <limits.h> -+#else -+# include _STLP_NATIVE_C_HEADER(limits.h) -+#endif - - #if (_STLP_OUTERMOST_HEADER_ID == 0x201) - # if ! defined (_STLP_DONT_POP_HEADER_ID) ---- STLport-5.1.5.orig/stlport/stl/config/_gcc.h -+++ STLport-5.1.5/stlport/stl/config/_gcc.h -@@ -4,6 +4,8 @@ - - #define _STLP_COMPILER "gcc" - -+#define _STLP_HAS_INCLUDE_NEXT 1 -+ - /* Systems having GLIBC installed have different traits */ - #if defined (__linux__) - # ifndef _STLP_USE_GLIBC diff --git a/dev-libs/STLport/files/STLport-5.1.5-hppa.patch b/dev-libs/STLport/files/STLport-5.1.5-hppa.patch deleted file mode 100644 index 57e6ef7791cf..000000000000 --- a/dev-libs/STLport/files/STLport-5.1.5-hppa.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- STLport-5.1.5.orig/build/Makefiles/gmake/lib/gcc.mak -+++ STLport-5.1.5/build/Makefiles/gmake/lib/gcc.mak -@@ -93,6 +93,9 @@ - #START_A_OBJ := $(shell for o in crt{i,beginT}.o; do ${CXX} -print-file-name=$$o; done) - END_OBJ := $(shell for o in crtendS.o crtn.o; do ${CXX} ${CXXFLAGS} -print-file-name=$$o; done) - STDLIBS := -Wl,--whole-archive -lsupc++ ${_LGCC_EH} -Wl,--no-whole-archive ${_LGCC_S} -lpthread -lc -lm -+ifneq (,$(findstring $(M_ARCH),hppa parisc64 parisc)) -+STDLIBS += -lgcc -+endif - endif - ifeq ($(OSNAME),openbsd) - START_OBJ := $(shell for o in crtbeginS.o; do ${CXX} ${CXXFLAGS} -print-file-name=$$o; done) ---- STLport-5.1.5.orig/build/Makefiles/gmake/app/gcc.mak -+++ STLport-5.1.5/build/Makefiles/gmake/app/gcc.mak -@@ -107,6 +107,9 @@ - START_OBJ := $(shell for o in crt1.o crti.o crtbegin.o; do ${CXX} ${CXXFLAGS} -print-file-name=$$o; done) - END_OBJ := $(shell for o in crtend.o crtn.o; do ${CXX} ${CXXFLAGS} -print-file-name=$$o; done) - STDLIBS = ${STLPORT_LIB} ${_LGCC_S} -lpthread -lc -lm -+ifneq (,$(findstring $(M_ARCH),hppa parisc64 parisc)) -+STDLIBS += -lgcc -+endif - endif - ifeq ($(OSNAME),openbsd) - START_OBJ := $(shell for o in crt{0,begin}.o; do ${CXX} ${CXXFLAGS} -print-file-name=$$o; done) diff --git a/dev-libs/STLport/files/STLport-5.1.5-portability-hack.patch b/dev-libs/STLport/files/STLport-5.1.5-portability-hack.patch deleted file mode 100644 index 70b978dd596f..000000000000 --- a/dev-libs/STLport/files/STLport-5.1.5-portability-hack.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- STLport-5.1.5.orig/stlport/stl/config/_gcc.h -+++ STLport-5.1.5/stlport/stl/config/_gcc.h -@@ -459,3 +459,23 @@ - # define _STLP_STATIC_TEMPLATE_DATA 1 - #endif - -+/* Ugly hack here ; we pull in GNU libc <bits/mathdef.h> to find out whether -+ * this platform has `long double' type. It solves #356570. -+ * -+ * THIS IS BAD BECAUSE WE POLLUTE THE GLOBAL NAMESPACE. -+ */ -+#ifdef __GLIBC__ -+# if !defined(_MATH_H) -+# define _HACK_UNDEF_MATH_H -+# define _MATH_H -+# endif -+# include <bits/mathdef.h> -+# if defined(__NO_LONG_DOUBLE_MATH) -+# define _STLP_NO_LONG_DOUBLE -+# endif -+# if defined(_HACK_UNDEF_MATH_H) -+# undef _HACK_UNDEF_MATH_H -+# undef _MATH_H -+# endif -+#endif -+ |