From fe838d0bb36d52da23a87ca5f2014c84af3d5ed3 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Thu, 20 Jul 2017 20:29:39 +1000 Subject: log4cxx ucl: filter out invalid configure options --- src/log4cxx.mk | 11 ++++++++--- src/ucl.mk | 11 ++++++----- 2 files changed, 14 insertions(+), 8 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' diff --git a/src/ucl.mk b/src/ucl.mk index c4292a9..dbf0712 100644 --- a/src/ucl.mk +++ b/src/ucl.mk @@ -20,10 +20,11 @@ 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)) \ CFLAGS='-std=gnu90 -fPIC' - $(MAKE) -C '$(1)' -j '$(JOBS)' LDFLAGS=-no-undefined - $(MAKE) -C '$(1)' -j 1 install + $(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)' LDFLAGS='-no-undefined' + $(MAKE) -C '$(BUILD_DIR)' -j 1 install endef -- cgit v0.12