[ooo-build-commit] .: patches/dev300

[Petr Mladek]

 patches/dev300/apply             |    3 +++
 patches/dev300/piece-mysqlc.diff |   19 +++++++++++++++++++
 2 files changed, 22 insertions(+)

New commits:
commit 5b66f330e1b32a7ee94fd82fd9ec832f95cacea9
Author: Petr Mladek <pmladek at suse.cz>
Date:   Thu Apr 15 20:08:12 2010 +0200

    mysqlc split build
    
    * patches/dev300/piece-mysqlc.diff:
    * patches/dev300/apply: set paths to the piece solver where needed

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 0e6f564..874f99e 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3667,6 +3667,9 @@ piece-scripting.diff
 piece-helpcontent2.diff
 piece-sdext.diff
 piece-swext.diff
+[ PieceBits >= ooo320-m14 ]
+piece-mysqlc.diff
+[ PieceBits ]
 piece-writerfilter.diff
 piece-ridljar.diff
 piece-offapi.diff
diff --git a/patches/dev300/piece-mysqlc.diff b/patches/dev300/piece-mysqlc.diff
new file mode 100644
index 0000000..d16151b
--- /dev/null
+++ b/patches/dev300/piece-mysqlc.diff
@@ -0,0 +1,19 @@
+--- mysqlc/source/makefile.mk.old	2010-04-15 18:37:58.000000000 +0200
++++ mysqlc/source/makefile.mk	2010-04-15 18:56:14.000000000 +0200
+@@ -143,14 +143,14 @@ CDEFS += -DCPPCONN_LIB=\"$(shell readlin
+     .ELSE
+       MYSQL_LIB+=-rdynamic -lz -lcrypt -lnsl -lm
+     .ENDIF
+-    MYSQL_CPPCONNFILE=$(SOLARLIBDIR)$/$(DLLPRE)mysqlcppconn$(DLLPOST)
++    MYSQL_CPPCONNFILE=$(SOLARPIECE)$/$(INPATH)$/lib$/$(DLLPRE)mysqlcppconn$(DLLPOST)
+   .ELSE
+     MYSQL_CPPCONN_LIB+=-lmysqlcppconn
+   .ENDIF
+ .ENDIF
+ 
+ .IF "$(SYSTEM_MYSQL_CPPCONN)" != "YES"
+-  MYSQL_INC+=-I$(SOLARINCDIR)$/mysqlcppconn -I$(SOLARINCDIR)$/mysqlcppconn/cppconn
++  MYSQL_INC+=-I$(SOLARPIECE)$/$(INPATH)$/inc$/mysqlcppconn -I$(SOLARPIECE)$/$(INPATH)$/inc$/mysqlcppconn/cppconn
+ .ENDIF
+ 
+ CFLAGS+=-I..$/..$/inc $(MYSQL_INC) \