diff options
-rw-r--r-- | cppunit/cppunit-1.8.0-r1.patch | 3 | ||||
-rw-r--r-- | hyphen/hyphen-2.4.patch | 3 | ||||
-rw-r--r-- | hyphen/prj/build.lst | 2 | ||||
-rw-r--r-- | libtextcat/libtextcat-2.2.patch | 3 | ||||
-rw-r--r-- | libtextcat/prj/build.lst | 2 | ||||
-rw-r--r-- | libxmlsec/prj/build.lst | 2 | ||||
-rw-r--r-- | lpsolve/prj/build.lst | 2 | ||||
-rw-r--r-- | msfontextract/msfontextract.patch | 3 | ||||
-rw-r--r-- | msfontextract/prj/build.lst | 2 | ||||
-rw-r--r-- | redland/prj/build.lst | 2 | ||||
-rw-r--r-- | redland/raptor-1.4.17.patch | 3 | ||||
-rw-r--r-- | redland/rasqal-0.9.15.patch | 3 | ||||
-rw-r--r-- | redland/redland-1.0.7.patch | 3 |
13 files changed, 20 insertions, 13 deletions
diff --git a/cppunit/cppunit-1.8.0-r1.patch b/cppunit/cppunit-1.8.0-r1.patch index 426051d6288d..47963c421871 100644 --- a/cppunit/cppunit-1.8.0-r1.patch +++ b/cppunit/cppunit-1.8.0-r1.patch @@ -3263,7 +3263,7 @@ Nur in misc/build/cppunit-1.8.0/include/cppunit: taghelper.hxx.dummy. Nur in misc/build/cppunit-1.8.0/include/cppunit: tagvalues.hxx.dummy. --- misc/cppunit-1.8.0/include/makefile.mk 2008-12-10 20:46:08.530624271 +0100 +++ misc/build/cppunit-1.8.0/include/makefile.mk 2008-07-14 07:25:14.000000000 +0200 -@@ -1 +1,52 @@ +@@ -1 +1,53 @@ -dummy +#************************************************************************* +# @@ -3300,6 +3300,7 @@ Nur in misc/build/cppunit-1.8.0/include/cppunit: tagvalues.hxx.dummy. + +PRJNAME=cppunit +TARGET=inc ++UWINAPILIB=
+ +# --- Settings ----------------------------------------------------- + diff --git a/hyphen/hyphen-2.4.patch b/hyphen/hyphen-2.4.patch index 27f7085946a3..5aef3422d22a 100644 --- a/hyphen/hyphen-2.4.patch +++ b/hyphen/hyphen-2.4.patch @@ -110,7 +110,7 @@ diff -u misc/hyphen-2.4/Makefile.in misc/build/hyphen-2.4/Makefile.in diff -u misc/hyphen-2.4/makefile.mk misc/build/hyphen-2.4/makefile.mk --- misc/hyphen-2.4/makefile.mk 2008-06-04 10:43:21.000000000 +0200 +++ misc/build/hyphen-2.4/makefile.mk 2008-06-04 12:40:46.000000000 +0200 -@@ -1 +1,57 @@ +@@ -1 +1,58 @@ -dummy +#************************************************************************* +# @@ -151,6 +151,7 @@ diff -u misc/hyphen-2.4/makefile.mk misc/build/hyphen-2.4/makefile.mk + +USE_DEFFILE=TRUE +EXTERNAL_WARNINGS_NOT_ERRORS := TRUE ++UWINAPILIB=
+ +.INCLUDE : settings.mk + diff --git a/hyphen/prj/build.lst b/hyphen/prj/build.lst index dbb21f3325ab..a9e777926c88 100644 --- a/hyphen/prj/build.lst +++ b/hyphen/prj/build.lst @@ -1,3 +1,3 @@ -hyp hyphen : solenv sal NULL +hyp hyphen : solenv NULL hyp hyphen usr1 - all hyp_mkout NULL hyp hyphen nmake - all hyp_hyphen NULL diff --git a/libtextcat/libtextcat-2.2.patch b/libtextcat/libtextcat-2.2.patch index c9ce4add875c..b9124f3df377 100644 --- a/libtextcat/libtextcat-2.2.patch +++ b/libtextcat/libtextcat-2.2.patch @@ -932,7 +932,7 @@ +} --- misc/libtextcat-2.2/src/makefile.mk Mon Mar 31 11:30:06 2008 +++ misc/build/libtextcat-2.2/src/makefile.mk Mon Mar 31 11:29:42 2008 -@@ -1 +1,90 @@ +@@ -1 +1,91 @@ -dummy +#************************************************************************* +# @@ -973,6 +973,7 @@ + +USE_DEFFILE=TRUE +EXTERNAL_WARNINGS_NOT_ERRORS := TRUE ++UWINAPILIB= + +.INCLUDE : settings.mk + diff --git a/libtextcat/prj/build.lst b/libtextcat/prj/build.lst index e4bc4af795aa..87e42ef3f0a8 100644 --- a/libtextcat/prj/build.lst +++ b/libtextcat/prj/build.lst @@ -1,3 +1,3 @@ -ltc libtextcat : solenv sal NULL +ltc libtextcat : solenv NULL ltc libtextcat usr1 - all ltc_mkout NULL ltc libtextcat nmake - all ltc_libtextcat NULL diff --git a/libxmlsec/prj/build.lst b/libxmlsec/prj/build.lst index b557aa31ccb5..a4faaa8f00fa 100644 --- a/libxmlsec/prj/build.lst +++ b/libxmlsec/prj/build.lst @@ -1,3 +1,3 @@ -ls libxmlsec : stlport soltools LIBXML2:libxml2 MOZ:moz SO:moz_prebuilt sal NULL +ls libxmlsec : stlport soltools LIBXML2:libxml2 MOZ:moz SO:moz_prebuilt NULL ls libxmlsec usr1 - all ls_mkout NULL ls libxmlsec nmake - all ls_xmlsec1 NULL diff --git a/lpsolve/prj/build.lst b/lpsolve/prj/build.lst index 516f37ae9f1c..e6965a1e25e7 100644 --- a/lpsolve/prj/build.lst +++ b/lpsolve/prj/build.lst @@ -1,3 +1,3 @@ -lps lpsolve : sal NULL +lps lpsolve : NULL lps lpsolve usr1 - all lps_mkout NULL lps lpsolve nmake - all lps_lpsolve NULL diff --git a/msfontextract/msfontextract.patch b/msfontextract/msfontextract.patch index 7532a061985a..233215bdc5c7 100644 --- a/msfontextract/msfontextract.patch +++ b/msfontextract/msfontextract.patch @@ -1,6 +1,6 @@ --- misc/libmspack/mspack/makefile.mk Mon Mar 31 11:34:58 2008 +++ misc/build/libmspack/mspack/makefile.mk Mon Mar 31 11:34:31 2008 -@@ -1 +1,82 @@ +@@ -1 +1,83 @@ -dummy +#************************************************************************* +# @@ -42,6 +42,7 @@ +NO_DEFAULT_STL=TRUE +LIBSALCPPRT= +EXTERNAL_WARNINGS_NOT_ERRORS=TRUE ++UWINAPILIB=
+ +# --- Settings ----------------------------------------------------- + diff --git a/msfontextract/prj/build.lst b/msfontextract/prj/build.lst index 7b52864f0c75..513990ce6fda 100644 --- a/msfontextract/prj/build.lst +++ b/msfontextract/prj/build.lst @@ -1,2 +1,2 @@ -mf msfontextract : soltools sal NULL +mf msfontextract : soltools NULL mf msfontextract nmake - all mf_mkout NULL diff --git a/redland/prj/build.lst b/redland/prj/build.lst index a5653f0cf5d4..5f26eb206768 100644 --- a/redland/prj/build.lst +++ b/redland/prj/build.lst @@ -1,4 +1,4 @@ -rld redland : sal soltools ZLIB:zlib LIBXML2:libxml2 LIBXSLT:libxslt OPENSSL:openssl NULL +rld redland : soltools ZLIB:zlib LIBXML2:libxml2 LIBXSLT:libxslt OPENSSL:openssl NULL rld redland usr1 - all rld_mkout NULL rld redland\raptor nmake - all rld_raptor NULL rld redland\rasqal nmake - all rld_rasqal rld_raptor NULL diff --git a/redland/raptor-1.4.17.patch b/redland/raptor-1.4.17.patch index c22ff2b53e93..5dcda739aea5 100644 --- a/redland/raptor-1.4.17.patch +++ b/redland/raptor-1.4.17.patch @@ -18,7 +18,7 @@ + --- misc/raptor-1.4.17/src/makefile.mk Mon Jun 16 17:24:23 2008 +++ misc/build/raptor-1.4.17/src/makefile.mk Mon Jun 16 19:25:14 2008 -@@ -1,1 +1,128 @@ +@@ -1,1 +1,129 @@ -dummy +#************************************************************************* +# @@ -56,6 +56,7 @@ +PRJNAME=redland +TARGET=raptor +LIBTARGET=NO ++UWINAPILIB=
+ +EXTERNAL_WARNINGS_NOT_ERRORS=TRUE + diff --git a/redland/rasqal-0.9.15.patch b/redland/rasqal-0.9.15.patch index 67261f6a1d66..b57d985a435a 100644 --- a/redland/rasqal-0.9.15.patch +++ b/redland/rasqal-0.9.15.patch @@ -18,7 +18,7 @@ + --- misc/rasqal-0.9.15/src/makefile.mk Mon Jun 16 19:30:20 2008 +++ misc/build/rasqal-0.9.15/src/makefile.mk Mon Jun 16 19:25:48 2008 -@@ -1,1 +1,102 @@ +@@ -1,1 +1,103 @@ -dummy +#************************************************************************* +# @@ -56,6 +56,7 @@ +PRJNAME=redland +TARGET=rasqal +LIBTARGET=NO ++UWINAPILIB=
+ +EXTERNAL_WARNINGS_NOT_ERRORS=TRUE + diff --git a/redland/redland-1.0.7.patch b/redland/redland-1.0.7.patch index 97f7119e5b31..764198e38108 100644 --- a/redland/redland-1.0.7.patch +++ b/redland/redland-1.0.7.patch @@ -18,7 +18,7 @@ + --- misc/redland-1.0.7/librdf/makefile.mk 2008-12-26 17:24:00.000000000 +0100 +++ misc/build/redland-1.0.7/librdf/makefile.mk 2008-12-26 17:20:46.000000000 +0100 -@@ -1 +1,124 @@ +@@ -1 +1,125 @@ -dummy +#************************************************************************* +# @@ -56,6 +56,7 @@ +PRJNAME=redland +TARGET=librdf +LIBTARGET=NO ++UWINAPILIB= + +EXTERNAL_WARNINGS_NOT_ERRORS=TRUE + |