diff options
| author | Tony Theodore <tonyt@logyst.com> | 2017-07-20 10:27:29 (GMT) |
|---|---|---|
| committer | Tony Theodore <tonyt@logyst.com> | 2017-07-20 10:28:05 (GMT) |
| commit | fa87d19aeb852fdb9f1e3270fd35e95d354298c5 (patch) | |
| tree | 4d657a74a270de5e0a67e8bc6d90a0c58ad89b11 | |
| parent | 4e3f9c4e4f253a2839a5bd8e817526d64c0a1a74 (diff) | |
| download | mxe-fa87d19aeb852fdb9f1e3270fd35e95d354298c5.zip mxe-fa87d19aeb852fdb9f1e3270fd35e95d354298c5.tar.gz mxe-fa87d19aeb852fdb9f1e3270fd35e95d354298c5.tar.bz2 | |
libid3tag libmad: regenerate configure to remove invalid options error
| -rw-r--r-- | src/libid3tag.mk | 14 | ||||
| -rw-r--r-- | src/libmad.mk | 10 |
2 files changed, 13 insertions, 11 deletions
diff --git a/src/libid3tag.mk b/src/libid3tag.mk index e856d86..784d2ec 100644 --- a/src/libid3tag.mk +++ b/src/libid3tag.mk @@ -17,13 +17,11 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - cd '$(1)' && ./configure \ + # configure script is ancient so regenerate + touch '$(SOURCE_DIR)'/{NEWS,AUTHORS,ChangeLog} + cd '$(SOURCE_DIR)' && autoreconf -fi + cd '$(BUILD_DIR)' && '$(SOURCE_DIR)/configure' \ $(MXE_CONFIGURE_OPTS) - - # libtool misses some dependency libs and there's no lt_cv* etc. options - # can be removed after 0.15.1b if recent libtool et al. is used - $(if $(BUILD_SHARED),\ - $(SED) -i 's#^postdeps=""#postdeps="-lz"#g' '$(1)/libtool') - - $(MAKE) -C '$(1)' -j '$(JOBS)' install LDFLAGS='-no-undefined' + $(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)' LDFLAGS='-no-undefined' + $(MAKE) -C '$(BUILD_DIR)' -j 1 install endef diff --git a/src/libmad.mk b/src/libmad.mk index 36a6eab..f614e1f 100644 --- a/src/libmad.mk +++ b/src/libmad.mk @@ -17,8 +17,12 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - $(SED) -i '/-fforce-mem/d' '$(1)'/configure - cd '$(1)' && ./configure \ + $(SED) -i '/-fforce-mem/d' '$(SOURCE_DIR)'/configure.ac + # configure script is ancient so regenerate + touch '$(SOURCE_DIR)'/{NEWS,AUTHORS,ChangeLog} + cd '$(SOURCE_DIR)' && autoreconf -fi + cd '$(BUILD_DIR)' && '$(SOURCE_DIR)/configure' \ $(MXE_CONFIGURE_OPTS) - $(MAKE) -C '$(1)' -j '$(JOBS)' install LDFLAGS='-no-undefined' + $(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)' LDFLAGS='-no-undefined' + $(MAKE) -C '$(BUILD_DIR)' -j 1 install endef |