[Libreoffice-commits] .: 4 commits - libtextcat/libtextcat-2.2.patch libtextcat/makefile.mk lpsolve/lp_solve_5.5.patch lpsolve/makefile.mk lpsolve/prj redland/raptor redland/rasqal redland/redland
Tor Lillqvist
tml at kemper.freedesktop.org
Fri May 13 14:46:50 PDT 2011
libtextcat/libtextcat-2.2.patch | 19 +++++++++++++++++++
libtextcat/makefile.mk | 6 ++++++
lpsolve/lp_solve_5.5.patch | 15 +++++++++++++++
lpsolve/makefile.mk | 6 +++++-
lpsolve/prj/d.lst | 1 +
redland/raptor/makefile.mk | 19 ++++++++++++++++++-
redland/raptor/raptor-1.4.18.patch.cross | 23 +++++++++++++++++++++++
redland/rasqal/makefile.mk | 13 ++++++++++++-
redland/redland/makefile.mk | 12 +++++++++++-
9 files changed, 110 insertions(+), 4 deletions(-)
New commits:
commit a5c6b32915cb40e7eb515134a56df7d931c53395
Author: Tor Lillqvist <tml at iki.fi>
Date: Sat May 14 00:46:20 2011 +0300
Cross-compilation and iOS support
diff --git a/libtextcat/makefile.mk b/libtextcat/makefile.mk
index 83a1e42..a6198c5 100644
--- a/libtextcat/makefile.mk
+++ b/libtextcat/makefile.mk
@@ -64,6 +64,12 @@ CONFIGURE_FLAGS=$(eq,$(OS),MACOSX CPPFLAGS="$(EXTRA_CDEFS)" $(NULL))
.IF "$(OS)"=="AIX"
CONFIGURE_FLAGS+= CFLAGS=-D_LINUX_SOURCE_COMPAT
.ENDIF
+.IF "$(OS)"=="IOS"
+CONFIGURE_FLAGS+= --disable-shared
+.ENDIF
+.IF "$(CROSS_COMPILING)"!=""
+CONFIGURE_FLAGS+= --build="$(BUILD_PLATFORM)" --host="$(HOST_PLATFORM)"
+.ENDIF
BUILD_ACTION=make
commit c5917ecd491d6d558e5c812ae873427c4b0118f0
Author: Tor Lillqvist <tml at iki.fi>
Date: Sat May 14 00:44:42 2011 +0300
Add rpl_malloc() and rpl_realloc() functions
diff --git a/libtextcat/libtextcat-2.2.patch b/libtextcat/libtextcat-2.2.patch
index ca7a26c..03385e8 100644
--- a/libtextcat/libtextcat-2.2.patch
+++ b/libtextcat/libtextcat-2.2.patch
@@ -366,6 +366,25 @@
lastnonspace = w;
}
*w++ = *p++;
+@@ -386,3 +386,18 @@
+ return dest;
+ }
+
++void *
++rpl_malloc (size_t n)
++{
++ if (n == 0)
++ n = 1;
++ return malloc (n);
++}
++
++void *
++rpl_realloc (void *ptr, size_t n)
++{
++ if (n == 0)
++ n = 1;
++ return realloc (ptr, n);
++}
--- misc/libtextcat-2.2/src/common.h Thu May 22 15:02:29 2003
+++ misc/build/libtextcat-2.2/src/common.h Mon Mar 31 11:29:14 2008
@@ -1,28 +1,28 @@
commit b74f81c18e1259511afa01e56e0d000e8a6bcf5a
Author: Tor Lillqvist <tml at iki.fi>
Date: Fri May 13 20:17:05 2011 +0300
Cross-compile redland for iOS
diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk
index bbedd36..1ee2ae5 100644
--- a/redland/raptor/makefile.mk
+++ b/redland/raptor/makefile.mk
@@ -59,6 +59,11 @@ OOO_PATCH_FILES= \
$(TARFILE_NAME).patch.win32 \
raptor-aix.patch
+.IF "$(CROSS_COMPILING)"!=""
+OOO_PATCH_FILES += \
+ $(TARFILE_NAME).patch.cross
+.ENDIF
+
PATCH_FILES=$(OOO_PATCH_FILES)
@@ -129,9 +134,18 @@ XSLTLIB!:=$(XSLTLIB) # expand dmake variables for xslt-config
.EXPORT: XSLTLIB
CONFIGURE_DIR=
+.IF "$(OS)"=="IOS"
+CONFIGURE_ACTION=autoconf; .$/configure
+CONFIGURE_FLAGS=--disable-shared
+.ELSE
CONFIGURE_ACTION=.$/configure
+CONFIGURE_FKAGS=--disable-static
+.ENDIF
# do not enable grddl parser (#i93768#)
-CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --enable-parsers="rdfxml ntriples turtle trig guess rss-tag-soup" --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=xml
+CONFIGURE_FLAGS+= --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --enable-parsers="rdfxml ntriples turtle trig guess rss-tag-soup" --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=xml
+.IF "$(CROSS_COMPILING)"!=""
+CONFIGURE_FLAGS+= --build="$(BUILD_PLATFORM)" --host="$(HOST_PLATFORM)"
+.ENDIF
BUILD_ACTION=$(GNUMAKE)
BUILD_FLAGS+= -j$(EXTMAXPROCESS)
BUILD_DIR=$(CONFIGURE_DIR)
@@ -143,6 +157,9 @@ OUT2INC+=src$/raptor.h
.IF "$(OS)"=="MACOSX"
OUT2LIB+=src$/.libs$/libraptor.$(RAPTOR_MAJOR).dylib src$/.libs$/libraptor.dylib
OUT2BIN+=src/raptor-config
+.ELIF "$(OS)"=="IOS"
+OUT2LIB+=src$/.libs$/libraptor.a
+OUT2BIN+=src/raptor-config
.ELIF "$(OS)"=="AIX"
OUT2LIB+=src$/.libs$/libraptor.so.$(RAPTOR_MAJOR) src$/.libs$/libraptor.so
OUT2BIN+=src/raptor-config
diff --git a/redland/raptor/raptor-1.4.18.patch.cross b/redland/raptor/raptor-1.4.18.patch.cross
new file mode 100644
index 0000000..5262dc1
--- /dev/null
+++ b/redland/raptor/raptor-1.4.18.patch.cross
@@ -0,0 +1,23 @@
+--- misc/raptor-1.4.18/configure.ac
++++ misc/build/raptor-1.4.18/configure.ac
+@@ -295,7 +295,9 @@
+ return is_c99("1234567");
+ }], AC_MSG_RESULT(no),
+ AC_DEFINE(HAVE_C99_VSNPRINTF, 1, [vsnprint has C99 compatible return value])
+- AC_MSG_RESULT(yes))
++ AC_MSG_RESULT(yes),
++ AC_DEFINE(HAVE_C99_VSNPRINTF, 1, [vsnprint has C99 compatible return value])
++ AC_MSG_RESULT([guessing yes]))
+ fi
+
+ need_libm=no
+@@ -456,7 +458,8 @@
+ AC_DEFINE(EXPAT_UTF8_BOM_CRASH, 1, [does expat crash when it sees an initial UTF8 BOM?])
+ AC_MSG_RESULT(no)
+ AC_MSG_WARN(The available expat crashes on XML UTF-8 BOM in documents)
+- AC_MSG_WARN(Fix either by using libxml or expat 1.95.2+))
++ AC_MSG_WARN(Fix either by using libxml or expat 1.95.2+),
++ AC_MSG_RESULT(guessing yes))
+
+ else
+ AC_MSG_RESULT(no)
diff --git a/redland/rasqal/makefile.mk b/redland/rasqal/makefile.mk
index a4c2187..9956dac 100644
--- a/redland/rasqal/makefile.mk
+++ b/redland/rasqal/makefile.mk
@@ -127,7 +127,15 @@ XSLTLIB!:=$(XSLTLIB) # expand dmake variables for xslt-config
CONFIGURE_DIR=
CONFIGURE_ACTION=.$/configure PATH="..$/..$/..$/bin:$$PATH"
-CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=xml
+.IF "$(OS)"=="IOS"
+CONFIGURE_FLAGS=--disable-shared
+.ELSE
+CONFIGURE_FLAGS=--disable-static
+.ENDIF
+CONFIGURE_FLAGS+= --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=xml
+.IF "$(CROSS_COMPILING)"!=""
+CONFIGURE_FLAGS+= --build="$(BUILD_PLATFORM)" --host="$(HOST_PLATFORM)"
+.ENDIF
BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) $(GNUMAKE)
BUILD_FLAGS+= -j$(EXTMAXPROCESS)
BUILD_DIR=$(CONFIGURE_DIR)
@@ -139,6 +147,9 @@ OUT2INC+=src$/rasqal.h
.IF "$(OS)"=="MACOSX"
OUT2LIB+=src$/.libs$/librasqal.$(RASQAL_MAJOR).dylib src$/.libs$/librasqal.dylib
OUT2BIN+=src/rasqal-config
+.ELIF "$(OS)"=="IOS"
+OUT2LIB+=src$/.libs$/librasqal.a
+OUT2BIN+=src/rasqal-config
.ELIF "$(OS)"=="WNT"
.IF "$(COM)"=="GCC"
OUT2LIB+=src$/.libs$/*.a
diff --git a/redland/redland/makefile.mk b/redland/redland/makefile.mk
index c8a04dc..cbe9b4e 100644
--- a/redland/redland/makefile.mk
+++ b/redland/redland/makefile.mk
@@ -131,7 +131,15 @@ XSLTLIB!:=$(XSLTLIB) # expand dmake variables for xslt-config
CONFIGURE_DIR=
CONFIGURE_ACTION=.$/configure PATH="..$/..$/..$/bin:$$PATH"
-CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --with-raptor=system --with-rasqual=system --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=xml
+.IF "$(OS)"=="IOS"
+CONFIGURE_FLAGS=--disable-shared
+.ELSE
+CONFIGURE_FKAGS=--disable-static
+.ENDIF
+CONFIGURE_FLAGS+= --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --with-raptor=system --with-rasqual=system --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=xml
+.IF "$(CROSS_COMPILING)"!=""
+CONFIGURE_FLAGS+= --build="$(BUILD_PLATFORM)" --host="$(HOST_PLATFORM)"
+.ENDIF
BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) $(GNUMAKE)
BUILD_FLAGS+= -j$(EXTMAXPROCESS)
BUILD_DIR=$(CONFIGURE_DIR)
@@ -142,6 +150,8 @@ OUT2INC+=librdf$/*.h
.IF "$(OS)"=="MACOSX"
OUT2LIB+=librdf$/.libs$/librdf.$(REDLAND_MAJOR).dylib
+.ELIF "$(OS)"=="IOS"
+OUT2LIB+=librdf$/.libs$/librdf.a
.ELIF "$(OS)"=="WNT"
.IF "$(COM)"=="GCC"
OUT2LIB+=librdf$/.libs$/*.a
commit 114289e7c6216e3e99c9595b4931cb48f996996d
Author: Tor Lillqvist <tml at iki.fi>
Date: Fri May 13 19:42:28 2011 +0300
Cross-compile lpsolve for iOS
diff --git a/lpsolve/lp_solve_5.5.patch b/lpsolve/lp_solve_5.5.patch
index c6c7806..e9e7f19 100644
--- a/lpsolve/lp_solve_5.5.patch
+++ b/lpsolve/lp_solve_5.5.patch
@@ -92,3 +92,18 @@
+fi
+
+rm *.o 2>/dev/null
+--- misc/build/lp_solve_5.5/lpsolve55/ccc.ios
++++ misc/build/lp_solve_5.5/lpsolve55/ccc.ios
+@@ -1,1 +1,11 @@
+-dummy
++src='../lp_MDO.c ../shared/commonlib.c ../shared/mmio.c ../shared/myblas.c ../ini.c ../fortify.c ../colamd/colamd.c ../lp_rlp.c ../lp_crash.c ../bfp/bfp_LUSOL/lp_LUSOL.c ../bfp/bfp_LUSOL/LUSOL/lusol.c ../lp_Hash.c ../lp_lib.c ../lp_wlp.c ../lp_matrix.c ../lp_mipbb.c ../lp_MPS.c ../lp_params.c ../lp_presolve.c ../lp_price.c ../lp_pricePSE.c ../lp_report.c ../lp_scale.c ../lp_simplex.c ../lp_SOS.c ../lp_utils.c ../yacc_read.c'
++obj=`echo $src|sed -e 's/\.c/.o/g' -e 's!\([^ ]*/\)*!!g'`
++
++opts='-O3'
++
++def=
++
++$CC -I.. -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd -I../shared $opts $def -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine -c $src
++ls -l
++ar -r liblpsolve55.a $obj
++rm $obj
diff --git a/lpsolve/makefile.mk b/lpsolve/makefile.mk
index 9eb0120..de43397 100644
--- a/lpsolve/makefile.mk
+++ b/lpsolve/makefile.mk
@@ -45,7 +45,7 @@ PATCH_FILES=lp_solve_5.5-windows.patch
PATCH_FILES=\
lp_solve_5.5.patch \
lp_solve-aix.patch
-ADDITIONAL_FILES=lpsolve55$/ccc.solaris lpsolve55$/ccc.os2
+ADDITIONAL_FILES=lpsolve55$/ccc.solaris lpsolve55$/ccc.ios lpsolve55$/ccc.os2
.ENDIF
.IF "$(OS)"=="OPENBSD"
@@ -79,6 +79,10 @@ OUT2LIB=$(BUILD_DIR)$/liblpsolve55.lib
.EXPORT: EXTRA_CDEFS EXTRA_LINKFLAGS
BUILD_ACTION=sh ccc.osx
OUT2LIB=$(BUILD_DIR)$/liblpsolve55.dylib
+.ELIF "$(OS)"=="IOS"
+.EXPORT: EXTRA_CDEFS EXTRA_LINKFLAGS
+BUILD_ACTION=sh ccc.ios
+OUT2LIB=$(BUILD_DIR)$/liblpsolve55.a
.ELSE
.IF "$(COMNAME)"=="sunpro5"
BUILD_ACTION=sh ccc.solaris
diff --git a/lpsolve/prj/d.lst b/lpsolve/prj/d.lst
index 64b8c0c..cb52247 100644
--- a/lpsolve/prj/d.lst
+++ b/lpsolve/prj/d.lst
@@ -4,6 +4,7 @@ mkdir: %_DEST%\inc%_EXT%\lpsolve
..\%__SRC%\lib\liblpsolve55.so %_DEST%\lib%_EXT%\liblpsolve55.so
..\%__SRC%\lib\liblpsolve55.dylib %_DEST%\lib%_EXT%\liblpsolve55.dylib
..\%__SRC%\lib\liblpsolve55.lib %_DEST%\lib%_EXT%\liblpsolve55.lib
+..\%__SRC%\lib\liblpsolve55.a %_DEST%\lib%_EXT%\liblpsolve55.a
..\%__SRC%\lib\lpsolve55.lib %_DEST%\lib%_EXT%\lpsolve55.lib
..\%__SRC%\bin\lpsolve55.dll %_DEST%\bin%_EXT%\lpsolve55.dll
More information about the Libreoffice-commits
mailing list