Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/shogun/files/
Date: Sun, 29 Jan 2017 20:11:47
Message-Id: 1485720579.2cb98b6f61cb32a08fc71ac8c3f4a1ee37f03180.soap@gentoo
1 commit: 2cb98b6f61cb32a08fc71ac8c3f4a1ee37f03180
2 Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Sun Jan 29 09:16:24 2017 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Sun Jan 29 20:09:39 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2cb98b6f
7
8 sci-libs/shogun: remove unused patches
9
10 Closes: https://github.com/gentoo/gentoo/pull/3709
11
12 sci-libs/shogun/files/shogun-1.1.0-as-needed.patch | 48 ----------------------
13 .../files/shogun-1.1.0-respect-ldflags.patch | 12 ------
14 .../shogun/files/shogun-1.1.0-test-readline.patch | 11 -----
15 .../shogun/files/shogun-1.1.0-test-snappy.patch | 13 ------
16 sci-libs/shogun/files/shogun-3.2.0-atlas.patch | 22 ----------
17 5 files changed, 106 deletions(-)
18
19 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
20 deleted file mode 100644
21 index 5d36547..00000000
22 --- a/sci-libs/shogun/files/shogun-1.1.0-as-needed.patch
23 +++ /dev/null
24 @@ -1,48 +0,0 @@
25 -diff -Nur src.orig/configure src/configure
26 ---- src.orig/configure 2012-08-04 12:58:58.230092977 -0700
27 -+++ src/configure 2012-08-04 13:30:14.441859756 -0700
28 -@@ -4470,7 +4470,8 @@
29 - COMPFLAGS_C_R="$COMPFLAGS_C_R `R CMD config CPICFLAGS`"
30 - COMPFLAGS_CPP_R="$COMPFLAGS_CPP_R `R CMD config CXXPICFLAGS`"
31 - INCLUDES_R="$INCLUDES_R `R CMD config --cppflags`"
32 -- LINKFLAGS_R="$LINKFLAGS_R `R CMD config --ldflags` `R CMD config DYLIB_LDFLAGS`"
33 -+ PRELINKFLAGS_R="$PRELINKFLAGS_R `R CMD config DYLIB_LDFLAGS`"
34 -+ LINKFLAGS_R="$LINKFLAGS_R `R CMD config --ldflags`"
35 - fi
36 -
37 -
38 -diff -Nur src.orig/Makefile.template src/Makefile.template
39 ---- src.orig/Makefile.template 2012-08-04 12:58:58.229092986 -0700
40 -+++ src/Makefile.template 2012-08-04 13:00:21.340525955 -0700
41 -@@ -515,7 +515,7 @@
42 - else
43 - $(TEMPLATE_TARGET): .depend $(OBJFILES) $(SRCFILES) $(HEADERFILES) $(OTHERDEPS)
44 - $(LINK) $(PRELINKFLAGS) $(shell find $(SRCDIR) -name "*.$(EXT_OBJ_CPP)" -o \
45 -- -name "*.$(EXT_OBJ_C)" 2>/dev/null) $(LINKFLAGS) -o $@ $(POSTLINKFLAGS)
46 -+ -name "*.$(EXT_OBJ_C)" 2>/dev/null) $(LINKFLAGS) $(POSTLINKFLAGS) -o $@
47 - @$(POSTLINKCMD) $@
48 - @$(LIBSYMLINKCMD)
49 - endif
50 -@@ -530,18 +530,18 @@
51 - ($(LIBRARY_PATH)=$(CONFIGPATH)/../shogun R --no-save)
52 -
53 - $(PRE_LIB_SWIG_TEMPLATE)%${EXT_LIB_SWIG_TEMPLATE}: %$(EXT_OBJ_SWIG)
54 -- $(LINK) $(LINKFLAGS) -o $@ $^ $(POSTLINKFLAGS)
55 -+ $(LINK) $(LINKFLAGS) $^ $(POSTLINKFLAGS) -o $@
56 -
57 - %${EXT_OBJ_SWIG}: %$(EXT_SRC_SWIG)
58 -- $(COMP_CPP) $(COMPFLAGS_SWIG_CPP) $(DEFINES) -c $(INCLUDES) -o $@ $<
59 -+ $(COMP_CPP) $(COMPFLAGS_SWIG_CPP) $(DEFINES) -c $(INCLUDES) $< -o $@
60 -
61 - %.$(EXT_OBJ_CPP): %.$(EXT_SRC_CPP)
62 -- $(COMP_CPP) $(COMPFLAGS_CPP) $(DEFINES) -c $(INCLUDES) -o $@ $<
63 -+ $(COMP_CPP) $(COMPFLAGS_CPP) $(DEFINES) -c $(INCLUDES) $< -o $@
64 - @test -f $*.$(EXT_CPP_TMP) && test "$(SRCDIR)" != "." \
65 - && rm -f $< || true
66 -
67 - %.$(EXT_OBJ_C): %.$(EXT_SRC_C)
68 -- $(COMP_C) $(COMPFLAGS_C) $(DEFINES) -c $(INCLUDES) -o $@ $<
69 -+ $(COMP_C) $(COMPFLAGS_C) $(DEFINES) -c $(INCLUDES) $< -o $@
70 -
71 - %.$(EXT_SRC_CPP): %.$(EXT_CPP_TMP) %.$(EXT_CPP_SH) $(HEADERFILES)
72 - @echo "generating $@ from $*.$(EXT_CPP_TMP) by running $*.$(EXT_CPP_SH)"
73
74 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
75 deleted file mode 100644
76 index 6075360..00000000
77 --- a/sci-libs/shogun/files/shogun-1.1.0-respect-ldflags.patch
78 +++ /dev/null
79 @@ -1,12 +0,0 @@
80 -diff -Nur src.orig/configure src/configure
81 ---- src.orig/configure 2012-06-12 00:57:14.000000000 +0100
82 -+++ src/configure 2012-06-12 18:13:26.000000000 +0100
83 -@@ -164,7 +164,7 @@
84 - DEFINES="-DSWIG_TYPE_TABLE=shogun -DSHOGUN"
85 - DEFINES_SWIG=
86 - PRELINKFLAGS=
87 --LINKFLAGS=
88 -+LINKFLAGS="$LDFLAGS -lpthread"
89 - POSTLINKFLAGS=
90 -
91 - INCLUDES_STATIC_INTERFACES=
92
93 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
94 deleted file mode 100644
95 index 90a18b7..00000000
96 --- a/sci-libs/shogun/files/shogun-1.1.0-test-readline.patch
97 +++ /dev/null
98 @@ -1,11 +0,0 @@
99 -diff -Nur src.orig/configure src/configure
100 ---- src.orig/configure 2012-06-12 00:57:14.000000000 +0100
101 -+++ src/configure 2012-06-12 18:19:56.000000000 +0100
102 -@@ -4598,6 +4598,7 @@
103 - if test "$_readline" = yes || test "$_readline" = auto;
104 - then
105 - cat > $TMPC << EOF
106 -+#include <stdio.h>
107 - #include <readline/readline.h>
108 - int main(void) { return 0; }
109 - EOF
110
111 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
112 deleted file mode 100644
113 index 5d112d8..00000000
114 --- a/sci-libs/shogun/files/shogun-1.1.0-test-snappy.patch
115 +++ /dev/null
116 @@ -1,13 +0,0 @@
117 -diff -Nur src.orig/configure src/configure
118 ---- src.orig/configure 2012-06-12 00:57:14.000000000 +0100
119 -+++ src/configure 2012-06-12 18:03:33.000000000 +0100
120 -@@ -3512,7 +3512,8 @@
121 - size_t input_length = (size_t) argc;
122 - char* output = new char[snappy::MaxCompressedLength(input_length)];
123 - size_t output_length;
124 -- RawCompress(input, input_length, output, &output_length);
125 -+ char *input;
126 -+ snappy::RawCompress(input, input_length, output, &output_length);
127 - delete [] output;
128 - return int(output_length);
129 - }
130
131 diff --git a/sci-libs/shogun/files/shogun-3.2.0-atlas.patch b/sci-libs/shogun/files/shogun-3.2.0-atlas.patch
132 deleted file mode 100644
133 index a4f5e1c..00000000
134 --- a/sci-libs/shogun/files/shogun-3.2.0-atlas.patch
135 +++ /dev/null
136 @@ -1,22 +0,0 @@
137 - cmake/FindAtlas.cmake | 8 ++++----
138 - 1 file changed, 4 insertions(+), 4 deletions(-)
139 -
140 -diff --git a/cmake/FindAtlas.cmake b/cmake/FindAtlas.cmake
141 -index 13f092d..8c2dd2f 100644
142 ---- a/cmake/FindAtlas.cmake
143 -+++ b/cmake/FindAtlas.cmake
144 -@@ -20,10 +20,10 @@ if(ATLAS_LAPACK)
145 - endif()
146 - unset(CMAKE_REQUIRED_LIBRARIES CACHE)
147 - else()
148 -- find_file(ATLAS_LAPACK liblapack.so.3 PATHS /usr/lib/atlas /usr/lib64/atlas)
149 -- find_library(ATLAS_LAPACK NAMES lapack)
150 -- set(CMAKE_REQUIRED_LIBRARIES ${LAPACK_LIBRARIES} ${ATLAS_CBLAS})
151 -- check_library_exists("${ATLAS_LAPACK}" clapack_dpotrf "" FOUND_CLAPACK)
152 -+ # find_file(ATLAS_LAPACK liblapack.so.3 PATHS /usr/lib/atlas /usr/lib64/atlas)
153 -+ # find_library(ATLAS_LAPACK NAMES lapack)
154 -+ # set(CMAKE_REQUIRED_LIBRARIES ${LAPACK_LIBRARIES} ${ATLAS_CBLAS})
155 -+ check_library_exists("${ATLAS_LIBRARIES}" clapack_dpotrf "" FOUND_CLAPACK)
156 - if(NOT FOUND_CLAPACK)
157 - unset(ATLAS_LAPACK CACHE)
158 - endif()
Report Message
Find on MARC Find on Google Groups