Author: ydario
Date: Thu Dec 14 09:39:35 2017
New Revision: 1818098
URL: http://svn.apache.org/viewvc?rev=1818098&view=rev
Log:
#i126518# build redland using autotools chain also on OS/2.
Added:
openoffice/trunk/main/redland/raptor/raptor2-2.0.15.patch.os2
openoffice/trunk/main/redland/redland/redland-1.0.17.patch.os2
Removed:
openoffice/trunk/main/redland/raptor/raptor-1.4.18.patch.os2
openoffice/trunk/main/redland/rasqal/rasqal-0.9.16.patch.os2
openoffice/trunk/main/redland/redland/redland-1.0.8.patch.os2
Modified:
openoffice/trunk/main/redland/raptor/makefile.mk
openoffice/trunk/main/redland/rasqal/makefile.mk
openoffice/trunk/main/redland/redland/makefile.mk
Modified: openoffice/trunk/main/redland/raptor/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/redland/raptor/makefile.mk?rev=1818098&r1=1818097&r2=1818098&view=diff
==============================================================================
--- openoffice/trunk/main/redland/raptor/makefile.mk (original)
+++ openoffice/trunk/main/redland/raptor/makefile.mk Thu Dec 14 09:39:35 2017
@@ -54,10 +54,14 @@ PATCH_FILES=$(OOO_PATCH_FILES)
.IF "$(OS)"=="OS2"
-BUILD_ACTION=dmake
-BUILD_DIR=$(CONFIGURE_DIR)/src
-ADDITIONAL_FILES+=src/windows.h
OOO_PATCH_FILES+=$(TARFILE_NAME).patch.os2
+CONFIGURE_DIR=
+CONFIGURE_ACTION=libtoolize && aclocal && autoconf && .$/configure
+# do not enable grddl parser (#i93768#)
+CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-openssl-digests
--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
--prefix=$(PWD)/$(OUT) --includedir=(PWD)$/$(INCCOM) --libdir=$(PWD)$/$(LB)
+BUILD_ACTION=$(GNUMAKE)
+BUILD_FLAGS+= -j$(EXTMAXPROCESS)
+BUILD_DIR=$(CONFIGURE_DIR)
.ELIF "$(OS)"=="WNT"
.IF "$(COM)"=="GCC"
OOO_PATCH_FILES+=$(TARFILE_NAME).patch.mingw
@@ -149,7 +153,8 @@ OUT2BIN+=src$/.libs$/*.dll
# if we use dmake, this is done automagically
.ENDIF
.ELIF "$(GUI)"=="OS2"
-# if we use dmake, this is done automagically
+OUT2LIB+=src$/.libs$/*.a
+OUT2BIN+=src$/.libs$/*.dll
.ELSE
OUT2LIB+=src$/.libs$/libraptor2.so.$(RAPTOR_MAJOR) src$/.libs$/libraptor2.so
.ENDIF
Added: openoffice/trunk/main/redland/raptor/raptor2-2.0.15.patch.os2
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/redland/raptor/raptor2-2.0.15.patch.os2?rev=1818098&view=auto
==============================================================================
--- openoffice/trunk/main/redland/raptor/raptor2-2.0.15.patch.os2 (added)
+++ openoffice/trunk/main/redland/raptor/raptor2-2.0.15.patch.os2 Thu Dec 14
09:39:35 2017
@@ -0,0 +1,15 @@
+--- misc/raptor2-2.0.15/docs/version.xml 2014-11-02 07:24:32.000000000
+0100
++++ misc/build/raptor2-2.0.15/docs/version.xml 2016-12-03 16:22:28.000000000
+0100
+@@ -1 +1 @@
+-2.0.15
++2.0.15
+--- misc/raptor2-2.0.15/src/sort_r.h 2014-10-10 01:00:44.000000000 +0200
++++ misc/build/raptor2-2.0.15/src/sort_r.h 2016-12-03 16:38:50.000000000
+0100
+@@ -22,6 +22,7 @@
+ #if (defined __APPLE__ || defined __MACH__ || defined __DARWIN__ || \
+ defined __FreeBSD__ || defined __BSD__ || defined __bsdi__ || \
+ defined OpenBSD3_1 || defined OpenBSD3_9 || defined __OpenBSD__ || \
++ defined __KLIBC__ || \
+ defined __NetBSD__ || \
+ defined __DragonFly__ || \
+ defined AMIGA)
Modified: openoffice/trunk/main/redland/rasqal/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/redland/rasqal/makefile.mk?rev=1818098&r1=1818097&r2=1818098&view=diff
==============================================================================
--- openoffice/trunk/main/redland/rasqal/makefile.mk (original)
+++ openoffice/trunk/main/redland/rasqal/makefile.mk Thu Dec 14 09:39:35 2017
@@ -55,10 +55,12 @@ PATCH_FILES=$(OOO_PATCH_FILES)
.IF "$(OS)"=="OS2"
-BUILD_ACTION=dmake
-BUILD_DIR=$(CONFIGURE_DIR)$/src
-ADDITIONAL_FILES+=src/windows.h
-OOO_PATCH_FILES+=$(TARFILE_NAME).patch.os2
+CONFIGURE_DIR=
+CONFIGURE_ACTION=libtoolize && aclocal && autoconf && .$/configure
RAPTOR2_CFLAGS=-I${PWD}$/..$/${INPATH}/inc
RAPTOR2_LIBS='-L${PWD}$/..$/${INPATH}/lib -lraptor2 -lxml2 -lcurl'
PKG_CONFIG_PATH='../raptor2-2.0.15;../rasqal-0.9.33'
+CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-regex-library=posix
--with-decimal=none
+BUILD_ACTION=$(GNUMAKE)
+BUILD_FLAGS+= -j$(EXTMAXPROCESS)
+BUILD_DIR=$(CONFIGURE_DIR)
.ELIF "$(OS)"=="WNT"
.IF "$(COM)"=="GCC"
rasqal_CC=$(CC) -mthreads
@@ -149,7 +151,8 @@ OUT2BIN+=src/rasqal-config
# if we use dmake, this is done automagically
.ENDIF
.ELIF "$(OS)"=="OS2"
-# if we use dmake, this is done automagically
+OUT2LIB+=src$/.libs$/*.a
+OUT2BIN+=src$/.libs$/*.dll
.ELSE
OUT2LIB+=src$/.libs$/librasqal.so.$(RASQAL_MAJOR) src$/.libs$/librasqal.so
OUT2BIN+=src/rasqal-config
Modified: openoffice/trunk/main/redland/redland/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/redland/redland/makefile.mk?rev=1818098&r1=1818097&r2=1818098&view=diff
==============================================================================
--- openoffice/trunk/main/redland/redland/makefile.mk (original)
+++ openoffice/trunk/main/redland/redland/makefile.mk Thu Dec 14 09:39:35 2017
@@ -56,10 +56,13 @@ PATCH_FILES=$(OOO_PATCH_FILES) \
.IF "$(OS)"=="OS2"
-BUILD_ACTION=dmake
-BUILD_DIR=$(CONFIGURE_DIR)$/librdf
-ADDITIONAL_FILES+=librdf/windows.h
OOO_PATCH_FILES+=$(TARFILE_NAME).patch.os2
+CONFIGURE_DIR=
+CONFIGURE_ACTION=libtoolize --force && aclocal && autoconf && .$/configure
RAPTOR2_CFLAGS=-I${PWD}$/..$/${INPATH}/inc
RAPTOR2_LIBS='-L${PWD}/..$/${INPATH}/lib -lraptor2 -lxml2 -lcurl'
PKG_CONFIG_PATH='../raptor2-2.0.15;../rasqal-0.9.33'
+CONFIGURE_FLAGS=--disable-dependency-tracking --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 -without-iodbc --without-unixodbc --without-datadirect
--without-virtuoso --with-regex-library=posix --with-decimal=none
--with-www=xml --disable-ltdl-install --disable-modular --without-included-ltdl
--disable-ltdl-convenience
+BUILD_ACTION=$(GNUMAKE)
+BUILD_FLAGS+= -j$(EXTMAXPROCESS)
+BUILD_DIR=$(CONFIGURE_DIR)
.ELIF "$(OS)"=="WNT"
.IF "$(COM)"=="GCC"
redland_CC=$(CC) -mthreads
@@ -166,7 +169,8 @@ OUT2BIN+=src$/.libs$/*.dll
# if we use dmake, this is done automagically
.ENDIF
.ELIF "$(OS)"=="OS2"
-# if we use dmake, this is done automagically
+OUT2LIB+=src$/.libs$/*.a
+OUT2BIN+=src$/.libs$/*.dll
.ELSE
OUT2LIB+=src$/.libs$/librdf.so.$(REDLAND_MAJOR)
.ENDIF
Added: openoffice/trunk/main/redland/redland/redland-1.0.17.patch.os2
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/redland/redland/redland-1.0.17.patch.os2?rev=1818098&view=auto
==============================================================================
--- openoffice/trunk/main/redland/redland/redland-1.0.17.patch.os2 (added)
+++ openoffice/trunk/main/redland/redland/redland-1.0.17.patch.os2 Thu Dec 14
09:39:35 2017
@@ -0,0 +1,44 @@
+--- misc/redland-1.0.17/configure.ac.0 2013-12-28 17:26:46.000000000 +0100
++++ misc/build/redland-1.0.17/configure.ac 2017-12-13 15:36:08.000000000
+0100
+@@ -121,9 +121,10 @@
+ m4_defun([AC_PROG_F77],[])
+
+ # Libtool and LTDL initialising
+-LT_CONFIG_LTDL_DIR([libltdl])
+-LT_INIT([dlopen])
+-LTDL_INIT([convenience])
++#LT_CONFIG_LTDL_DIR([libltdl])
++#LT_INIT([dlopen])
++#LTDL_INIT([convenience])
++LT_INIT
+
+ # Find a tar command for 'make dist'
+ AC_CHECK_PROGS(TAR, gnutar gtar tar)
+@@ -1275,7 +1275,7 @@
+ AC_CONFIG_FILES([redland-src-config], [chmod +x redland-src-config])
+
+ dnl Check for gtk-doc and docbook
+-GTK_DOC_CHECK([1.3])
++#GTK_DOC_CHECK([1.3])
+
+ AC_OUTPUT
+
+--- misc/redland-1.0.17/makefile.in.0 2013-12-28 17:26:46.000000000 +0100
++++ misc/build/redland-1.0.17/makefile.in 2017-12-13 15:36:08.000000000
+0100
+@@ -383,7 +383,6 @@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+-subdirs = @subdirs@
+ sys_symbol_underscore = @sys_symbol_underscore@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+@@ -399,7 +399,7 @@
+ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
+
+ # Subdirectories to build/install/distribute etc.
+-SUBDIRS = $(subdirs) src examples utils demos docs data scripts
++SUBDIRS = $(subdirs) src examples utils demos data scripts
+ EXTRA_DIST = \
+ ChangeLog.1 ChangeLog.2 ChangeLog.3 ChangeLog.4 \
+ ChangeLog.5 ChangeLog.6 ChangeLog.7 ChangeLog.8 ChangeLog.9 ChangeLog.10 \
