From 9de4500c3be100fa29e91016da574e031ca47a1e Mon Sep 17 00:00:00 2001 From: Michael Orlitzky Date: Sat, 9 Apr 2011 18:16:13 -0400 Subject: [PATCH] Fix the --as-needed error with a patch. --- sys-fs/e4rat/Manifest | 3 ++- sys-fs/e4rat/e4rat-0.1.5.ebuild | 11 ++++------- sys-fs/e4rat/files/v0.1.5_as-needed_fix.patch | 9 +++++++++ 3 files changed, 15 insertions(+), 8 deletions(-) create mode 100644 sys-fs/e4rat/files/v0.1.5_as-needed_fix.patch diff --git a/sys-fs/e4rat/Manifest b/sys-fs/e4rat/Manifest index e9ac460..20d8ebc 100644 --- a/sys-fs/e4rat/Manifest +++ b/sys-fs/e4rat/Manifest @@ -1,4 +1,5 @@ AUX cmake_mkdir_violation_fix.patch 309 RMD160 ec3fed01c4cacac153550f1f945d0d318fc76c74 SHA1 169689523adef17eed31e588cef39f1a0a8c8a68 SHA256 2d96ad34945f443e4478578d6c9c4ea1ca8614f4d1a153ecda0d3592aa64a607 +AUX v0.1.5_as-needed_fix.patch 271 RMD160 e37d99bccab52e17db00bda8d0387bc32f9d93fc SHA1 b48e0320d9b54107aead1e420c284c3647b9a971 SHA256 3881ac1d6b77e7032176c4a1365e108cbc45cf80cc88e153984b4693af3d0468 DIST e4rat-0.1.5-src.tar.gz 71129 RMD160 adf4ba1ef754b6c4e918bae4786b849590500b1f SHA1 fe226b9d0cbc726ecc700d31eb9d3343a9fb41d7 SHA256 e382a4b79aebff8a87d9203b18b7eec065ba1982a9b137bd794249061cb65ec8 -EBUILD e4rat-0.1.5.ebuild 690 RMD160 a59364ee5053e4d16ce50c37e8c92d80346e5df1 SHA1 928273a1148a3e7e0e68e8e9dace4959daf4a4b2 SHA256 b7803200454a7c0a7a2e747afce123f68b0721cdd58499555256467933f09c01 +EBUILD e4rat-0.1.5.ebuild 666 RMD160 ac36bf5eaec60074841f4a5096dce1871aab6fca SHA1 f7232cb93bdbace03dadc947c90623f30c2691c7 SHA256 0d5047cb5a9ab7a0be8bb21a8785824c876b9e228c7d6d2f87d4f38d0298141e MISC metadata.xml 241 RMD160 d1bcf027ff9f0cf1953659be5b89b59522c6f063 SHA1 7dff00c0281f5ed66259645e76b04e8ab0241a77 SHA256 fb616eb93c0779c7c5dbf3b445656fb1636d6668443155cb95a8325cd988500f diff --git a/sys-fs/e4rat/e4rat-0.1.5.ebuild b/sys-fs/e4rat/e4rat-0.1.5.ebuild index 8ca63a8..abe299b 100644 --- a/sys-fs/e4rat/e4rat-0.1.5.ebuild +++ b/sys-fs/e4rat/e4rat-0.1.5.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: $ -inherit cmake-utils flag-o-matic +inherit cmake-utils DESCRIPTION="Toolset to accelerate the boot process and application startup" HOMEPAGE="http://e4rat.sourceforge.net/" @@ -20,13 +20,10 @@ DEPEND="dev-lang/perl RDEPEND="${DEPEND}" +CMAKE_BUILD_TYPE=release CMAKE_IN_SOURCE_BUILD=1 -PATCHES=( "${FILESDIR}/cmake_mkdir_violation_fix.patch" ) - -src_compile() { - filter-ldflags "-Wl,--as-needed" - cmake-utils_src_compile -} +PATCHES=( "${FILESDIR}/cmake_mkdir_violation_fix.patch" + "${FILESDIR}/v0.1.5_as-needed_fix.patch" ) pkg_preinst() { dodir /var/lib/e4rat diff --git a/sys-fs/e4rat/files/v0.1.5_as-needed_fix.patch b/sys-fs/e4rat/files/v0.1.5_as-needed_fix.patch new file mode 100644 index 0000000..3ab2ebc --- /dev/null +++ b/sys-fs/e4rat/files/v0.1.5_as-needed_fix.patch @@ -0,0 +1,9 @@ +--- a/src/CMakeLists.txt 2011-04-01 05:19:13.000000000 -0400 ++++ b/src/CMakeLists.txt 2011-04-09 18:09:18.955994952 -0400 +@@ -129,2 +129,6 @@ + ARCHIVE DESTINATION "lib") + ++ ++target_link_libraries(${PROJECT_NAME}-core ++ ${${PROJECT_NAME}_LIBRARIES} ++ ) -- 2.43.2