Merge pull request #1930 from tonytheodore/tcl

tck.tk plugin: use new style options, full install, and fix build
This commit is contained in:
Tony Theodore 2017-10-10 19:28:07 +11:00 committed by GitHub
commit ede8628ec0
2 changed files with 12 additions and 8 deletions

View File

@ -18,11 +18,13 @@ define $(PKG)_UPDATE
endef
define $(PKG)_BUILD
cd '$(1)/win' && ./configure \
# autoreconf to treat unrecognized options as warnings
cd '$(SOURCE_DIR)/win' && autoreconf -fi
cd '$(BUILD_DIR)' && '$(SOURCE_DIR)/win/configure' \
$(MXE_CONFIGURE_OPTS) \
--enable-threads \
$(if $(findstring x86_64,$(TARGET)), --enable-64bit) \
CFLAGS='-D__MINGW_EXCPT_DEFINE_PSDK'
$(MAKE) -C '$(1)/win' install install-private-headers $(MXE_DISABLE_PROGRAMS)
$(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)'
$(MAKE) -C '$(BUILD_DIR)' -j 1 install install-private-headers
endef

View File

@ -18,11 +18,13 @@ define $(PKG)_UPDATE
endef
define $(PKG)_BUILD
cd '$(1)/win' && ./configure \
# autoreconf to treat unrecognized options as warnings
cd '$(SOURCE_DIR)/win' && autoreconf -fi
cd '$(BUILD_DIR)' && '$(SOURCE_DIR)/win/configure' \
$(MXE_CONFIGURE_OPTS) \
--enable-threads \
$(if $(findstring x86_64,$(TARGET)), --enable-64bit) \
CFLAGS=-D__MINGW_EXCPT_DEFINE_PSDK
$(MAKE) -C '$(1)/win' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
$(if $(findstring x86_64,$(TARGET)), --enable-64bit) \
CFLAGS='-D__MINGW_EXCPT_DEFINE_PSDK'
$(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)'
$(MAKE) -C '$(BUILD_DIR)' -j 1 install
endef