diff options
author | Tony Theodore <tonyt@logyst.com> | 2017-02-07 03:37:04 (GMT) |
---|---|---|
committer | Tony Theodore <tonyt@logyst.com> | 2017-02-07 03:52:48 (GMT) |
commit | 1020d040db43dc10ee1f37a8377030c4a124beaf (patch) | |
tree | 1bedd25a26a151f9d0c7d54dc4b4a2bb77ee0087 /src/apr.mk | |
parent | b8850b2bd0dcedf15c1982b320e4b90139e86492 (diff) | |
download | mxe-1020d040db43dc10ee1f37a8377030c4a124beaf.zip mxe-1020d040db43dc10ee1f37a8377030c4a124beaf.tar.gz mxe-1020d040db43dc10ee1f37a8377030c4a124beaf.tar.bz2 |
apr: fix posix build and use SOURCE_DIR etc.
Diffstat (limited to 'src/apr.mk')
-rw-r--r-- | src/apr.mk | 17 |
1 files changed, 11 insertions, 6 deletions
@@ -19,18 +19,23 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - cp -Rp '$(1)' '$(1).native' - cd '$(1).native' && ./configure - cd '$(1).native' && $(MAKE) tools/gen_test_char \ - CFLAGS='-DNEED_ENHANCED_ESCAPES' - cd '$(1)' && ./configure \ + # native build for gen_test_char + mkdir '$(BUILD_DIR).native' + cd '$(BUILD_DIR).native' && '$(SOURCE_DIR)/configure' + $(MAKE) -C '$(BUILD_DIR).native' tools/gen_test_char \ + CFLAGS='-DNEED_ENHANCED_ESCAPES' -j '$(JOBS)' + + # cross build + cd '$(BUILD_DIR)' && '$(SOURCE_DIR)/configure' \ $(MXE_CONFIGURE_OPTS) \ ac_cv_sizeof_off_t=4 \ ac_cv_sizeof_pid_t=4 \ ac_cv_sizeof_size_t=4 \ ac_cv_sizeof_ssize_t=4 \ + $(if $(POSIX_THREADS),apr_cv_mutex_robust_shared=yes) \ CFLAGS=-D_WIN32_WINNT=0x0500 - $(MAKE) -C '$(1)' -j 1 install GEN_TEST_CHAR='$(1).native/tools/gen_test_char' + $(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)' GEN_TEST_CHAR='$(BUILD_DIR).native/tools/gen_test_char' + $(MAKE) -C '$(BUILD_DIR)' -j 1 install ln -sf '$(PREFIX)/$(TARGET)/bin/apr-1-config' '$(PREFIX)/bin/$(TARGET)-apr-1-config' endef |