diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 20:57:42 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 20:57:42 +0100 |
commit | 1798c4aeca70ac8d0a243684d6a798fbc65735f8 (patch) | |
tree | e48e19cb6fa03de18e1c63e1a93371b7ebc4eb56 /dev-libs/xerces-c/files | |
parent | d87262dd706fec50cd150aab3e93883b6337466d (diff) |
gentoo resync : 14.07.2018
Diffstat (limited to 'dev-libs/xerces-c/files')
-rw-r--r-- | dev-libs/xerces-c/files/50xerces-c | 1 | ||||
-rw-r--r-- | dev-libs/xerces-c/files/xerces-c-3.1.4-fix-build-system.patch | 61 |
2 files changed, 0 insertions, 62 deletions
diff --git a/dev-libs/xerces-c/files/50xerces-c b/dev-libs/xerces-c/files/50xerces-c deleted file mode 100644 index 6fdb7ffbdee9..000000000000 --- a/dev-libs/xerces-c/files/50xerces-c +++ /dev/null @@ -1 +0,0 @@ -XERCESC_NLS_HOME="/usr/share/xerces-c/msg" diff --git a/dev-libs/xerces-c/files/xerces-c-3.1.4-fix-build-system.patch b/dev-libs/xerces-c/files/xerces-c-3.1.4-fix-build-system.patch deleted file mode 100644 index 6b991d24b56f..000000000000 --- a/dev-libs/xerces-c/files/xerces-c-3.1.4-fix-build-system.patch +++ /dev/null @@ -1,61 +0,0 @@ -* Fix build system when USE="-threads" -* Add DESTDIR in order to prevent sandbox failure - ---- a/configure.ac -+++ b/configure.ac -@@ -124,6 +124,7 @@ - AC_CXX_HAVE_LSTRING - - ACX_PTHREAD -+AM_CONDITIONAL([THREADS], [test "x${acx_pthread_ok}" = "xyes"]) - - # Checks for library functions. - #AC_FUNC_ERROR_AT_LINE ---- a/src/xercesc/util/MsgLoaders/MsgCatalog/Makefile.in -+++ b/src/xercesc/util/MsgLoaders/MsgCatalog/Makefile.in -@@ -5,7 +5,7 @@ - prefix = @prefix@ - INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ --mkdir_p = @mkdir_p@ -+mkdir_p = @MKDIR_P@ - - include $(top_srcdir)/version.incl - -@@ -48,11 +48,11 @@ - # for installing the library - # for installing the library - install: $(RESTARGET) -- $(mkdir_p) $(prefix)/msg -- $(INSTALL_PROGRAM) $(RESTARGET) $(prefix)/msg -+ $(mkdir_p) $(DESTDIR)/$(prefix)/share/xerces-c/msg -+ $(INSTALL_PROGRAM) $(RESTARGET) $(DESTDIR)/$(prefix)/share/xerces-c/msg - - uninstall: -- -rm -f $(prefix)/msg/$(RESFILES) -+ -rm -f $(DESTDIR)/$(prefix)/share/xerces-c/msg/$(RESFILES) - - - # Needed to support "make dist" ---- a/tests/Makefile.am -+++ b/tests/Makefile.am -@@ -21,7 +21,7 @@ - - check_PROGRAMS = ${testprogs} - --LDADD = ${top_builddir}/src/libxerces-c.la -+LDADD = $(top_builddir)/src/libxerces-c.la $(PTHREAD_LIBS) - # the -I${top_builddir}/src is needed to pick the xercesc/util/Xerces_autoconf_config.hpp - # header file when doing out-of-tree builds - AM_CPPFLAGS = -I${top_builddir}/src -I${top_srcdir}/src -@@ -86,8 +86,10 @@ - # src/ParserTest/ParserTest_Parser.cpp \ - # src/ParserTest/ParserTest_Parser.hpp - -+if THREADS - testprogs += ThreadTest - ThreadTest_SOURCES = src/ThreadTest/ThreadTest.cpp -+endif - - # Fails to compile under gcc 4 (ambiguous calls to NullPointerException) - # dcargill says this is obsolete and we can delete it. |