--- 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 ra/cp-6.4'>distro/collabora/cp-6.4 LibreOffice 核心代码仓库文档基金会
summaryrefslogtreecommitdiff
path: root/extensions/Module_extensions.mk
AgeCommit message (Expand)Author
2022-01-20WASM --enable-wasm-strip now skips lots of LO codeArmin Le Grand (Allotropia)
2022-01-12gbuild: build static LO / link static executablesJan-Marek Glogowski
2021-08-13sw bibliography: fix missing identifier + local URL in biblio referenceMiklos Vajna
2020-02-10android hunspell: Turn on the hunspell build on Android...Jan Holesovsky
2019-12-31tdf#129375: Avoid crash when inserting bibliography entry on iOSTor Lillqvist
2019-02-10Make LDAP support optionalAndrew Udvare
2018-12-29tdf#114635: reimplement TWAIN-based scan using 32-bit shim on WindowsMike Kaganski
2018-11-01gbuild: rename value OS=IOS to OS=iOSMichael Stahl
2018-05-31Comment out CustomTarget_automationtest for now, it can't work properlyTor Lillqvist
2018-05-31Add a unit test for the Automation client servicesTor Lillqvist
2018-05-02WinUserInfoBe: a new config backend for user data provided by WindowsMike Kaganski
2017-07-21migrate to boost::gettextCaolán McNamara
2017-04-26remove extensions bitmaps from .src filesCaolán McNamara
2017-03-14No need for --disable-activex and --disable-atl any longerTor Lillqvist
2016-06-08merge cond. blocks to oneDavid Tardon
2015-12-17tdf#96398 kill remaining NPAPI support for plugins _inside_ LORene Engelhard
2014-09-09fdo#45071 Remove Libreoffice browser pluginBryan Quigley
2014-08-18these strings should be translatableCaolán McNamara
2014-06-12scn resource file is empty now post ui-ificationCaolán McNamara
2014-06-11Convert RID_SANE_DIALOG to .uiPalenik Mihály
2014-04-20convert select type address book page to .uiCaolán McNamara
2013-12-16uiconfig is a l10n-relevant targetBjoern Michaelsen
2013-11-14make l10n buildable separatelyBjoern Michaelsen
2013-09-17Convert tab order dialog to widget UIManal Alhassoun
2013-08-30ENABLE_NPAPI_* Harmonize ENABLE_* variable to TRUE/<nothing>Norbert Thiebaud
2013-04-30install SpotlightImporter bundle using filelistsDavid Tardon
2013-04-30Move to MPLv2 license headers, with ESC decision and author's permission.Michael Meeks
2013-04-11deliver all uiconfig files by UIConfigDavid Tardon
2013-04-09only build WinResTarget on windowsDavid Tardon
2013-02-28extensions: remove obsolete oleautobridge2 libraryMichael Stahl
2012-12-25Get rid of (most uses of) GUITor Lillqvist
2012-12-18Replace GUIBASE checks with equivalent OS checksTor Lillqvist
2012-11-20Key different browser plugin features to specific flagsStephan Bergmann
2012-11-19Key all browser plugin features to --enable-nspluginStephan Bergmann
2012-10-07Don't do these for Android and iOS for nowTor Lillqvist
2012-09-05extensions: convert unoapi test to gbuildMichael Stahl
2012-08-24kill more unneeded stuff; rename uiconfig PackagesMatúš Kukan