diff options
| author | Tony Theodore <tonyt@logyst.com> | 2017-07-20 10:29:39 (GMT) |
|---|---|---|
| committer | Tony Theodore <tonyt@logyst.com> | 2017-07-20 10:29:39 (GMT) |
| commit | fe838d0bb36d52da23a87ca5f2014c84af3d5ed3 (patch) | |
| tree | 36c99cf19dbfb507ce74fd5dcb565b9cfbf7cb9b /src/log4cxx.mk | |
| parent | fa87d19aeb852fdb9f1e3270fd35e95d354298c5 (diff) | |
| download | mxe-fe838d0bb36d52da23a87ca5f2014c84af3d5ed3.zip mxe-fe838d0bb36d52da23a87ca5f2014c84af3d5ed3.tar.gz mxe-fe838d0bb36d52da23a87ca5f2014c84af3d5ed3.tar.bz2 | |
log4cxx ucl: filter out invalid configure options
Diffstat (limited to 'src/log4cxx.mk')
| -rw-r--r-- | src/log4cxx.mk | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/log4cxx.mk b/src/log4cxx.mk index dcfacb2..c9a9728 100644 --- a/src/log4cxx.mk +++ b/src/log4cxx.mk @@ -18,13 +18,18 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - cd '$(1)' && ./configure \ - $(MXE_CONFIGURE_OPTS) \ + # configure script is ancient and isn't easy to regenerate + # filter out invalid options + cd '$(BUILD_DIR)' && '$(SOURCE_DIR)/configure' \ + $(subst docdir$(comma),,$(MXE_CONFIGURE_OPTS)) \ --with-apr='$(PREFIX)/$(TARGET)' \ --with-apr-util='$(PREFIX)/$(TARGET)' \ CFLAGS=-D_WIN32_WINNT=0x0500 \ CXXFLAGS=-D_WIN32_WINNT=0x0500 - $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= man_MANS= + + $(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)' $(MXE_DISABLE_PROGRAMS) + $(MAKE) -C '$(BUILD_DIR)' -j 1 install $(MXE_DISABLE_PROGRAMS) + mkdir -p '$(PREFIX)/$(TARGET)/share/cmake/log4cxx' cp '$(1)/log4cxx-config.cmake' '$(PREFIX)/$(TARGET)/share/cmake/log4cxx/log4cxx-config.cmake' |