| 1 |
commit: c8a77fa2a4b099aeb15035e9fedc5d0353adc17d |
| 2 |
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sat Aug 19 13:08:49 2017 +0000 |
| 4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Sep 2 14:46:03 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8a77fa2 |
| 7 |
|
| 8 |
dev-util/open-vcdiff: remove unused patch |
| 9 |
|
| 10 |
dev-util/open-vcdiff/files/0.8.3-system-libs.patch | 215 --------------------- |
| 11 |
1 file changed, 215 deletions(-) |
| 12 |
|
| 13 |
diff --git a/dev-util/open-vcdiff/files/0.8.3-system-libs.patch b/dev-util/open-vcdiff/files/0.8.3-system-libs.patch |
| 14 |
deleted file mode 100644 |
| 15 |
index 508f30379b2..00000000000 |
| 16 |
--- a/dev-util/open-vcdiff/files/0.8.3-system-libs.patch |
| 17 |
+++ /dev/null |
| 18 |
@@ -1,215 +0,0 @@ |
| 19 |
-Unbundle the following libraries: |
| 20 |
-gflags |
| 21 |
-gtest |
| 22 |
-zlib |
| 23 |
- |
| 24 |
-Index: configure.ac |
| 25 |
-=================================================================== |
| 26 |
---- configure.ac (revision 42) |
| 27 |
-+++ configure.ac (working copy) |
| 28 |
-@@ -111,7 +111,5 @@ |
| 29 |
- fi |
| 30 |
- AC_SUBST(LIBSTDCXX_LA_LINKER_FLAG) |
| 31 |
- |
| 32 |
--AC_CONFIG_FILES([Makefile |
| 33 |
-- gflags/src/gflags/gflags.h |
| 34 |
-- gflags/src/gflags/gflags_completions.h]) |
| 35 |
-+AC_CONFIG_FILES([Makefile]) |
| 36 |
- AC_OUTPUT |
| 37 |
-Index: Makefile.am |
| 38 |
-=================================================================== |
| 39 |
---- Makefile.am (revision 42) |
| 40 |
-+++ Makefile.am (working copy) |
| 41 |
-@@ -5,11 +5,7 @@ |
| 42 |
- -I gflags/m4 |
| 43 |
- |
| 44 |
- # This is so we can #include <google/vcencoder.h> or <gtest/gtest.h> |
| 45 |
--AM_CPPFLAGS = -I$(top_srcdir)/src \ |
| 46 |
-- -I$(top_srcdir)/src/zlib \ |
| 47 |
-- -I$(top_srcdir)/gflags/src \ |
| 48 |
-- -I$(top_srcdir)/gtest \ |
| 49 |
-- -I$(top_srcdir)/gtest/include |
| 50 |
-+AM_CPPFLAGS = -I$(top_srcdir)/src |
| 51 |
- |
| 52 |
- # For a non-optimized (debug) build, change "-DNDEBUG" to "-DDEBUG". |
| 53 |
- AM_CXXFLAGS = -DNDEBUG -DNO_THREADS |
| 54 |
-@@ -46,6 +42,7 @@ |
| 55 |
- ## Tests are added one by one to these lists in the RULES sections. |
| 56 |
- check_PROGRAMS = |
| 57 |
- check_SCRIPTS = |
| 58 |
-+check_LTLIBRARIES = |
| 59 |
- |
| 60 |
- ## Other binaries, scripts, and libraries that are built but not automatically |
| 61 |
- ## installed. |
| 62 |
-@@ -55,52 +52,11 @@ |
| 63 |
- |
| 64 |
- ## vvvv RULES TO MAKE THE LIBRARIES, BINARIES, AND UNITTESTS |
| 65 |
- |
| 66 |
--# google-gflags: Used for command-line client |
| 67 |
--# Please refer to http://code.google.com/p/google-gflags/ for details |
| 68 |
--noinst_LTLIBRARIES += libgflags.la |
| 69 |
--libgflags_la_SOURCES = gflags/src/gflags/gflags.h \ |
| 70 |
-- gflags/src/gflags/gflags_completions.h \ |
| 71 |
-- gflags/src/mutex.h \ |
| 72 |
-- gflags/src/gflags.cc \ |
| 73 |
-- gflags/src/gflags_completions.cc \ |
| 74 |
-- gflags/src/gflags_reporting.cc |
| 75 |
-- |
| 76 |
--# gtest (Google Test): Used for unit tests only |
| 77 |
--# Please refer to http://code.google.com/p/googletest/ for details |
| 78 |
--noinst_LTLIBRARIES += libgtest_main.la |
| 79 |
--libgtest_main_la_SOURCES = gtest/include/gtest/gtest.h \ |
| 80 |
-- gtest/include/gtest/gtest-death-test.h \ |
| 81 |
-- gtest/include/gtest/gtest-message.h \ |
| 82 |
-- gtest/include/gtest/gtest-param-test.h \ |
| 83 |
-- gtest/include/gtest/gtest_pred_impl.h \ |
| 84 |
-- gtest/include/gtest/gtest_prod.h \ |
| 85 |
-- gtest/include/gtest/gtest-spi.h \ |
| 86 |
-- gtest/include/gtest/gtest-test-part.h \ |
| 87 |
-- gtest/include/gtest/gtest-typed-test.h \ |
| 88 |
-- gtest/include/gtest/internal/gtest-death-test-internal.h \ |
| 89 |
-- gtest/include/gtest/internal/gtest-filepath.h \ |
| 90 |
-- gtest/include/gtest/internal/gtest-internal.h \ |
| 91 |
-- gtest/include/gtest/internal/gtest-linked_ptr.h \ |
| 92 |
-- gtest/include/gtest/internal/gtest-param-util.h \ |
| 93 |
-- gtest/include/gtest/internal/gtest-param-util-generated.h \ |
| 94 |
-- gtest/include/gtest/internal/gtest-port.h \ |
| 95 |
-- gtest/include/gtest/internal/gtest-string.h \ |
| 96 |
-- gtest/include/gtest/internal/gtest-tuple.h \ |
| 97 |
-- gtest/include/gtest/internal/gtest-type-util.h \ |
| 98 |
-- gtest/src/gtest-internal-inl.h \ |
| 99 |
-- gtest/src/gtest.cc \ |
| 100 |
-- gtest/src/gtest-death-test.cc \ |
| 101 |
-- gtest/src/gtest-filepath.cc \ |
| 102 |
-- gtest/src/gtest-port.cc \ |
| 103 |
-- gtest/src/gtest-test-part.cc \ |
| 104 |
-- gtest/src/gtest-typed-test.cc \ |
| 105 |
-- gtest/src/gtest_main.cc \ |
| 106 |
-- src/testing.h |
| 107 |
-- |
| 108 |
--noinst_LTLIBRARIES += libvcdecoder_test_common.la |
| 109 |
-+check_LTLIBRARIES += libvcdecoder_test_common.la |
| 110 |
- libvcdecoder_test_common_la_SOURCES = src/vcdecoder_test.h \ |
| 111 |
- src/vcdecoder_test.cc |
| 112 |
--libvcdecoder_test_common_la_LIBADD = libvcddec.la libgtest_main.la |
| 113 |
-+libvcdecoder_test_common_la_LIBADD = libvcddec.la -lgtest_main |
| 114 |
-+libvcdecoder_test_common_la_LDFLAGS = -pthread |
| 115 |
- |
| 116 |
- # libvcdcom: The open-vcdiff *common* library |
| 117 |
- lib_LTLIBRARIES += libvcdcom.la |
| 118 |
-@@ -112,9 +68,6 @@ |
| 119 |
- src/logging.h \ |
| 120 |
- src/varint_bigendian.h \ |
| 121 |
- src/vcdiff_defs.h \ |
| 122 |
-- src/zlib/zlib.h \ |
| 123 |
-- src/zlib/zconf.h \ |
| 124 |
-- src/zlib/adler32.c \ |
| 125 |
- src/addrcache.cc \ |
| 126 |
- src/codetable.cc \ |
| 127 |
- src/logging.cc \ |
| 128 |
-@@ -128,7 +81,7 @@ |
| 129 |
- src/decodetable.cc \ |
| 130 |
- src/headerparser.cc \ |
| 131 |
- src/vcdecoder.cc |
| 132 |
--libvcddec_la_LIBADD = libvcdcom.la |
| 133 |
-+libvcddec_la_LIBADD = libvcdcom.la -lz |
| 134 |
- |
| 135 |
- # libvcdenc: The open-vcdiff *encoder* library |
| 136 |
- lib_LTLIBRARIES += libvcdenc.la |
| 137 |
-@@ -147,52 +100,62 @@ |
| 138 |
- src/jsonwriter.cc \ |
| 139 |
- src/vcdiffengine.cc \ |
| 140 |
- src/vcencoder.cc |
| 141 |
--libvcdenc_la_LIBADD = libvcdcom.la |
| 142 |
-+libvcdenc_la_LIBADD = libvcdcom.la -lz |
| 143 |
- |
| 144 |
- bin_PROGRAMS += vcdiff |
| 145 |
- vcdiff_SOURCES = src/vcdiff_main.cc |
| 146 |
--vcdiff_LDADD = libvcddec.la libvcdenc.la libgflags.la |
| 147 |
-+vcdiff_LDADD = libvcddec.la libvcdenc.la -lgflags |
| 148 |
- |
| 149 |
- check_PROGRAMS += addrcache_test |
| 150 |
- addrcache_test_SOURCES = src/addrcache_test.cc |
| 151 |
--addrcache_test_LDADD = libvcdcom.la libgtest_main.la |
| 152 |
-+addrcache_test_LDADD = libvcdcom.la -lgtest_main |
| 153 |
-+addrcache_test_LDFLAGS = -pthread |
| 154 |
- |
| 155 |
- check_PROGRAMS += blockhash_test |
| 156 |
- blockhash_test_SOURCES = src/blockhash_test.cc |
| 157 |
--blockhash_test_LDADD = libvcdenc.la libgtest_main.la |
| 158 |
-+blockhash_test_LDADD = libvcdenc.la -lgtest_main |
| 159 |
-+blockhash_test_LDFLAGS = -pthread |
| 160 |
- |
| 161 |
- check_PROGRAMS += codetable_test |
| 162 |
- codetable_test_SOURCES = src/codetable_test.cc |
| 163 |
--codetable_test_LDADD = libvcdcom.la libgtest_main.la |
| 164 |
-+codetable_test_LDADD = libvcdcom.la -lgtest_main |
| 165 |
-+codetable_test_LDFLAGS = -pthread |
| 166 |
- |
| 167 |
- check_PROGRAMS += decodetable_test |
| 168 |
- decodetable_test_SOURCES = src/decodetable_test.cc |
| 169 |
--decodetable_test_LDADD = libvcddec.la libvcdcom.la libgtest_main.la |
| 170 |
-+decodetable_test_LDADD = libvcddec.la libvcdcom.la -lgtest_main |
| 171 |
-+decodetable_test_LDFLAGS = -pthread |
| 172 |
- |
| 173 |
- check_PROGRAMS += encodetable_test |
| 174 |
- encodetable_test_SOURCES = src/encodetable_test.cc |
| 175 |
--encodetable_test_LDADD = libvcdenc.la libvcdcom.la libgtest_main.la |
| 176 |
-+encodetable_test_LDADD = libvcdenc.la libvcdcom.la -lgtest_main |
| 177 |
-+encodetable_test_LDFLAGS = -pthread |
| 178 |
- |
| 179 |
- check_PROGRAMS += headerparser_test |
| 180 |
- headerparser_test_SOURCES = src/headerparser_test.cc |
| 181 |
--headerparser_test_LDADD = libvcddec.la libvcdcom.la libgtest_main.la |
| 182 |
-+headerparser_test_LDADD = libvcddec.la libvcdcom.la -lgtest_main |
| 183 |
-+headerparser_test_LDFLAGS = -pthread |
| 184 |
- |
| 185 |
- check_PROGRAMS += instruction_map_test |
| 186 |
- instruction_map_test_SOURCES = src/instruction_map_test.cc |
| 187 |
--instruction_map_test_LDADD = libvcdenc.la libvcdcom.la libgtest_main.la |
| 188 |
-+instruction_map_test_LDADD = libvcdenc.la libvcdcom.la -lgtest_main |
| 189 |
-+instruction_map_test_LDFLAGS = -pthread |
| 190 |
- |
| 191 |
- check_PROGRAMS += output_string_test |
| 192 |
- output_string_test_SOURCES = src/output_string_crope.h \ |
| 193 |
- src/output_string_test.cc |
| 194 |
--output_string_test_LDADD = libgtest_main.la |
| 195 |
-+output_string_test_LDADD = -lgtest_main |
| 196 |
-+output_string_test_LDFLAGS = -pthread |
| 197 |
- |
| 198 |
- check_PROGRAMS += rolling_hash_test |
| 199 |
- rolling_hash_test_SOURCES = src/rolling_hash_test.cc |
| 200 |
--rolling_hash_test_LDADD = libvcdcom.la libgtest_main.la |
| 201 |
-+rolling_hash_test_LDADD = libvcdcom.la -lgtest_main |
| 202 |
-+rolling_hash_test_LDFLAGS = -pthread |
| 203 |
- |
| 204 |
- check_PROGRAMS += varint_bigendian_test |
| 205 |
- varint_bigendian_test_SOURCES = src/varint_bigendian_test.cc |
| 206 |
--varint_bigendian_test_LDADD = libvcdcom.la libgtest_main.la |
| 207 |
-+varint_bigendian_test_LDADD = libvcdcom.la -lgtest_main |
| 208 |
-+varint_bigendian_test_LDFLAGS = -pthread |
| 209 |
- |
| 210 |
- check_PROGRAMS += vcdecoder1_test |
| 211 |
- vcdecoder1_test_SOURCES = src/vcdecoder1_test.cc |
| 212 |
-@@ -216,15 +179,18 @@ |
| 213 |
- |
| 214 |
- check_PROGRAMS += vcdiffengine_test |
| 215 |
- vcdiffengine_test_SOURCES = src/vcdiffengine_test.cc |
| 216 |
--vcdiffengine_test_LDADD = libvcdenc.la libvcdcom.la libgtest_main.la |
| 217 |
-+vcdiffengine_test_LDADD = libvcdenc.la libvcdcom.la -lgtest_main |
| 218 |
-+vcdiffengine_test_LDFLAGS = -pthread |
| 219 |
- |
| 220 |
- check_PROGRAMS += vcencoder_test |
| 221 |
- vcencoder_test_SOURCES = src/vcencoder_test.cc |
| 222 |
--vcencoder_test_LDADD = libvcddec.la libvcdenc.la libvcdcom.la libgtest_main.la |
| 223 |
-+vcencoder_test_LDADD = libvcddec.la libvcdenc.la libvcdcom.la -lgtest_main |
| 224 |
-+vcencoder_test_LDFLAGS = -pthread |
| 225 |
- |
| 226 |
- check_PROGRAMS += jsonwriter_test |
| 227 |
- jsonwriter_test_SOURCES = src/jsonwriter_test.cc |
| 228 |
--jsonwriter_test_LDADD = libvcdenc.la libvcdcom.la libgtest_main.la |
| 229 |
-+jsonwriter_test_LDADD = libvcdenc.la libvcdcom.la -lgtest_main |
| 230 |
-+jsonwriter_test_LDFLAGS = -pthread |
| 231 |
- |
| 232 |
- check_SCRIPTS += src/vcdiff_test.sh |
| 233 |
- dist_noinst_DATA = testdata/configure.ac.v0.1 \ |
Archives