summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIlya Volynets <iluxa@gentoo.org>2009-12-13 12:09:40 +0000
committerIlya Volynets <iluxa@gentoo.org>2009-12-13 12:09:40 +0000
commit37172288dd87b699136995a2b806d85c25330822 (patch)
treedfcc911eee398ec12ab3febfc984c3a778565cd2 /dev-cpp
parentInitial version of dev-haskell/hashed-storage. (diff)
downloadhistorical-37172288dd87b699136995a2b806d85c25330822.tar.gz
historical-37172288dd87b699136995a2b806d85c25330822.tar.bz2
historical-37172288dd87b699136995a2b806d85c25330822.zip
Fix --as-needed compilation
Package-Manager: portage-2.1.6.13/cvs/Linux x86_64
Diffstat (limited to 'dev-cpp')
-rw-r--r--dev-cpp/sptk/ChangeLog6
-rw-r--r--dev-cpp/sptk/Manifest5
-rw-r--r--dev-cpp/sptk/files/sptk-3.5.8.14-as-needed.patch16
-rw-r--r--dev-cpp/sptk/sptk-3.5.8.14-r1.ebuild3
4 files changed, 26 insertions, 4 deletions
diff --git a/dev-cpp/sptk/ChangeLog b/dev-cpp/sptk/ChangeLog
index 1174695aece2..d5f74cf48648 100644
--- a/dev-cpp/sptk/ChangeLog
+++ b/dev-cpp/sptk/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-cpp/sptk
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/sptk/ChangeLog,v 1.65 2009/10/03 21:34:19 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/sptk/ChangeLog,v 1.66 2009/12/13 12:09:39 iluxa Exp $
+
+ 13 Dec 2009; Ilya A. Volynets-Evenbakh <iluxa@gentoo.org>
+ sptk-3.5.8.14-r1.ebuild, +files/sptk-3.5.8.14-as-needed.patch:
+ Fix --as-needed compilation. Thanks Kacper Kowalik
03 Oct 2009; Tomáš Chvátal <scarabeus@gentoo.org>
-sptk-3.5.7.13.ebuild:
diff --git a/dev-cpp/sptk/Manifest b/dev-cpp/sptk/Manifest
index 801ef2a31161..ee83e7896d3a 100644
--- a/dev-cpp/sptk/Manifest
+++ b/dev-cpp/sptk/Manifest
@@ -1,8 +1,9 @@
+AUX sptk-3.5.8.14-as-needed.patch 532 RMD160 45ec102b9d50ecf23e534b81e3ed265213878569 SHA1 439e866ad8e001a47341e3b194513a0bb5238727 SHA256 beafde068e1d51e90030edebcccf0693b9ed6c5f745ce91cbb18cdb5c0f12993
AUX sptk-gcc-4.4.patch 1657 RMD160 6711fa4e6a3ddac7ff4a484d6328783a87e952b8 SHA1 fc0b65e5f5991bd83820243ff25a341a4147553a SHA256 9af109eb625369b0eb9abc36ddec3930c5f43aee52993fa3de882ca022ae0990
DIST sptk-3.5.8.10.tbz2 4372961 RMD160 863cdd10631abf5895dd8f36d1e3e97504bf8f26 SHA1 1abd960108d06438022448822da1e954651e11f9 SHA256 ae5ceaa771252ff551aac857197b6bcc3d36c6aa1fde1653b26d5367e2283205
DIST sptk-3.5.8.14.tbz2 4378384 RMD160 47d57c1992a3005ab2bb74a5bb5c9c117f8673ad SHA1 e45b5999ee128e690262e4d915d43dfe61cc2c95 SHA256 4becafebe46b6765ae4b3f1aeeb10e64968d4e1dd8a8529b402e515c53c3be4e
EBUILD sptk-3.5.8.10.ebuild 1812 RMD160 bfa11c22e0758ecd5dc6fbb5bb2b0e707c84f3ae SHA1 1d9b1c77139b434e1c537f6ad316e77ce5ff9d34 SHA256 25230d57fe77c3b8e58c7defec6df49bf2d0abf8820a135a8bb24603fe843bd3
-EBUILD sptk-3.5.8.14-r1.ebuild 1886 RMD160 897c611506e20f9add88f190ca8ae2e9322345f9 SHA1 d8d85942df33ea2b70d9ad5642bf75e9de8eb4ab SHA256 ca5466578e1aff60f712f9a42cf6eb9e989c55ea740b7c9a6049228b9eb025f2
+EBUILD sptk-3.5.8.14-r1.ebuild 1928 RMD160 f465e867e848c370bf446be4acb3ac880424bad3 SHA1 f6073408b2d991b2888632d9d4e640284667c7fc SHA256 8f31eed659bcf547d7ae790fcf6cb070f55304074283b9d5f4787a69410d911f
EBUILD sptk-3.5.8.14.ebuild 1812 RMD160 7c8e909f41b9720d4ab43278425a7624c7ed5165 SHA1 b0c6b2d7336510d6667f161d4ca5c8783b729a27 SHA256 87a5401b544961f18f7d3404306001177e1311191db2de4832ca3b31b6036ada
-MISC ChangeLog 9697 RMD160 462375c4b0edbf66d0245c7b75bce5382105c26d SHA1 f67929b08bb0ed85f97e6a237e6cb1b24a931694 SHA256 c2f5e28cc3422ddcab4745810f5622f309230479af6b9c6877e05226941eacd3
+MISC ChangeLog 9872 RMD160 b5110bf14dbefeb2e55cad3b36d3881c108cfe31 SHA1 3906562b746a9bf9863c102a4eb0ca704c5844f3 SHA256 6cd40a7da58fd28aa0c6dbc5a80bb712bc5b42952a2d133da8e95ed5ea3f3671
MISC metadata.xml 464 RMD160 2ac8ec514dbbee12ae8bd7be1ca0bfc41eb3386c SHA1 ec484dafdab9c4a59d6531021e2f59742b4184c5 SHA256 ad2d2d7f242bc2f8c27bc4733d1c97460b3fe5e7ef52e27f52185b74768c542e
diff --git a/dev-cpp/sptk/files/sptk-3.5.8.14-as-needed.patch b/dev-cpp/sptk/files/sptk-3.5.8.14-as-needed.patch
new file mode 100644
index 000000000000..b69bd0de1338
--- /dev/null
+++ b/dev-cpp/sptk/files/sptk-3.5.8.14-as-needed.patch
@@ -0,0 +1,16 @@
+This causes -lpthread to be added to the end of link list, after
+objects, as opposed to the middle. This way --as-needed linking
+is fixed.
+Thanks Kacper Kowalik <xarthisius.kk@gmail.com>
+
+--- sptk-3.5.8.14.orig/src/CMakeLists.txt 2009-12-13 12:39:36.408351609 +0100
++++ sptk-3.5.8.14/src/CMakeLists.txt 2009-12-13 12:54:14.591539074 +0100
+@@ -23,7 +23,7 @@
+ )
+
+ IF (NOT WIN32)
+- SET_TARGET_PROPERTIES (sputil3 PROPERTIES LINK_FLAGS "-lpthread")
++ TARGET_LINK_LIBRARIES (sputil3 pthread)
+ ENDIF (NOT WIN32)
+
+ IF (NOT NO_EXCEL)
diff --git a/dev-cpp/sptk/sptk-3.5.8.14-r1.ebuild b/dev-cpp/sptk/sptk-3.5.8.14-r1.ebuild
index bb4efd232c09..d0fc3c1890c7 100644
--- a/dev-cpp/sptk/sptk-3.5.8.14-r1.ebuild
+++ b/dev-cpp/sptk/sptk-3.5.8.14-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/sptk/sptk-3.5.8.14-r1.ebuild,v 1.2 2009/09/22 11:00:41 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/sptk/sptk-3.5.8.14-r1.ebuild,v 1.3 2009/12/13 12:09:39 iluxa Exp $
EAPI=1
@@ -32,6 +32,7 @@ CMAKE_IN_SOURCE_BUILD=1
src_unpack() {
unpack ${A}
epatch "${FILESDIR}/sptk-gcc-4.4.patch"
+ epatch "${FILESDIR}/${P}-as-needed.patch"
}
src_compile() {