diff options
author | Khaled Hosny <khaledhosny@eglug.org> | 2013-10-18 22:25:22 +0200 |
---|---|---|
committer | David Tardon <dtardon@redhat.com> | 2013-10-19 07:40:52 +0000 |
commit | f2b51cdfd6fee45ff2062fa6fb46893eba56c02c (patch) | |
tree | 5cbcaa583dc98e965ae83d2b68bc5c17212a5b1f /external/libxml2/libxml2-configure.patch | |
parent | 27d0ddf6b4526ffdf2e166e20a03a4c40a0f9936 (diff) |
fdo#70393: move libxml2 to a subdir of external
Change-Id: Ifea928fc56239043f976ed1e0d2c986bc5cfb934
Reviewed-on: https://gerrit.libreoffice.org/6339
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'external/libxml2/libxml2-configure.patch')
-rw-r--r-- | external/libxml2/libxml2-configure.patch | 152 |
1 files changed, 152 insertions, 0 deletions
diff --git a/external/libxml2/libxml2-configure.patch b/external/libxml2/libxml2-configure.patch new file mode 100644 index 000000000000..d8515016df5c --- /dev/null +++ b/external/libxml2/libxml2-configure.patch @@ -0,0 +1,152 @@ +--- misc/libxml2-2.7.6/config.sub 2009-06-11 11:29:50.000000000 +0200 ++++ misc/build/libxml2-2.7.6/config.sub 2011-09-26 18:05:31.000000000 +0200 +@@ -120,7 +120,7 @@ + # Here we must recognize all the valid KERNEL-OS combinations. + maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` + case $maybe_os in +- nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ ++ nto-qnx* | linux-gnu* | linux-dietlibc | linux-android* | linux-newlib* | linux-uclibc* | \ + uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ + kopensolaris*-gnu* | \ + storm-chaos* | os2-emx* | rtmk-nova*) +@@ -1275,7 +1275,7 @@ + | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ + | -chorusos* | -chorusrdb* | -cegcc* \ + | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ +- | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ ++ | -mingw32* | -linux-gnu* | -linux-androideabi* | -linux-newlib* | -linux-uclibc* \ + | -uxpv* | -beos* | -mpeix* | -udk* \ + | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ + | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ +--- misc/libxml2-2.7.6/Makefile.in ++++ misc/build/libxml2-2.7.6/Makefile.in +@@ -41,9 +41,9 @@ + testSAX$(EXEEXT) testHTML$(EXEEXT) testXPath$(EXEEXT) \ + testURI$(EXEEXT) testThreads$(EXEEXT) testC14N$(EXEEXT) \ + testAutomata$(EXEEXT) testRegexp$(EXEEXT) testReader$(EXEEXT) \ +- testapi$(EXEEXT) testModule$(EXEEXT) runtest$(EXEEXT) \ ++ testapi$(EXEEXT) testModule$(EXEEXT) \ + runsuite$(EXEEXT) testchar$(EXEEXT) testdict$(EXEEXT) \ +- runxmlconf$(EXEEXT) testrecurse$(EXEEXT) ++ runxmlconf$(EXEEXT) + bin_PROGRAMS = xmllint$(EXEEXT) xmlcatalog$(EXEEXT) + subdir = . + DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ +--- misc/libxml2-2.7.6/ltmain.sh 2009-10-06 17:39:54.000000000 +0100 ++++ misc/build/libxml2-2.7.6/ltmain.sh 2009-12-17 11:43:56.000000000 +0000 +@@ -6271,8 +6271,8 @@ + ;; + + freebsd-elf) +- major=".$current" +- versuffix=".$current" ++ major=.`expr $current - $age` ++ versuffix=".$major.$age.$revision"; + ;; + + irix | nonstopux) +--- misc/libxml2-2.7.6/include/libxml/xmlversion.h 2009-12-17 11:45:19.000000000 +0000 ++++ misc/build/libxml2-2.7.6/include/libxml/xmlversion.h 2009-12-17 11:45:36.000000000 +0000 +@@ -264,7 +264,7 @@ + * + * Whether iconv support is available + */ +-#if 1 ++#if 0 + #define LIBXML_ICONV_ENABLED + #endif + +@@ -282,7 +282,7 @@ + * + * Whether Debugging module is configured in + */ +-#if 1 ++#if 0 + #define LIBXML_DEBUG_ENABLED + #endif + +@@ -291,7 +291,7 @@ + * + * Whether the memory debugging is configured in + */ +-#if 1 ++#if 0 + #define DEBUG_MEMORY_LOCATION + #endif + +@@ -300,7 +300,7 @@ + * + * Whether the runtime debugging is configured in + */ +-#if 1 ++#if 0 + #define LIBXML_DEBUG_RUNTIME + #endif + +--- misc/libxml2-2.7.6/xml2-config.in 2009-12-17 11:45:20.000000000 +0000 ++++ misc/build/libxml2-2.7.6/xml2-config.in 2009-12-17 11:45:36.000000000 +0000 +@@ -1,9 +1,14 @@ + #! /bin/sh + +-prefix=@prefix@ +-exec_prefix=@exec_prefix@ +-includedir=@includedir@ +-libdir=@libdir@ ++#prefix=@prefix@ ++#exec_prefix=@exec_prefix@ ++#includedir=@includedir@ ++#libdir=@libdir@ ++ ++prefix=${SOLARVERSION}/${INPATH} ++exec_prefix=${SOLARVERSION}/${INPATH} ++includedir=${WORKDIR}/UnpackedTarball/xml2/include ++libdir=${SOLARVERSION}/${INPATH}/lib${UPDMINOREXT} + + usage() + { +@@ -67,7 +72,8 @@ + ;; + + --cflags) +- echo @XML_INCLUDEDIR@ @XML_CFLAGS@ ++ echo -I${includedir} ++# echo @XML_INCLUDEDIR@ @XML_CFLAGS@ + ;; + + --libtool-libs) +@@ -82,19 +88,24 @@ + ;; + + --libs) +- if [ "`uname`" = "Linux" ] +- then +- if [ "@XML_LIBDIR@" = "-L/usr/lib" -o "@XML_LIBDIR@" = "-L/usr/lib64" ] +- then +- echo @XML_LIBS@ +- else +- echo @XML_LIBDIR@ @XML_LIBS@ +- fi +- else +- echo @XML_LIBDIR@ @XML_LIBS@ @WIN32_EXTRA_LIBADD@ +- fi ++ echo -L${libdir} -lxml2 -lm ++# if [ "`uname`" = "Linux" ] ++# then ++# if [ "@XML_LIBDIR@" = "-L/usr/lib" -o "@XML_LIBDIR@" = "-L/usr/lib64" ] ++# then ++# echo @XML_LIBS@ ++# else ++# echo @XML_LIBDIR@ @XML_LIBS@ ++# fi ++# else ++# echo @XML_LIBDIR@ @XML_LIBS@ @WIN32_EXTRA_LIBADD@ ++# fi + ;; + ++ print) # ugly configure hack ++ exit 0 ++ ;; ++ + *) + usage + exit 1 |