aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDongxu Li <dongxuli2011@gmail.com>2012-02-11 12:14:07 -0500
committerDongxu Li <dongxuli2011@gmail.com>2012-02-11 12:14:07 -0500
commit020bd97580650a69a090a88ba4fc1f999f70e891 (patch)
treeb18f2efe946fd33febdf022cb8f698c2c6f78aa2 /media-gfx
parent[dev-cpp/eigen] version bump. (diff)
downloadsci-020bd97580650a69a090a88ba4fc1f999f70e891.tar.gz
sci-020bd97580650a69a090a88ba4fc1f999f70e891.tar.bz2
sci-020bd97580650a69a090a88ba4fc1f999f70e891.zip
media-gfx/brlcad: fixed as-needed filtering
Diffstat (limited to 'media-gfx')
-rw-r--r--media-gfx/brlcad/ChangeLog3
-rw-r--r--media-gfx/brlcad/brlcad-9999.ebuild2
-rw-r--r--media-gfx/brlcad/files/brlcad-9999-cmake.patch22
3 files changed, 15 insertions, 12 deletions
diff --git a/media-gfx/brlcad/ChangeLog b/media-gfx/brlcad/ChangeLog
index a1a141439..a360494c6 100644
--- a/media-gfx/brlcad/ChangeLog
+++ b/media-gfx/brlcad/ChangeLog
@@ -4,6 +4,9 @@
*brlcad-7.20.2 (15 Jul 2011)
+ 11 Feb 2012; Dongxu Li <dongxuli2011@gmail.com> brlcad-9999.ebuild:
+ Fixed building error
+
5 Feb 2012; Dongxu Li <dongxuli2011@gmail.com> brlcad-9999.ebuild:
Use system libraries
diff --git a/media-gfx/brlcad/brlcad-9999.ebuild b/media-gfx/brlcad/brlcad-9999.ebuild
index 6fbcf2a32..1f841c261 100644
--- a/media-gfx/brlcad/brlcad-9999.ebuild
+++ b/media-gfx/brlcad/brlcad-9999.ebuild
@@ -50,7 +50,7 @@ src_prepare() {
src_configure() {
filter-flags -std=c++0x
-filter-ldflags -Wl,--as-needed
+ append-ldflags $(no-as-needed)
if use Debug; then
CMAKE_BUILD_TYPE=Debug
else
diff --git a/media-gfx/brlcad/files/brlcad-9999-cmake.patch b/media-gfx/brlcad/files/brlcad-9999-cmake.patch
index d85af6954..17a63d633 100644
--- a/media-gfx/brlcad/files/brlcad-9999-cmake.patch
+++ b/media-gfx/brlcad/files/brlcad-9999-cmake.patch
@@ -1,11 +1,11 @@
---- a/CMakeLists.txt 2011-08-09 16:41:03.073611709 -0400
-+++ b/CMakeLists.txt 2011-08-09 16:41:22.943844346 -0400
-@@ -1221,7 +1221,7 @@
- ENDFOREACH()
- FOREACH(path_label ${PATH_LABELS})
- SET(CURRENT_LABEL ${${path_label}_LABEL})
-- STRING(LENGTH ${CURRENT_LABEL} CURRENT_LENGTH)
-+ STRING(LENGTH "${CURRENT_LABEL}" CURRENT_LENGTH)
- WHILE(${PATH_LABEL_LENGTH} GREATER ${CURRENT_LENGTH})
- SET(CURRENT_LABEL " ${CURRENT_LABEL}")
- STRING(LENGTH "${CURRENT_LABEL}" CURRENT_LENGTH)
+--- brlcad-9999/CMakeLists.txt 2012-02-11 11:37:28.287828624 -0500
++++ brlcad-9999/CMakeLists.txt 2012-02-11 11:37:54.018158044 -0500
+@@ -1586,7 +1586,7 @@
+ endforeach()
+ foreach(path_label ${PATH_LABELS})
+ set(CURRENT_LABEL ${${path_label}_LABEL})
+- string(LENGTH ${CURRENT_LABEL} CURRENT_LENGTH)
++ string(LENGTH "${CURRENT_LABEL}" CURRENT_LENGTH)
+ while(${PATH_LABEL_LENGTH} GREATER ${CURRENT_LENGTH})
+ set(CURRENT_LABEL " ${CURRENT_LABEL}")
+ string(LENGTH "${CURRENT_LABEL}" CURRENT_LENGTH)