1 |
commit: 020bd97580650a69a090a88ba4fc1f999f70e891 |
2 |
Author: Dongxu Li <dongxuli2011 <AT> gmail <DOT> com> |
3 |
AuthorDate: Sat Feb 11 17:14:07 2012 +0000 |
4 |
Commit: Dongxu Li <dongxuli2011 <AT> gmail <DOT> com> |
5 |
CommitDate: Sat Feb 11 17:14:07 2012 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=020bd975 |
7 |
|
8 |
media-gfx/brlcad: fixed as-needed filtering |
9 |
|
10 |
--- |
11 |
media-gfx/brlcad/ChangeLog | 3 +++ |
12 |
media-gfx/brlcad/brlcad-9999.ebuild | 2 +- |
13 |
media-gfx/brlcad/files/brlcad-9999-cmake.patch | 22 +++++++++++----------- |
14 |
3 files changed, 15 insertions(+), 12 deletions(-) |
15 |
|
16 |
diff --git a/media-gfx/brlcad/ChangeLog b/media-gfx/brlcad/ChangeLog |
17 |
index a1a1414..a360494 100644 |
18 |
--- a/media-gfx/brlcad/ChangeLog |
19 |
+++ b/media-gfx/brlcad/ChangeLog |
20 |
@@ -4,6 +4,9 @@ |
21 |
|
22 |
*brlcad-7.20.2 (15 Jul 2011) |
23 |
|
24 |
+ 11 Feb 2012; Dongxu Li <dongxuli2011@×××××.com> brlcad-9999.ebuild: |
25 |
+ Fixed building error |
26 |
+ |
27 |
5 Feb 2012; Dongxu Li <dongxuli2011@×××××.com> brlcad-9999.ebuild: |
28 |
Use system libraries |
29 |
|
30 |
|
31 |
diff --git a/media-gfx/brlcad/brlcad-9999.ebuild b/media-gfx/brlcad/brlcad-9999.ebuild |
32 |
index 6fbcf2a..1f841c2 100644 |
33 |
--- a/media-gfx/brlcad/brlcad-9999.ebuild |
34 |
+++ b/media-gfx/brlcad/brlcad-9999.ebuild |
35 |
@@ -50,7 +50,7 @@ src_prepare() { |
36 |
|
37 |
src_configure() { |
38 |
filter-flags -std=c++0x |
39 |
-filter-ldflags -Wl,--as-needed |
40 |
+ append-ldflags $(no-as-needed) |
41 |
if use Debug; then |
42 |
CMAKE_BUILD_TYPE=Debug |
43 |
else |
44 |
|
45 |
diff --git a/media-gfx/brlcad/files/brlcad-9999-cmake.patch b/media-gfx/brlcad/files/brlcad-9999-cmake.patch |
46 |
index d85af69..17a63d6 100644 |
47 |
--- a/media-gfx/brlcad/files/brlcad-9999-cmake.patch |
48 |
+++ b/media-gfx/brlcad/files/brlcad-9999-cmake.patch |
49 |
@@ -1,11 +1,11 @@ |
50 |
---- a/CMakeLists.txt 2011-08-09 16:41:03.073611709 -0400 |
51 |
-+++ b/CMakeLists.txt 2011-08-09 16:41:22.943844346 -0400 |
52 |
-@@ -1221,7 +1221,7 @@ |
53 |
- ENDFOREACH() |
54 |
- FOREACH(path_label ${PATH_LABELS}) |
55 |
- SET(CURRENT_LABEL ${${path_label}_LABEL}) |
56 |
-- STRING(LENGTH ${CURRENT_LABEL} CURRENT_LENGTH) |
57 |
-+ STRING(LENGTH "${CURRENT_LABEL}" CURRENT_LENGTH) |
58 |
- WHILE(${PATH_LABEL_LENGTH} GREATER ${CURRENT_LENGTH}) |
59 |
- SET(CURRENT_LABEL " ${CURRENT_LABEL}") |
60 |
- STRING(LENGTH "${CURRENT_LABEL}" CURRENT_LENGTH) |
61 |
+--- brlcad-9999/CMakeLists.txt 2012-02-11 11:37:28.287828624 -0500 |
62 |
++++ brlcad-9999/CMakeLists.txt 2012-02-11 11:37:54.018158044 -0500 |
63 |
+@@ -1586,7 +1586,7 @@ |
64 |
+ endforeach() |
65 |
+ foreach(path_label ${PATH_LABELS}) |
66 |
+ set(CURRENT_LABEL ${${path_label}_LABEL}) |
67 |
+- string(LENGTH ${CURRENT_LABEL} CURRENT_LENGTH) |
68 |
++ string(LENGTH "${CURRENT_LABEL}" CURRENT_LENGTH) |
69 |
+ while(${PATH_LABEL_LENGTH} GREATER ${CURRENT_LENGTH}) |
70 |
+ set(CURRENT_LABEL " ${CURRENT_LABEL}") |
71 |
+ string(LENGTH "${CURRENT_LABEL}" CURRENT_LENGTH) |