| 1 |
commit: c0e9a7cf42c7bf4abae02b2ee0441244e01de9f6 |
| 2 |
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Oct 31 01:41:22 2015 +0000 |
| 4 |
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Oct 31 01:41:22 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0e9a7cf |
| 7 |
|
| 8 |
dev-libs/libxml2: disable building of useless programs |
| 9 |
|
| 10 |
These aren't used during build or install, so disable them. |
| 11 |
|
| 12 |
.../files/libxml2-2.9.2-disable-tests.patch | 59 ++++++++++++++++++++++ |
| 13 |
dev-libs/libxml2/libxml2-2.9.2-r1.ebuild | 3 ++ |
| 14 |
2 files changed, 62 insertions(+) |
| 15 |
|
| 16 |
diff --git a/dev-libs/libxml2/files/libxml2-2.9.2-disable-tests.patch b/dev-libs/libxml2/files/libxml2-2.9.2-disable-tests.patch |
| 17 |
new file mode 100644 |
| 18 |
index 0000000..86d5995 |
| 19 |
--- /dev/null |
| 20 |
+++ b/dev-libs/libxml2/files/libxml2-2.9.2-disable-tests.patch |
| 21 |
@@ -0,0 +1,59 @@ |
| 22 |
+do not build test programs as we don't install them |
| 23 |
+ |
| 24 |
+--- a/Makefile.am |
| 25 |
++++ b/Makefile.am |
| 26 |
+@@ -10,7 +10,7 @@ |
| 27 |
+ |
| 28 |
+ AM_CFLAGS = $(THREAD_CFLAGS) $(Z_CFLAGS) $(LZMA_CFLAGS) |
| 29 |
+ |
| 30 |
+-noinst_PROGRAMS=testSchemas testRelax testSAX testHTML testXPath testURI \ |
| 31 |
++check_PROGRAMS=testSchemas testRelax testSAX testHTML testXPath testURI \ |
| 32 |
+ testThreads testC14N testAutomata testRegexp \ |
| 33 |
+ testReader testapi testModule runtest runsuite testchar \ |
| 34 |
+ testdict runxmlconf testrecurse testlimits |
| 35 |
+@@ -170,7 +170,7 @@ |
| 36 |
+ testModule_DEPENDENCIES = $(DEPS) |
| 37 |
+ testModule_LDADD= $(LDADDS) |
| 38 |
+ |
| 39 |
+-noinst_LTLIBRARIES = testdso.la |
| 40 |
++check_LTLIBRARIES = testdso.la |
| 41 |
+ testdso_la_SOURCES = testdso.c |
| 42 |
+ testdso_la_LDFLAGS = -module -no-undefined -avoid-version -rpath $(libdir) |
| 43 |
+ |
| 44 |
+--- a/doc/examples/Makefile.am |
| 45 |
++++ b/doc/examples/Makefile.am |
| 46 |
+@@ -13,7 +13,7 @@ |
| 47 |
+ rebuild: examples.xml index.html |
| 48 |
+ .PHONY: rebuild |
| 49 |
+ |
| 50 |
+-examples.xml: index.py $(noinst_PROGRAMS:=.c) |
| 51 |
++examples.xml: index.py $(check_PROGRAMS:=.c) |
| 52 |
+ cd $(srcdir) && $(PYTHON) index.py |
| 53 |
+ $(MAKE) Makefile |
| 54 |
+ |
| 55 |
+@@ -49,7 +49,7 @@ |
| 56 |
+ xpath1.res \ |
| 57 |
+ xpath2.res |
| 58 |
+ |
| 59 |
+-noinst_PROGRAMS = \ |
| 60 |
++check_PROGRAMS = \ |
| 61 |
+ io1 \ |
| 62 |
+ io2 \ |
| 63 |
+ parse1 \ |
| 64 |
+@@ -99,7 +99,7 @@ |
| 65 |
+ valgrind: |
| 66 |
+ $(MAKE) CHECKER='valgrind' tests |
| 67 |
+ |
| 68 |
+-tests: $(noinst_PROGRAMS) |
| 69 |
++tests: $(check_PROGRAMS) |
| 70 |
+ test -f Makefile.am || test -f test1.xml || $(LN_S) $(srcdir)/test?.xml . |
| 71 |
+ @(echo '## examples regression tests') |
| 72 |
+ @(echo > .memdump) |
| 73 |
+--- a/example/Makefile.am |
| 74 |
++++ b/example/Makefile.am |
| 75 |
+@@ -1,4 +1,4 @@ |
| 76 |
+-noinst_PROGRAMS = gjobread |
| 77 |
++check_PROGRAMS = gjobread |
| 78 |
+ |
| 79 |
+ AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include -I$(srcdir)/include |
| 80 |
+ AM_CFLAGS = $(THREAD_CFLAGS) $(Z_CFLAGS) |
| 81 |
|
| 82 |
diff --git a/dev-libs/libxml2/libxml2-2.9.2-r1.ebuild b/dev-libs/libxml2/libxml2-2.9.2-r1.ebuild |
| 83 |
index a03df24..99c6b6c 100644 |
| 84 |
--- a/dev-libs/libxml2/libxml2-2.9.2-r1.ebuild |
| 85 |
+++ b/dev-libs/libxml2/libxml2-2.9.2-r1.ebuild |
| 86 |
@@ -75,6 +75,9 @@ src_prepare() { |
| 87 |
epatch "${FILESDIR}"/${PN}-2.7.1-catalog_path.patch |
| 88 |
epatch "${FILESDIR}"/${PN}-2.8.0_rc1-winnt.patch |
| 89 |
|
| 90 |
+ # Disable programs that we don't actually install. |
| 91 |
+ epatch "${FILESDIR}"/${PN}-2.9.2-disable-tests.patch |
| 92 |
+ |
| 93 |
eprefixify catalog.c xmlcatalog.c runtest.c xmllint.c |
| 94 |
|
| 95 |
# epunt_cxx # if we don't eautoreconf |
Archives