[gentoo-commits] gentoo-x86 commit in sci-libs/gamer/files: 1.5-underlinking.patch

[gentoo-commits] gentoo-x86 commit in sci-libs/gamer/files: 1.5-underlinking.patch

[Justin Lecher (jlec)]

jlec        12/05/30 12:41:45

  Added:                1.5-underlinking.patch
  Log:
  sci-libs/gamer: Fix underlinking
  
  (Portage version: 2.2.0_alpha108/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  sci-libs/gamer/files/1.5-underlinking.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/gamer/files/1.5-underlinking.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/gamer/files/1.5-underlinking.patch?rev=1.1&content-type=text/plain

Index: 1.5-underlinking.patch
===================================================================
diff --git a/src/aaa_lib/Makefile.am b/src/aaa_lib/Makefile.am
index de1d7c3..b2420c8 100644
--- a/src/aaa_lib/Makefile.am
+++ b/src/aaa_lib/Makefile.am
@@ -35,18 +35,17 @@ LIBTETGEN   = libtetgen.la
 #LIBTETGEN   = 
 #endif
 
-libdir = ${prefix}/lib
 lib_LTLIBRARIES = libgamer.la ${LIBTRIANGLE} ${LIBTETGEN}
 
 libgamer_la_SOURCES = 
-libgamer_la_LIBADD  = ${BASE_LIBS} ${BIOM_LIBS}
+libgamer_la_LIBADD  = ${BASE_LIBS} ${BIOM_LIBS} -lm -lstdc++ ${LIBTETGEN}
 libgamer_la_LDFLAGS = -version-info ${FETK_VERSION}
 
 libtriangle_la_SOURCES = 
-libtriangle_la_LIBADD  = ${TRIANGLE_LIBS}
+libtriangle_la_LIBADD  = ${TRIANGLE_LIBS} -lm
 libtriangle_la_LDFLAGS = -version-info ${FETK_VERSION}
 
 libtetgen_la_SOURCES = 
-libtetgen_la_LIBADD  = ${TETGEN_LIBS}
+libtetgen_la_LIBADD  = ${TETGEN_LIBS} -lm -lstdc++
 libtetgen_la_LDFLAGS = -version-info ${FETK_VERSION}
 

[gentoo-commits] gentoo-x86 commit in sci-libs/gamer/files: 1.5-underlinking.patch

[Justin Lecher (jlec)]

jlec        12/06/19 11:19:42

  Modified:             1.5-underlinking.patch
  Log:
  sci-libs/gamer: Fix relink problems of libtool, #421749
  
  (Portage version: 2.2.0_alpha110/cvs/Linux x86_64)

Revision  Changes    Path
1.2                  sci-libs/gamer/files/1.5-underlinking.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/gamer/files/1.5-underlinking.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/gamer/files/1.5-underlinking.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/gamer/files/1.5-underlinking.patch?r1=1.1&r2=1.2

Index: 1.5-underlinking.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/gamer/files/1.5-underlinking.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 1.5-underlinking.patch	30 May 2012 12:41:45 -0000	1.1
+++ 1.5-underlinking.patch	19 Jun 2012 11:19:42 -0000	1.2
@@ -1,10 +1,26 @@
+ src/aaa_lib/Makefile.am |   17 +++--------------
+ 1 files changed, 3 insertions(+), 14 deletions(-)
+
 diff --git a/src/aaa_lib/Makefile.am b/src/aaa_lib/Makefile.am
-index de1d7c3..b2420c8 100644
+index de1d7c3..83e2e5c 100644
 --- a/src/aaa_lib/Makefile.am
 +++ b/src/aaa_lib/Makefile.am
-@@ -35,18 +35,17 @@ LIBTETGEN   = libtetgen.la
- #LIBTETGEN   = 
- #endif
+@@ -22,31 +22,20 @@ BASE_LIBS   = ../base/libbase.la
+ BIOM_LIBS   = ../biom/libbiom.la
+ 
+ TRIANGLE_LIBS = ../triangle/libtriangle.la
+-#if BUILD_TRIANGLE
+-LIBTRIANGLE   = libtriangle.la
+-#else
+-#LIBTRIANGLE   = 
+-#endif
+ 
+ TETGEN_LIBS = ../tetgen/libtetgen.la
+-#if BUILD_TETGEN
+-LIBTETGEN   = libtetgen.la
+-#else
+-#LIBTETGEN   = 
+-#endif
  
 -libdir = ${prefix}/lib
  lib_LTLIBRARIES = libgamer.la ${LIBTRIANGLE} ${LIBTETGEN}