mirror of
git://git.savannah.nongnu.org/eliot.git
synced 2024-12-25 21:59:30 +01:00
Update contribs (everything except Qt)
This commit is contained in:
Olivier Teuliere
parent
b2cf69e3af
commit
ce35dc43d1
2 changed files with 54 additions and 30 deletions
|
|
@ -1,9 +1,9 @@
|
||||||
APR_VERSION := 1.6.5
|
APR_VERSION := 1.6.5
|
||||||
APU_VERSION := 1.6.1
|
APU_VERSION := 1.6.1
|
||||||
ARABICA_VERSION := 2016-January
|
ARABICA_VERSION := 2016-January
|
||||||
BOOST_VERSION := 1.68.0
|
BOOST_VERSION := 1.72.0
|
||||||
EXPAT_VERSION := 2.2.6
|
EXPAT_VERSION := 2.2.9
|
||||||
ICONV_VERSION := 1.15
|
ICONV_VERSION := 1.16
|
||||||
LIBCONFIG_VERSION := 1.7.2
|
LIBCONFIG_VERSION := 1.7.2
|
||||||
LIBXML2_VERSION := 2.9.8
|
LIBXML2_VERSION := 2.9.8
|
||||||
LOG4CXX_VERSION := 0.10.0
|
LOG4CXX_VERSION := 0.10.0
|
||||||
|
|
@ -11,7 +11,7 @@ QT_VERSION := 4.5.3
|
||||||
QT2_VERSION := 5.6.3
|
QT2_VERSION := 5.6.3
|
||||||
XERCES_VERSION := 3.2.2
|
XERCES_VERSION := 3.2.2
|
||||||
|
|
||||||
HOST := x86_64-w64-mingw32
|
HOST := i686-w64-mingw32
|
||||||
BUILD := i386-linux
|
BUILD := i386-linux
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -24,10 +24,10 @@ WGET = wget -c -P $(ARCHIVE_DIR)
|
||||||
TAR = tar -C $(BUILD_DIR)
|
TAR = tar -C $(BUILD_DIR)
|
||||||
|
|
||||||
# XXX: Hardcoded for mingw on linux, at the moment
|
# XXX: Hardcoded for mingw on linux, at the moment
|
||||||
CC = x86_64-w64-mingw32-gcc
|
CC = $(HOST)-gcc
|
||||||
CXX = x86_64-w64-mingw32-g++
|
CXX = $(HOST)-g++
|
||||||
CPPFLAGS += -I$(PREFIX)/include
|
CPPFLAGS += -I$(PREFIX)/include
|
||||||
CONFIGURE = CC="$(CC)" CXX="$(CXX)" CPPFLAGS="$(CPPFLAGS)" ./configure --host=$(HOST) --build=$(BUILD) --prefix=$(PREFIX)
|
CONFIGURE = CC="$(CC)" CXX="$(CXX)" CPPFLAGS="$(CPPFLAGS)" ./configure --host=$(HOST) --build=$(BUILD) --prefix=$(PREFIX) --enable-static --disable-shared
|
||||||
|
|
||||||
# Dependencies (incomplete list):
|
# Dependencies (incomplete list):
|
||||||
# expat <- apr <- apu <- log4cxx
|
# expat <- apr <- apu <- log4cxx
|
||||||
|
|
@ -76,7 +76,11 @@ $(APR_DIR_FLAG): $(APR_ARCHIVE)
|
||||||
touch $@
|
touch $@
|
||||||
|
|
||||||
.apr: $(APR_DIR_FLAG)
|
.apr: $(APR_DIR_FLAG)
|
||||||
(cd $(APR_DIR) && patch -p0 < $(BASE)/apr-bugzilla-56342.patch && patch -p0 < $(BASE)/apr.patch && $(CONFIGURE) --enable-static --disable-shared && make && make install)
|
(cd $(APR_DIR) \
|
||||||
|
&& patch -p0 < $(BASE)/apr-configure-hacks.patch \
|
||||||
|
&& patch -p0 < $(BASE)/apr-bugzilla-56342.patch \
|
||||||
|
&& $(CONFIGURE) \
|
||||||
|
&& make install)
|
||||||
touch $@
|
touch $@
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -94,7 +98,9 @@ $(APU_DIR_FLAG): $(APU_ARCHIVE)
|
||||||
touch $@
|
touch $@
|
||||||
|
|
||||||
.apu: $(APU_DIR_FLAG)
|
.apu: $(APU_DIR_FLAG)
|
||||||
(cd $(APU_DIR) && $(CONFIGURE) --with-apr=$(PREFIX) --enable-static --disable-shared && make && make install)
|
(cd $(APU_DIR) \
|
||||||
|
&& $(CONFIGURE) --with-apr=$(PREFIX) \
|
||||||
|
&& make install)
|
||||||
touch $@
|
touch $@
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -112,7 +118,10 @@ $(ARABICA_DIR_FLAG): $(ARABICA_ARCHIVE)
|
||||||
touch $@
|
touch $@
|
||||||
|
|
||||||
.arabica: $(ARABICA_DIR_FLAG)
|
.arabica: $(ARABICA_DIR_FLAG)
|
||||||
(cd $(ARABICA_DIR) && autoreconf -i && $(CONFIGURE) --enable-static --disable-shared --with-parser=expat --with-expat=$(PREFIX) --with-boost=$(PREFIX) --with-tests=no --with-dom=no && make install)
|
(cd $(ARABICA_DIR) \
|
||||||
|
&& autoreconf -i \
|
||||||
|
&& $(CONFIGURE) --with-parser=expat --with-expat=$(PREFIX) --with-boost=$(PREFIX) --with-tests=no --with-dom=no \
|
||||||
|
&& make install)
|
||||||
touch $@
|
touch $@
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -153,7 +162,10 @@ $(EXPAT_DIR_FLAG): $(EXPAT_ARCHIVE)
|
||||||
touch $@
|
touch $@
|
||||||
|
|
||||||
.expat: $(EXPAT_DIR_FLAG)
|
.expat: $(EXPAT_DIR_FLAG)
|
||||||
(cd $(EXPAT_DIR)/expat && ./buildconf.sh && $(CONFIGURE) --without-xmlwf --enable-static --disable-shared && make install)
|
(cd $(EXPAT_DIR)/expat \
|
||||||
|
&& ./buildconf.sh \
|
||||||
|
&& $(CONFIGURE) --without-xmlwf \
|
||||||
|
&& make install)
|
||||||
touch $@
|
touch $@
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -171,7 +183,9 @@ $(ICONV_DIR_FLAG): $(ICONV_ARCHIVE)
|
||||||
touch $@
|
touch $@
|
||||||
|
|
||||||
.iconv: $(ICONV_DIR_FLAG)
|
.iconv: $(ICONV_DIR_FLAG)
|
||||||
(cd $(ICONV_DIR) && $(CONFIGURE) --enable-static --disable-shared && make && make install)
|
(cd $(ICONV_DIR) \
|
||||||
|
&& $(CONFIGURE) \
|
||||||
|
&& make install)
|
||||||
touch $@
|
touch $@
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -189,7 +203,12 @@ $(LIBCONFIG_DIR_FLAG): $(LIBCONFIG_ARCHIVE)
|
||||||
touch $@
|
touch $@
|
||||||
|
|
||||||
.libconfig: $(LIBCONFIG_DIR_FLAG)
|
.libconfig: $(LIBCONFIG_DIR_FLAG)
|
||||||
(cd $(LIBCONFIG_DIR) && autoreconf -i && patch -p0 < $(BASE)/libconfig++-ignore-docs.patch && patch -p0 < $(BASE)/libconfig++-static-build.patch && CFLAGS=-DLIBCONFIG_STATIC CXXFLAGS=-DLIBCONFIGXX_STATIC $(CONFIGURE) --disable-examples --enable-static --disable-shared && make && make install)
|
(cd $(LIBCONFIG_DIR) \
|
||||||
|
&& autoreconf -i \
|
||||||
|
&& patch -p0 < $(BASE)/libconfig++-ignore-docs.patch \
|
||||||
|
&& patch -p0 < $(BASE)/libconfig++-static-build.patch \
|
||||||
|
&& CFLAGS=-DLIBCONFIG_STATIC CXXFLAGS=-DLIBCONFIGXX_STATIC $(CONFIGURE) --disable-examples \
|
||||||
|
&& make install)
|
||||||
touch $@
|
touch $@
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -209,7 +228,9 @@ $(LIBXML2_DIR_FLAG): $(LIBXML2_ARCHIVE)
|
||||||
# TODO: add more --without-xxx flags (apparently needed for build: pattern, debug)
|
# TODO: add more --without-xxx flags (apparently needed for build: pattern, debug)
|
||||||
# --with-legacy and --with-html are needed for arabica
|
# --with-legacy and --with-html are needed for arabica
|
||||||
.libxml2: $(LIBXML2_DIR_FLAG)
|
.libxml2: $(LIBXML2_DIR_FLAG)
|
||||||
(cd $(LIBXML2_DIR) && $(CONFIGURE) --enable-static --disable-shared --with-legacy --without-schematron --without-zlib --without-http --without-ftp --without-html --without-python --without-docbook --without-regexps && make install)
|
(cd $(LIBXML2_DIR) \
|
||||||
|
&& $(CONFIGURE) --with-legacy --without-schematron --without-zlib --without-http --without-ftp --without-html --without-python --without-docbook --without-regexps \
|
||||||
|
&& make install)
|
||||||
touch $@
|
touch $@
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -227,7 +248,11 @@ $(LOG4CXX_DIR_FLAG): $(LOG4CXX_ARCHIVE)
|
||||||
touch $@
|
touch $@
|
||||||
|
|
||||||
.log4cxx: $(LOG4CXX_DIR_FLAG)
|
.log4cxx: $(LOG4CXX_DIR_FLAG)
|
||||||
(cd $(LOG4CXX_DIR) && patch -p0 < $(BASE)/log4cxx-no-example.patch && patch -p0 < $(BASE)/log4cxx-build-fixes.patch && CXXFLAGS=-Wno-narrowing $(CONFIGURE) --with-apr=$(PREFIX) --with-apu=$(PREFIX) --with-apr-util=$(PREFIX) --disable-doxygen --disable-dot --enable-static --disable-shared && make && make install)
|
(cd $(LOG4CXX_DIR) \
|
||||||
|
&& patch -p0 < $(BASE)/log4cxx-no-example.patch \
|
||||||
|
&& patch -p0 < $(BASE)/log4cxx-build-fixes.patch \
|
||||||
|
&& CXXFLAGS=-Wno-narrowing $(CONFIGURE) --with-apr=$(PREFIX) --with-apu=$(PREFIX) --with-apr-util=$(PREFIX) --disable-doxygen --disable-dot \
|
||||||
|
&& make install)
|
||||||
touch $@
|
touch $@
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -290,6 +315,8 @@ $(XERCES_DIR_FLAG): $(XERCES_ARCHIVE)
|
||||||
touch $@
|
touch $@
|
||||||
|
|
||||||
.xerces: $(XERCES_DIR_FLAG)
|
.xerces: $(XERCES_DIR_FLAG)
|
||||||
(cd $(XERCES_DIR) && $(CONFIGURE) --enable-static --disable-shared --disable-network && make install)
|
(cd $(XERCES_DIR) \
|
||||||
|
&& $(CONFIGURE) --disable-network \
|
||||||
|
&& make install)
|
||||||
touch $@
|
touch $@
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
--- configure.orig 2017-10-18 16:50:19.000000000 +0200
|
--- configure 2018-09-10 23:14:53.000000000 +0200
|
||||||
+++ configure 2018-07-26 00:01:19.399233574 +0200
|
+++ configure.good 2020-04-05 22:30:36.657168877 +0200
|
||||||
@@ -24542,6 +24542,10 @@
|
@@ -24559,6 +24559,10 @@
|
||||||
ssize_t_fmt="ld"
|
ssize_t_fmt="ld"
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: %ld" >&5
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: %ld" >&5
|
||||||
$as_echo "%ld" >&6; }
|
$as_echo "%ld" >&6; }
|
||||||
|
|
@ -11,7 +11,7 @@
|
||||||
else
|
else
|
||||||
as_fn_error $? "could not determine the proper format for apr_ssize_t" "$LINENO" 5
|
as_fn_error $? "could not determine the proper format for apr_ssize_t" "$LINENO" 5
|
||||||
fi
|
fi
|
||||||
@@ -24605,6 +24609,10 @@
|
@@ -24622,6 +24626,10 @@
|
||||||
size_t_fmt="ld"
|
size_t_fmt="ld"
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: %ld" >&5
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: %ld" >&5
|
||||||
$as_echo "%ld" >&6; }
|
$as_echo "%ld" >&6; }
|
||||||
|
|
@ -22,14 +22,11 @@
|
||||||
else
|
else
|
||||||
as_fn_error $? "could not determine the proper format for apr_size_t" "$LINENO" 5
|
as_fn_error $? "could not determine the proper format for apr_size_t" "$LINENO" 5
|
||||||
fi
|
fi
|
||||||
--- Makefile.in.orig 2017-05-31 17:04:18.000000000 +0200
|
@@ -26187,6 +26195,7 @@
|
||||||
+++ Makefile.in 2018-07-26 09:09:47.318476559 +0200
|
|
||||||
@@ -141,7 +141,7 @@
|
|
||||||
|
|
||||||
include/private/apr_escape_test_char.h: tools/gen_test_char@EXEEXT@
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for robust cross-process mutex support" >&5
|
||||||
$(APR_MKDIR) include/private
|
$as_echo_n "checking for robust cross-process mutex support... " >&6; }
|
||||||
- tools/gen_test_char@EXEEXT@ > $@
|
+apr_cv_mutex_robust_shared=no
|
||||||
+ wine tools/gen_test_char@EXEEXT@ > $@
|
if ${apr_cv_mutex_robust_shared+:} false; then :
|
||||||
|
$as_echo_n "(cached) " >&6
|
||||||
LINK_PROG = $(LIBTOOL) $(LTFLAGS) --mode=link $(COMPILE) $(LT_LDFLAGS) \
|
else
|
||||||
@LT_NO_INSTALL@ $(ALL_LDFLAGS) -o $@
|
|
||||||
Loading…
Reference in a new issue