summaryrefslogtreecommitdiffstats
path: root/src/apr.mk
diff options
context:
space:
mode:
authorTony Theodore <tonyt@logyst.com>2012-05-02 09:36:28 (GMT)
committerTony Theodore <tonyt@logyst.com>2012-05-02 09:36:28 (GMT)
commitfe2aea1a6d1b7ee05e3c18c4305c72f89f3843ec (patch)
tree29d041f38777fd6561b7bcd33312feebe4f64ec8 /src/apr.mk
parent1940a74145dbbe86243068d63312667dd0b46111 (diff)
downloadmxe-fe2aea1a6d1b7ee05e3c18c4305c72f89f3843ec.zip
mxe-fe2aea1a6d1b7ee05e3c18c4305c72f89f3843ec.tar.gz
mxe-fe2aea1a6d1b7ee05e3c18c4305c72f89f3843ec.tar.bz2
packages apr, apr-util, log4cxx: various changes and add log4cxx test program
Diffstat (limited to 'src/apr.mk')
-rw-r--r--src/apr.mk49
1 files changed, 12 insertions, 37 deletions
diff --git a/src/apr.mk b/src/apr.mk
index 7f4a425..4ef8a6b 100644
--- a/src/apr.mk
+++ b/src/apr.mk
@@ -1,58 +1,33 @@
-# This file is part of mingw-cross-env.
+# This file is part of mxe.
# See doc/index.html for further information.
-# Special flags
-#
-# -no-undefined
-#
-# Can't find any documentation on this option
-# (--no-undefined is there, but this aint!)
-# Anyway, it bombs when gcc tries to use it,
-# but seems to help libtool at the final
-# linking stage. If its not there, then
-# mingw aborts with unfound symbol errors.
-# That too is a problem, and maybe should
-# resolved better than just by saying
-# -no-undefined.
-#
-# Type sizes
-#
-# Sometimes wine has an emulation environment which runs conf tests,
-# unfortunately these return like a 4^M, not 4 which breaks all the
-# configure script logic.
-# ac_cv_sizeof_off_t=4
-# ac_cv_sizeof_pid_t=4
-# ac_cv_sizeof_size_t=4
-# ac_cv_sizeof_ssize_t=4
-
PKG := apr
-$(PKG)_IGNORE :=
-$(PKG)_VERSION := 1.4.2
+$(PKG)_IGNORE := 1.4.6
$(PKG)_CHECKSUM := d48324efb0280749a5d7ccbb053d68545c568b4b
$(PKG)_SUBDIR := apr-$($(PKG)_VERSION)
$(PKG)_FILE := apr-$($(PKG)_VERSION).tar.gz
-$(PKG)_WEBSITE := http://apr.apache.org/
$(PKG)_URL := http://mirror.apache-kr.org/apr/$($(PKG)_FILE)
-$(PKG)_URL_2 := http://apache.mirror.cdnetworks.com/apr/$($(PKG)_FILE)
+$(PKG)_URL_2 := http://archive.apache.org/dist/apr/$($(PKG)_FILE)
$(PKG)_DEPS := gcc
-#define $(PKG)_UPDATE
-# wget -q -O- 'http://www.ijg.org/' | \
-# $(SED) -n 's,.*jpegsrc\.v\([0-9][^>]*\)\.tar.*,\1,p' | \
-# head -1
-#endef
+define $(PKG)_UPDATE
+ wget -q -O- 'http://apr.apache.org/download.cgi' | \
+ grep 'apr1.*best' |
+ $(SED) -n 's,.*APR \([0-9.]*\).*,\1,p'
+endef
define $(PKG)_BUILD
cd '$(1)' && ./configure \
--prefix='$(PREFIX)/$(TARGET)' \
--host='$(TARGET)' \
+ --build="`config.guess`" \
--disable-shared \
--enable-static \
ac_cv_sizeof_off_t=4 \
ac_cv_sizeof_pid_t=4 \
ac_cv_sizeof_size_t=4 \
ac_cv_sizeof_ssize_t=4 \
- CFLAGS=-D_WIN32_WINNT=0x0500 \
- LDFLAGS=-no-undefined
- $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= man_MANS=
+ CFLAGS=-D_WIN32_WINNT=0x0500
+ $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= man_MANS=
+ ln -sf '$(PREFIX)/$(TARGET)/bin/apr-1-config' '$(PREFIX)/bin/$(TARGET)-apr-1-config'
endef