summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Mair-Keimberger (asterix) <m.mairkeimberger@gmail.com>2017-01-29 10:16:24 +0100
committerDavid Seifert <soap@gentoo.org>2017-01-29 21:09:39 +0100
commit2cb98b6f61cb32a08fc71ac8c3f4a1ee37f03180 (patch)
tree4db72669fc47071076ff176b7388a37410bec8ee /sci-libs/shogun
parentsci-libs/punc: remove unused patches (diff)
downloadgentoo-2cb98b6f61cb32a08fc71ac8c3f4a1ee37f03180.tar.gz
gentoo-2cb98b6f61cb32a08fc71ac8c3f4a1ee37f03180.tar.bz2
gentoo-2cb98b6f61cb32a08fc71ac8c3f4a1ee37f03180.zip
sci-libs/shogun: remove unused patches
Closes: https://github.com/gentoo/gentoo/pull/3709
Diffstat (limited to 'sci-libs/shogun')
-rw-r--r--sci-libs/shogun/files/shogun-1.1.0-as-needed.patch48
-rw-r--r--sci-libs/shogun/files/shogun-1.1.0-respect-ldflags.patch12
-rw-r--r--sci-libs/shogun/files/shogun-1.1.0-test-readline.patch11
-rw-r--r--sci-libs/shogun/files/shogun-1.1.0-test-snappy.patch13
-rw-r--r--sci-libs/shogun/files/shogun-3.2.0-atlas.patch22
5 files changed, 0 insertions, 106 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
deleted file mode 100644
index 5d365472c2ce..000000000000
--- a/sci-libs/shogun/files/shogun-1.1.0-as-needed.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-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)"
diff --git a/sci-libs/shogun/files/shogun-1.1.0-respect-ldflags.patch b/sci-libs/shogun/files/shogun-1.1.0-respect-ldflags.patch
deleted file mode 100644
index 60753606cdb8..000000000000
--- a/sci-libs/shogun/files/shogun-1.1.0-respect-ldflags.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur src.orig/configure src/configure
---- src.orig/configure 2012-06-12 00:57:14.000000000 +0100
-+++ src/configure 2012-06-12 18:13:26.000000000 +0100
-@@ -164,7 +164,7 @@
- DEFINES="-DSWIG_TYPE_TABLE=shogun -DSHOGUN"
- DEFINES_SWIG=
- PRELINKFLAGS=
--LINKFLAGS=
-+LINKFLAGS="$LDFLAGS -lpthread"
- POSTLINKFLAGS=
-
- INCLUDES_STATIC_INTERFACES=
diff --git a/sci-libs/shogun/files/shogun-1.1.0-test-readline.patch b/sci-libs/shogun/files/shogun-1.1.0-test-readline.patch
deleted file mode 100644
index 90a18b7efa14..000000000000
--- a/sci-libs/shogun/files/shogun-1.1.0-test-readline.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Nur src.orig/configure src/configure
---- src.orig/configure 2012-06-12 00:57:14.000000000 +0100
-+++ src/configure 2012-06-12 18:19:56.000000000 +0100
-@@ -4598,6 +4598,7 @@
- if test "$_readline" = yes || test "$_readline" = auto;
- then
- cat > $TMPC << EOF
-+#include <stdio.h>
- #include <readline/readline.h>
- int main(void) { return 0; }
- EOF
diff --git a/sci-libs/shogun/files/shogun-1.1.0-test-snappy.patch b/sci-libs/shogun/files/shogun-1.1.0-test-snappy.patch
deleted file mode 100644
index 5d112d861b71..000000000000
--- a/sci-libs/shogun/files/shogun-1.1.0-test-snappy.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Nur src.orig/configure src/configure
---- src.orig/configure 2012-06-12 00:57:14.000000000 +0100
-+++ src/configure 2012-06-12 18:03:33.000000000 +0100
-@@ -3512,7 +3512,8 @@
- size_t input_length = (size_t) argc;
- char* output = new char[snappy::MaxCompressedLength(input_length)];
- size_t output_length;
-- RawCompress(input, input_length, output, &output_length);
-+ char *input;
-+ snappy::RawCompress(input, input_length, output, &output_length);
- delete [] output;
- return int(output_length);
- }
diff --git a/sci-libs/shogun/files/shogun-3.2.0-atlas.patch b/sci-libs/shogun/files/shogun-3.2.0-atlas.patch
deleted file mode 100644
index a4f5e1c77d77..000000000000
--- a/sci-libs/shogun/files/shogun-3.2.0-atlas.patch
+++ /dev/null
@@ -1,22 +0,0 @@
- cmake/FindAtlas.cmake | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/cmake/FindAtlas.cmake b/cmake/FindAtlas.cmake
-index 13f092d..8c2dd2f 100644
---- a/cmake/FindAtlas.cmake
-+++ b/cmake/FindAtlas.cmake
-@@ -20,10 +20,10 @@ if(ATLAS_LAPACK)
- endif()
- unset(CMAKE_REQUIRED_LIBRARIES CACHE)
- else()
-- find_file(ATLAS_LAPACK liblapack.so.3 PATHS /usr/lib/atlas /usr/lib64/atlas)
-- find_library(ATLAS_LAPACK NAMES lapack)
-- set(CMAKE_REQUIRED_LIBRARIES ${LAPACK_LIBRARIES} ${ATLAS_CBLAS})
-- check_library_exists("${ATLAS_LAPACK}" clapack_dpotrf "" FOUND_CLAPACK)
-+ # find_file(ATLAS_LAPACK liblapack.so.3 PATHS /usr/lib/atlas /usr/lib64/atlas)
-+ # find_library(ATLAS_LAPACK NAMES lapack)
-+ # set(CMAKE_REQUIRED_LIBRARIES ${LAPACK_LIBRARIES} ${ATLAS_CBLAS})
-+ check_library_exists("${ATLAS_LIBRARIES}" clapack_dpotrf "" FOUND_CLAPACK)
- if(NOT FOUND_CLAPACK)
- unset(ATLAS_LAPACK CACHE)
- endif()