[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - redland/raptor redland/rasqal redland/redland solenv/gbuild
Yuri Dario
ydario at apache.org
Thu Dec 14 11:11:16 UTC 2017
redland/raptor/makefile.mk | 13 ++++++---
redland/raptor/raptor-1.4.18.patch.os2 | 11 -------
redland/raptor/raptor2-2.0.15.patch.os2 | 15 ++++++++++
redland/rasqal/makefile.mk | 13 +++++----
redland/rasqal/rasqal-0.9.16.patch.os2 | 5 ---
redland/redland/makefile.mk | 12 +++++---
redland/redland/redland-1.0.17.patch.os2 | 44 +++++++++++++++++++++++++++++++
redland/redland/redland-1.0.8.patch.os2 | 12 --------
solenv/gbuild/BuildDirs.mk | 5 +++
solenv/gbuild/Output.mk | 14 ++++++++-
10 files changed, 101 insertions(+), 43 deletions(-)
New commits:
commit 21dad5bff119504c4a389c925951ba9593a730ea
Author: Yuri Dario <ydario at apache.org>
Date: Thu Dec 14 09:48:54 2017 +0000
#i126518# OS/2 environment vars are uppercase, breaks gnu make rules. Ignore escape sequence.
diff --git a/solenv/gbuild/BuildDirs.mk b/solenv/gbuild/BuildDirs.mk
index eb0a91aa99fb..db8e459ec130 100644
--- a/solenv/gbuild/BuildDirs.mk
+++ b/solenv/gbuild/BuildDirs.mk
@@ -32,6 +32,11 @@ ifneq ($(and $(gb_LOCALBUILDDIR),$(wildcard $(gb_LOCALBUILDDIR)/SetupLocal.mk)),
include $(gb_LOCALBUILDDIR)/SetupLocal.mk
endif
+# env variables names are uppercase only
+ifeq ($(OS),OS2)
+gb_REPOS = $(GB_REPOS)
+endif
+
ifeq ($(strip $(gb_REPOS)),)
gb_REPOS := $(SOLARSRC)
endif
diff --git a/solenv/gbuild/Output.mk b/solenv/gbuild/Output.mk
index 8db587733c55..62acd486201c 100644
--- a/solenv/gbuild/Output.mk
+++ b/solenv/gbuild/Output.mk
@@ -49,8 +49,18 @@ define gb_Output_warn
$(warning $(NEWLINE)[ WARN $(2) ] !!!$(NEWLINE)[ WARN $(2) ] !!! $(1)$(NEWLINE)[ WARN $(2) ] !!!)
endef
-gb_Output_ESCAPE := $(shell echo|awk 'BEGIN { printf "%c", 27 }' -)
-gb_Output_BELL := $(shell echo|awk 'BEGIN { printf "%c", 7 }' -)
+# env variables names are uppercase only
+ifeq ($(OS),OS2)
+gb_COLOR = $(GB_COLOR)
+gb_TITLES = $(GB_TITLES)
+endif
+
+# disable for OS/2
+ifneq ($(OS),OS2)
+gb_Output_ESCAPE := $(shell echo|$(gb_AWK) 'BEGIN { printf "%c", 27 }' -)
+gb_Output_BELL := $(shell echo|$(gb_AWK) 'BEGIN { printf "%c", 7 }' -)
+endif
+
# only enable colorized output if
# - gb_COLOR is set
commit e7141775b1bc46f65f7d60291d4f326ebecab608
Author: Yuri Dario <ydario at apache.org>
Date: Thu Dec 14 09:39:35 2017 +0000
#i126518# build redland using autotools chain also on OS/2.
diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk
index ed221e7d5ea5..a9b42427181f 100644
--- a/redland/raptor/makefile.mk
+++ b/redland/raptor/makefile.mk
@@ -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
diff --git a/redland/raptor/raptor-1.4.18.patch.os2 b/redland/raptor/raptor-1.4.18.patch.os2
deleted file mode 100644
index c424810674b4..000000000000
--- a/redland/raptor/raptor-1.4.18.patch.os2
+++ /dev/null
@@ -1,11 +0,0 @@
---- misc/raptor-1.4.18/src/windos.h Thu Nov 6 15:25:51 2008
-+++ misc/build/raptor-1.4.18/src/windows.h Thu Nov 6 15:33:14 2008
-@@ -1,1 +1,7 @@
--dummy
-+#define BOOL
-+#define APIENTRY
-+#define HANDLE int
-+#define DWORD int
-+#define LPVOID void*
-+#define TRUE 1
-+#define FALSE 0
diff --git a/redland/raptor/raptor2-2.0.15.patch.os2 b/redland/raptor/raptor2-2.0.15.patch.os2
new file mode 100644
index 000000000000..27dc716c6e26
--- /dev/null
+++ b/redland/raptor/raptor2-2.0.15.patch.os2
@@ -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)
diff --git a/redland/rasqal/makefile.mk b/redland/rasqal/makefile.mk
index 3ca9d8cb257b..bcb66f6ea6b6 100644
--- a/redland/rasqal/makefile.mk
+++ b/redland/rasqal/makefile.mk
@@ -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
diff --git a/redland/rasqal/rasqal-0.9.16.patch.os2 b/redland/rasqal/rasqal-0.9.16.patch.os2
deleted file mode 100644
index 56c82e90b217..000000000000
--- a/redland/rasqal/rasqal-0.9.16.patch.os2
+++ /dev/null
@@ -1,5 +0,0 @@
---- misc/rasqal-0.9.16/src/windos.h Thu Nov 6 15:25:51 2008
-+++ misc/build/rasqal-0.9.16/src/windows.h Thu Nov 6 15:33:14 2008
-@@ -1,1 +1,1 @@
--dummy
-+/* dummy */
diff --git a/redland/redland/makefile.mk b/redland/redland/makefile.mk
index b3756d7c7e55..46bc9688e925 100644
--- a/redland/redland/makefile.mk
+++ b/redland/redland/makefile.mk
@@ -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
diff --git a/redland/redland/redland-1.0.17.patch.os2 b/redland/redland/redland-1.0.17.patch.os2
new file mode 100644
index 000000000000..d9c704ec20e2
--- /dev/null
+++ b/redland/redland/redland-1.0.17.patch.os2
@@ -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 \
diff --git a/redland/redland/redland-1.0.8.patch.os2 b/redland/redland/redland-1.0.8.patch.os2
deleted file mode 100644
index 8b079ed46022..000000000000
--- a/redland/redland/redland-1.0.8.patch.os2
+++ /dev/null
@@ -1,12 +0,0 @@
---- misc/redland-1.0.8/librdf/windos.h Thu Nov 6 15:25:51 2008
-+++ misc/build/redland-1.0.8/librdf/windows.h Thu Nov 6 15:33:14 2008
-@@ -1,1 +1,8 @@
--dummy
-+#define BOOL
-+#define APIENTRY
-+#define HANDLE int
-+#define DWORD int
-+#define LPVOID void*
-+#define TRUE 1
-+#define FALSE 0
-+typedef unsigned long long __int64;
More information about the Libreoffice-commits
mailing list