summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Gu <timothygu99@gmail.com>2014-11-16 17:20:33 (GMT)
committerTimothy Gu <timothygu99@gmail.com>2014-11-16 17:20:33 (GMT)
commitda71fd34138a73b87e09d7da19150aaea0be170c (patch)
treeec4d395e3613894fec4b7df51095c35e64911db9
parent2cbc2a658e3374df05d617f8be96e97733c7a69c (diff)
downloadmxe-da71fd34138a73b87e09d7da19150aaea0be170c.zip
mxe-da71fd34138a73b87e09d7da19150aaea0be170c.tar.gz
mxe-da71fd34138a73b87e09d7da19150aaea0be170c.tar.bz2
apr-util: Always declare static calling convention on static builds
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
-rw-r--r--src/apr-util.mk6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/apr-util.mk b/src/apr-util.mk
index e232398..a2b2b86 100644
--- a/src/apr-util.mk
+++ b/src/apr-util.mk
@@ -25,6 +25,10 @@ define $(PKG)_BUILD
--without-sqlite3 \
--with-apr='$(PREFIX)/$(TARGET)' \
CFLAGS=-D_WIN32_WINNT=0x0500
- $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= man_MANS= LDFLAGS=-no-undefined
+ $(MAKE) -C '$(1)' -j '$(JOBS)' $(MXE_DISABLE_CRUFT) LDFLAGS=-no-undefined
+ $(MAKE) -C '$(1)' -j 1 install $(MXE_DISABLE_CRUFT)
+ $(if $(BUILD_STATIC), \
+ sed -i '1i #define APU_DECLARE_STATIC 1' \
+ '$(PREFIX)/$(TARGET)/include/apr-1/apu.h')
ln -sf '$(PREFIX)/$(TARGET)/bin/apu-1-config' '$(PREFIX)/bin/$(TARGET)-apu-1-config'
endef