[Eliot-dev] eliot/extras/contrib Makefile arabica-no-exampl...

[Olivier Teulière]

CVSROOT:        /cvsroot/eliot
Module name:    eliot
Changes by:     Olivier Teulière <ipkiss>       11/01/16 21:41:38

Modified files:
        extras/contrib : Makefile arabica-no-example.patch 
Added files:
        extras/contrib : log4cxx-build-fixes.patch 
                         log4cxx-no-example.patch 

Log message:
        Updated the dependencies, and added rules to build log4cxx and its 
dependencies.
        Note: a few fixes are still needed to enable logging in the win32 
builds.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/eliot/extras/contrib/Makefile?cvsroot=eliot&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/eliot/extras/contrib/arabica-no-example.patch?cvsroot=eliot&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/eliot/extras/contrib/log4cxx-build-fixes.patch?cvsroot=eliot&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/eliot/extras/contrib/log4cxx-no-example.patch?cvsroot=eliot&rev=1.1

Patches:
Index: Makefile
===================================================================
RCS file: /cvsroot/eliot/eliot/extras/contrib/Makefile,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- Makefile    6 Dec 2009 00:07:35 -0000       1.9
+++ Makefile    16 Jan 2011 21:41:38 -0000      1.10
@@ -1,11 +1,14 @@
-ICONV_VERSION = 1.12
-LIBCONFIG_VERSION = 1.3.2
-BOOST_VERSION = 1_39_0
+ICONV_VERSION = 1.13.1
+LIBCONFIG_VERSION = 1.4.6
+BOOST_VERSION = 1_42_0
 QT_VERSION = 4.5.3
 EXPAT_VERSION = 2.0.1
-ARABICA_VERSION = 2009-march
-LIBXML2_VERSION = 2.7.5
-XERCES_VERSION = 3.0.1
+ARABICA_VERSION = 2010-November
+LIBXML2_VERSION = 2.7.8
+XERCES_VERSION = 3.1.1
+APR_VERSION = 1.4.2
+APU_VERSION = 1.3.10
+LOG4CXX_VERSION = 0.10.0
 
 
 PREFIX = $(shell pwd)/inst
@@ -20,7 +23,7 @@
 
 .PHONY: help all
 
-all: .iconv .boost .qt .libconfig .expat .arabica
+all: .iconv .boost .qt .apr .apu .log4cxx .libconfig .expat .arabica
 
 help:
        @echo "Usage: make all"
@@ -48,6 +51,60 @@
        touch $@
 
 
+### APR (needed by log4cxx) ###
+
+APR_DIR = apr-$(APR_VERSION)
+APR_DIR_FLAG = $(APR_DIR)/.flag
+APR_ARCHIVE = apr-$(APR_VERSION).tar.bz2
+
+$(APR_ARCHIVE): $(PREFIX_FLAG)
+       $(WGET) http://www.motorlogy.com/apachemirror/apr/$@
+
+$(APR_DIR_FLAG): $(APR_ARCHIVE)
+       tar xjf $<
+       touch $@
+
+.apr: $(APR_DIR_FLAG)
+       (cd $(APR_DIR) && $(CONFIGURE) --enable-static --disable-shared && make 
&& make install)
+       touch $@
+
+
+### APU (needed by log4cxx) ###
+
+APU_DIR = apr-util-$(APU_VERSION)
+APU_DIR_FLAG = $(APU_DIR)/.flag
+APU_ARCHIVE = apr-util-$(APU_VERSION).tar.bz2
+
+$(APU_ARCHIVE): $(PREFIX_FLAG)
+       $(WGET) http://www.motorlogy.com/apachemirror/apr/$@
+
+$(APU_DIR_FLAG): $(APU_ARCHIVE)
+       tar xjf $<
+       touch $@
+
+.apu: $(APU_DIR_FLAG)
+       (cd $(APU_DIR) && $(CONFIGURE) --with-apr=$(PREFIX) --enable-static 
--disable-shared && make && make install)
+       touch $@
+
+
+### log4cxx ###
+
+LOG4CXX_DIR = apache-log4cxx-$(LOG4CXX_VERSION)
+LOG4CXX_DIR_FLAG = $(LOG4CXX_DIR)/.flag
+LOG4CXX_ARCHIVE = apache-log4cxx-$(LOG4CXX_VERSION).tar.gz
+
+$(LOG4CXX_ARCHIVE): $(PREFIX_FLAG)
+       $(WGET) http://apache.cyberuse.com/logging/log4cxx/$(LOG4CXX_VERSION)/$@
+
+$(LOG4CXX_DIR_FLAG): $(LOG4CXX_ARCHIVE)
+       tar xzf $<
+       touch $@
+
+.log4cxx: $(LOG4CXX_DIR_FLAG)
+       (cd $(LOG4CXX_DIR) && patch -p0 < ../log4cxx-no-example.patch && patch 
-p0 < ../log4cxx-build-fixes.patch && $(CONFIGURE) --with-apr=$(PREFIX) 
--with-apu=$(PREFIX) --disable-doxygen --disable-dot --enable-static 
--disable-shared && make && make install)
+       touch $@
+
+
 ### libconfig ###
 
 LIBCONFIG_DIR = libconfig-$(LIBCONFIG_VERSION)
@@ -62,7 +119,7 @@
        touch $@
 
 .libconfig: $(LIBCONFIG_DIR_FLAG)
-       (cd $(LIBCONFIG_DIR) && CFLAGS=-DLIBCONFIG_STATIC 
CXXFLAGS=-DLIBCONFIG_STATIC $(CONFIGURE) --enable-static --disable-shared && 
make && make install)
+       (cd $(LIBCONFIG_DIR) && CFLAGS=-DLIBCONFIG_STATIC 
CXXFLAGS=-DLIBCONFIG_STATIC $(CONFIGURE) --disable-examples --enable-static 
--disable-shared && make && make install)
        touch $@
 
 
