Module_cross_tail_build.mk | 1 + cross_tail_build/prj/build.lst | 2 +- external/glibc-2.1.3.patch | 3 ++- gettext/gettext-0.18.1.1.patch | 3 ++- gettext/prj/build.lst | 2 +- libcroco/libcroco-0.6.2.patch | 3 ++- libgsf/libgsf-1.14.19.windows.patch | 3 ++- zlib/zlib-dmakebuild.patch | 3 ++- 8 files changed, 13 insertions(+), 7 deletions(-)
New commits: commit e8920c600eb2fef047ecd8226f07da283d7033bb Author: David Tardon <[email protected]> Date: Fri Oct 26 06:24:15 2012 +0200 add sal to cross_tail_build Change-Id: I81d0902ca41b8dcb43d58d47b9758b8718c25e86 diff --git a/Module_cross_tail_build.mk b/Module_cross_tail_build.mk index 51e5ad5..78b113d 100644 --- a/Module_cross_tail_build.mk +++ b/Module_cross_tail_build.mk @@ -70,6 +70,7 @@ $(eval $(call gb_Module_add_moduledirs,cross_tail_build,\ remotebridges \ ridljar \ rsc \ + sal \ salhelper \ sax \ shell \ diff --git a/cross_tail_build/prj/build.lst b/cross_tail_build/prj/build.lst index 308c851..ec26db2 100644 --- a/cross_tail_build/prj/build.lst +++ b/cross_tail_build/prj/build.lst @@ -1,2 +1,2 @@ -ctb cross_tail_build :: BERKELEYDB:berkeleydb BOOST:boost CPPUNIT:cppunit EXPAT:expat external ICU:icu LIBLANGTAG:liblangtag LIBXML2:libxml2 LIBXSLT:libxslt sal solenv soltools ZLIB:zlib NULL +ctb cross_tail_build :: BERKELEYDB:berkeleydb BOOST:boost CPPUNIT:cppunit EXPAT:expat external ICU:icu LIBLANGTAG:liblangtag LIBXML2:libxml2 LIBXSLT:libxslt solenv soltools ZLIB:zlib NULL ctb tail_build\prj nmake - all ctb_prj NULL commit 97b18e218069a47ceeeb699fb21638b6b7b27b2c Author: David Tardon <[email protected]> Date: Fri Oct 26 06:25:25 2012 +0200 drop dep on sal The windows (dmake) build no longer needs uwinapi. Change-Id: Ifcbee0c94ce55a59b46c5542cb42ede54c7d8b57 diff --git a/gettext/prj/build.lst b/gettext/prj/build.lst index cf38e63..10d25eb 100644 --- a/gettext/prj/build.lst +++ b/gettext/prj/build.lst @@ -1,3 +1,3 @@ -gt gettext : sal soltools NULL +gt gettext : soltools NULL gt gettext usr1 - all gt_mkout NULL gt gettext nmake - all gt_gettext NULL commit 16e6771acc6607044d089ec10fec9d26f5e03cd3 Author: David Tardon <[email protected]> Date: Fri Oct 26 06:23:36 2012 +0200 chop out uwinapi from more ext. projects Change-Id: I29dd9d4e0a4dc342d28cb93a4cff65aa394848d4 diff --git a/external/glibc-2.1.3.patch b/external/glibc-2.1.3.patch index 49f570d..8d23c95 100644 --- a/external/glibc-2.1.3.patch +++ b/external/glibc-2.1.3.patch @@ -75,7 +75,7 @@ int __long_only); --- misc/glibc-2.1.3/posix/makefile.mk Mon Mar 31 09:43:50 2008 +++ misc/build/glibc-2.1.3/posix/makefile.mk Mon Mar 31 09:43:38 2008 -@@ -1 +1,70 @@ +@@ -1 +1,71 @@ -dummy +#************************************************************************* +# @@ -113,6 +113,7 @@ +EXTERNAL_WARNINGS_NOT_ERRORS := TRUE + +SOLARINC+=-I.. ++UWINAPILIB= + +# --- Settings ----------------------------------------------------- + diff --git a/gettext/gettext-0.18.1.1.patch b/gettext/gettext-0.18.1.1.patch index 016b65d..3f1cdf3 100644 --- a/gettext/gettext-0.18.1.1.patch +++ b/gettext/gettext-0.18.1.1.patch @@ -1,6 +1,6 @@ --- misc/gettext-0.18.1.1/gettext-runtime/intl/makefile.mk Wed Aug 20 14:33:55 2008 +++ misc/build/gettext-0.18.1.1/gettext-runtime/intl/makefile.mk Wed Aug 20 14:26:42 2008 -@@ -1,1 +1,109 @@ +@@ -1,1 +1,110 @@ -dummy +#************************************************************************* +# @@ -37,6 +37,7 @@ +#ENABLE_EXCEPTIONS=TRUE +VISIBILITY_HIDDEN=TRUE +EXTERNAL_WARNINGS_NOT_ERRORS=TRUE ++UWINAPILIB= + +# --- Settings ---------------------------------- + diff --git a/libcroco/libcroco-0.6.2.patch b/libcroco/libcroco-0.6.2.patch index 100023f..e1e4439 100644 --- a/libcroco/libcroco-0.6.2.patch +++ b/libcroco/libcroco-0.6.2.patch @@ -1,6 +1,6 @@ --- misc/libcroco-0.6.2/src/makefile.mk Wed Aug 20 14:33:55 2008 +++ misc/build/libcroco-0.6.2/src/makefile.mk Wed Aug 20 14:26:42 2008 -@@ -1 +1,106 @@ +@@ -1 +1,107 @@ -dummy +#************************************************************************* +# @@ -37,6 +37,7 @@ +#ENABLE_EXCEPTIONS=TRUE +VISIBILITY_HIDDEN=TRUE +EXTERNAL_WARNINGS_NOT_ERRORS=TRUE ++UWINAPILIB= + +# --- Settings ---------------------------------- + diff --git a/libgsf/libgsf-1.14.19.windows.patch b/libgsf/libgsf-1.14.19.windows.patch index 56c10c5..8f09804 100644 --- a/libgsf/libgsf-1.14.19.windows.patch +++ b/libgsf/libgsf-1.14.19.windows.patch @@ -14,7 +14,7 @@ +#endif --- misc/libgsf-1.14.19/gsf/makefile.mk 2011-03-23 16:18:27.070742300 +0100 +++ misc/build/libgsf-1.14.19/gsf/makefile.mk 2011-03-23 16:17:29.477448100 +0100 -@@ -1 +1,120 @@ +@@ -1 +1,121 @@ -dummy +#************************************************************************* +# @@ -50,6 +50,7 @@ + +VISIBILITY_HIDDEN=TRUE +EXTERNAL_WARNINGS_NOT_ERRORS=TRUE ++UWINAPILIB= + +# --- Settings ---------------------------------- + diff --git a/zlib/zlib-dmakebuild.patch b/zlib/zlib-dmakebuild.patch index 6c2de99..7a3abb3 100644 --- a/zlib/zlib-dmakebuild.patch +++ b/zlib/zlib-dmakebuild.patch @@ -1,6 +1,6 @@ --- misc/zlib-1.2.7/makefile.mk Fri Mar 14 10:17:06 2008 +++ misc/build/zlib-1.2.7/makefile.mk Fri Mar 14 10:16:56 2008 -@@ -1 +1,63 @@ +@@ -1 +1,64 @@ -dummy +#************************************************************************* +# @@ -14,6 +14,7 @@ +TARGET=zlib +LIBTARGET=NO +EXTERNAL_WARNINGS_NOT_ERRORS=TRUE ++UWINAPILIB= + +# --- Settings ----------------------------------------------------- + _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
