[gentoo-commits] proj/sci:master commit in: media-gfx/brlcad/files/, media-gfx/brlcad/

["Dongxu Li" <dongxuli2011@gmail.com>]

commit:     020bd97580650a69a090a88ba4fc1f999f70e891
Author:     Dongxu Li <dongxuli2011 <AT> gmail <DOT> com>
AuthorDate: Sat Feb 11 17:14:07 2012 +0000
Commit:     Dongxu Li <dongxuli2011 <AT> gmail <DOT> com>
CommitDate: Sat Feb 11 17:14:07 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=020bd975

media-gfx/brlcad: fixed as-needed filtering

---
 media-gfx/brlcad/ChangeLog                     |    3 +++
 media-gfx/brlcad/brlcad-9999.ebuild            |    2 +-
 media-gfx/brlcad/files/brlcad-9999-cmake.patch |   22 +++++++++++-----------
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/media-gfx/brlcad/ChangeLog b/media-gfx/brlcad/ChangeLog
index a1a1414..a360494 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 6fbcf2a..1f841c2 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 d85af69..17a63d6 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)