diff options
| author |   Sebastien Fabbro <bicatali@gentoo.org> | 2012-08-04 20:51:03 +0000 |
|---|---|---|
| committer | Sebastien Fabbro <bicatali@gentoo.org> | 2012-08-04 20:51:03 +0000 |
| commit | 6f8f40633e9f83f71d667bc6b1dec0e58882c54a (patch) | |
| tree | b5cbf426e5a07daf58656401e8c5ce6bbc9671d3 /sci-libs/shogun/files | |
| parent | Stable for x86, wrt bug #418801 (diff) | |
| download | gentoo-2-6f8f40633e9f83f71d667bc6b1dec0e58882c54a.tar.gz gentoo-2-6f8f40633e9f83f71d667bc6b1dec0e58882c54a.tar.bz2 gentoo-2-6f8f40633e9f83f71d667bc6b1dec0e58882c54a.zip | |
Fixed for R as-needed and for prefix
(Portage version: 2.2.01.20796-prefix/cvs/Linux x86_64)
Diffstat (limited to 'sci-libs/shogun/files')
| -rw-r--r-- | sci-libs/shogun/files/shogun-1.1.0-as-needed.patch | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/sci-libs/shogun/files/shogun-1.1.0-as-needed.patch b/sci-libs/shogun/files/shogun-1.1.0-as-needed.patch new file mode 100644 index 000000000000..5d365472c2ce --- /dev/null +++ b/sci-libs/shogun/files/shogun-1.1.0-as-needed.patch @@ -0,0 +1,48 @@ +diff -Nur src.orig/configure src/configure +--- src.orig/configure 2012-08-04 12:58:58.230092977 -0700 ++++ src/configure 2012-08-04 13:30:14.441859756 -0700 +@@ -4470,7 +4470,8 @@ + COMPFLAGS_C_R="$COMPFLAGS_C_R `R CMD config CPICFLAGS`" + COMPFLAGS_CPP_R="$COMPFLAGS_CPP_R `R CMD config CXXPICFLAGS`" + INCLUDES_R="$INCLUDES_R `R CMD config --cppflags`" +- LINKFLAGS_R="$LINKFLAGS_R `R CMD config --ldflags` `R CMD config DYLIB_LDFLAGS`" ++ PRELINKFLAGS_R="$PRELINKFLAGS_R `R CMD config DYLIB_LDFLAGS`" ++ LINKFLAGS_R="$LINKFLAGS_R `R CMD config --ldflags`" + fi + + +diff -Nur src.orig/Makefile.template src/Makefile.template +--- src.orig/Makefile.template 2012-08-04 12:58:58.229092986 -0700 ++++ src/Makefile.template 2012-08-04 13:00:21.340525955 -0700 +@@ -515,7 +515,7 @@ + else + $(TEMPLATE_TARGET): .depend $(OBJFILES) $(SRCFILES) $(HEADERFILES) $(OTHERDEPS) + $(LINK) $(PRELINKFLAGS) $(shell find $(SRCDIR) -name "*.$(EXT_OBJ_CPP)" -o \ +- -name "*.$(EXT_OBJ_C)" 2>/dev/null) $(LINKFLAGS) -o $@ $(POSTLINKFLAGS) ++ -name "*.$(EXT_OBJ_C)" 2>/dev/null) $(LINKFLAGS) $(POSTLINKFLAGS) -o $@ + @$(POSTLINKCMD) $@ + @$(LIBSYMLINKCMD) + endif +@@ -530,18 +530,18 @@ + ($(LIBRARY_PATH)=$(CONFIGPATH)/../shogun R --no-save) + + $(PRE_LIB_SWIG_TEMPLATE)%${EXT_LIB_SWIG_TEMPLATE}: %$(EXT_OBJ_SWIG) +- $(LINK) $(LINKFLAGS) -o $@ $^ $(POSTLINKFLAGS) ++ $(LINK) $(LINKFLAGS) $^ $(POSTLINKFLAGS) -o $@ + + %${EXT_OBJ_SWIG}: %$(EXT_SRC_SWIG) +- $(COMP_CPP) $(COMPFLAGS_SWIG_CPP) $(DEFINES) -c $(INCLUDES) -o $@ $< ++ $(COMP_CPP) $(COMPFLAGS_SWIG_CPP) $(DEFINES) -c $(INCLUDES) $< -o $@ + + %.$(EXT_OBJ_CPP): %.$(EXT_SRC_CPP) +- $(COMP_CPP) $(COMPFLAGS_CPP) $(DEFINES) -c $(INCLUDES) -o $@ $< ++ $(COMP_CPP) $(COMPFLAGS_CPP) $(DEFINES) -c $(INCLUDES) $< -o $@ + @test -f $*.$(EXT_CPP_TMP) && test "$(SRCDIR)" != "." \ + && rm -f $< || true + + %.$(EXT_OBJ_C): %.$(EXT_SRC_C) +- $(COMP_C) $(COMPFLAGS_C) $(DEFINES) -c $(INCLUDES) -o $@ $< ++ $(COMP_C) $(COMPFLAGS_C) $(DEFINES) -c $(INCLUDES) $< -o $@ + + %.$(EXT_SRC_CPP): %.$(EXT_CPP_TMP) %.$(EXT_CPP_SH) $(HEADERFILES) + @echo "generating $@ from $*.$(EXT_CPP_TMP) by running $*.$(EXT_CPP_SH)" |