@@ -114,7 +171,7 @@
 EXPAT_ARCHIVE = expat-$(EXPAT_VERSION).tar.gz
 
 $(EXPAT_ARCHIVE): $(PREFIX_FLAG)
-       $(WGET) 
http://downloads.sourceforge.net/project/expat/expat/$(EXPAT_VERSION)/address@hidden
+       $(WGET) http://kent.dl.sf.net/project/expat/expat/$(EXPAT_VERSION)/$@
 
 $(EXPAT_DIR_FLAG): $(EXPAT_ARCHIVE)
        tar xzf $<
@@ -132,7 +189,7 @@
 ARABICA_ARCHIVE = arabica-$(ARABICA_VERSION).tar.bz2
 
 $(ARABICA_ARCHIVE): $(PREFIX_FLAG)
-       $(WGET) 
http://downloads.sourceforge.net/project/arabica/arabica/March-09/address@hidden
+       $(WGET) http://downloads.sf.net/project/arabica/arabica/November-10/$@
 
 $(ARABICA_DIR_FLAG): $(ARABICA_ARCHIVE)
        tar xjf $<

Index: arabica-no-example.patch
===================================================================
RCS file: /cvsroot/eliot/eliot/extras/contrib/arabica-no-example.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- arabica-no-example.patch    24 Jan 2010 15:39:01 -0000      1.1
+++ arabica-no-example.patch    16 Jan 2011 21:41:38 -0000      1.2
@@ -1,11 +1,11 @@
---- Makefile.in.orig   2009-10-04 15:42:50.000000000 +0200
-+++ Makefile.in        2009-10-04 15:42:59.000000000 +0200
-@@ -209,7 +209,7 @@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
+--- Makefile.in.orig   2011-01-16 00:31:54.000000000 +0100
++++ Makefile.in        2011-01-16 00:32:05.000000000 +0100
+@@ -261,7 +261,7 @@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
  ACLOCAL_AMFLAGS = -I m4
--SUBDIRS = src examples tests
-+SUBDIRS = src #examples tests
- DIST_SUBDIRS = src examples tests
+-SUBDIRS = include src examples tests
++SUBDIRS = include src #examples tests
+ DIST_SUBDIRS = include src examples tests 
  EXTRA_DIST = vs7 \
             vs8 \

Index: log4cxx-build-fixes.patch
===================================================================
RCS file: log4cxx-build-fixes.patch
diff -N log4cxx-build-fixes.patch
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ log4cxx-build-fixes.patch   16 Jan 2011 21:41:38 -0000      1.1
@@ -0,0 +1,46 @@
+# Chunks 1 and 2 are already in log4cxx SVN, but version 0.10.0 does not 
contain them
+--- src/main/cpp/inputstreamreader.cpp.orig    2011-01-16 10:11:26.000000000 
+0100
++++ src/main/cpp/inputstreamreader.cpp 2011-01-16 01:12:20.000000000 +0100
+@@ -15,6 +15,7 @@
+  * limitations under the License.
+  */
+ 
++#include <cstring>
+ #include <log4cxx/logstring.h>
+ #include <log4cxx/helpers/inputstreamreader.h>
+ #include <log4cxx/helpers/exception.h>
+--- src/main/cpp/socketoutputstream.cpp.orig   2011-01-16 10:11:20.000000000 
+0100
++++ src/main/cpp/socketoutputstream.cpp        2011-01-16 01:15:07.000000000 
+0100
+@@ -15,6 +15,7 @@
+  * limitations under the License.
+  */
+ 
++#include <cstring>
+ #include <log4cxx/logstring.h>
+ #include <log4cxx/helpers/socketoutputstream.h>
+ #include <log4cxx/helpers/socket.h>
+# I should send them this patch
+--- liblog4cxx.pc.in.orig      2011-01-16 20:19:22.000000000 +0100
++++ liblog4cxx.pc.in   2011-01-16 20:20:00.000000000 +0100
+@@ -22,4 +22,5 @@
+ Version: @VERSION@
+ Libs: -L${libdir} -llog4cxx
+ Cflags: -I${includedir}
++Requires.private: apr-util-1
+ 
+# Found here: http://www.mail-archive.com/address@hidden/msg02691.html
+--- src/main/include/log4cxx/helpers/thread.h.orig     2011-01-16 
10:09:45.000000000 +0100
++++ src/main/include/log4cxx/helpers/thread.h  2011-01-16 10:10:01.000000000 
+0100
+@@ -22,12 +22,8 @@
+ #include <log4cxx/helpers/pool.h>
+ 
+ #if !defined(LOG4CXX_THREAD_FUNC)
+-#if defined(_WIN32)
+-#define LOG4CXX_THREAD_FUNC __stdcall
+-#else
+ #define LOG4CXX_THREAD_FUNC
+ #endif
+-#endif
+ 
+ extern "C" {
+     typedef struct apr_thread_t apr_thread_t;

Index: log4cxx-no-example.patch
===================================================================
RCS file: log4cxx-no-example.patch
diff -N log4cxx-no-example.patch
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ log4cxx-no-example.patch    16 Jan 2011 21:41:38 -0000      1.1
@@ -0,0 +1,11 @@
+--- src/Makefile.in.orig       2011-01-16 01:24:41.000000000 +0100
++++ src/Makefile.in    2011-01-16 01:23:48.000000000 +0100
+@@ -209,7 +209,7 @@
+ # See the License for the specific language governing permissions and
+ # limitations under the License.
+ #
+-SUBDIRS = main examples site test
++SUBDIRS = main #examples site test
+ all: all-recursive
+ 
+ .SUFFIXES: