[ooo-build-commit] .: Branch 'ooo-build-3-2' - patches/dev300

Thorsten Behrens thorsten at kemper.freedesktop.org
Thu Jan 28 12:08:51 PST 2010


 patches/dev300/apply                           |    2 +-
 patches/dev300/connectivity-build-fix-mac.diff |    9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

New commits:
commit 42123181d923833a73bab8c85767a8ca23e10296
Author: Thorsten <thb at thorstens-computer.local>
Date:   Thu Jan 28 15:24:43 2010 +0100

    Fix build dependencies on mac
    
    M	patches/dev300/apply: the patch
    A	patches/dev300/connectivity-build-fix-mac.diff: util dir was not
            depending on macab driver, leading to subtle breakages

diff --git a/patches/dev300/apply b/patches/dev300/apply
index ac4784e..ba0fd70 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3515,4 +3515,4 @@ connectivity-build-fix.diff, i#107957, fridrich
 [ BuildBits ]
 # Allow oowintool to detect java sdk 1.6.x
 oowintool-java6.diff, fridrich
-
+connectivity-build-fix-mac.diff, thorsten
diff --git a/patches/dev300/connectivity-build-fix-mac.diff b/patches/dev300/connectivity-build-fix-mac.diff
new file mode 100644
index 0000000..bf59cab
--- /dev/null
+++ b/patches/dev300/connectivity-build-fix-mac.diff
@@ -0,0 +1,9 @@
+--- connectivity/prj/build.lst~	2010-01-04 15:03:33.000000000 +0100
++++ connectivity/prj/build.lst	2010-01-28 15:22:25.000000000 +0100
+@@ -28,5 +28,5 @@
+ cn  connectivity\source\simpledbt                   nmake   -   all cn_simpledbt cn_cmtools cn_inc NULL
+ cn  connectivity\source\dbtools                     nmake   -   all cn_dbtools cn_simpledbt cn_cmtools cn_parse cn_res cn_sdbcx cn_inc cn_res NULL
+ cn  connectivity\qa\connectivity\tools              nmake   -   all cn_qa_tools cn_inc NULL
+-cn  connectivity\util                               nmake   -   all cn_util cn_ado cn_mozab cn_kab cn_evoab2 cn_calc cn_odbc cn_mysql cn_jdbc cn_adabas cn_flat cn_dbase cn_hsqldb NULL
++cn  connectivity\util                               nmake   -   all cn_util cn_ado cn_mozab cn_kab cn_evoab2 cn_calc cn_odbc cn_mysql cn_jdbc cn_adabas cn_flat cn_dbase cn_hsqldb cn_macab NULL
+ 


More information about the ooo-build-commit mailing list