diff options
| author | Tony Theodore <tonyt@logyst.com> | 2017-10-10 08:26:16 (GMT) |
|---|---|---|
| committer | Tony Theodore <tonyt@logyst.com> | 2017-10-10 08:26:16 (GMT) |
| commit | 5fea68ef14e3d02ed0e8522a4baa328d9319d1ab (patch) | |
| tree | dd9f91da994d49fa2a6a9570f852772d74bfd0ea /plugins | |
| parent | 57fdf882cfe2b6eb9c4ad1a6d3b03aa0a8ebde63 (diff) | |
| download | mxe-5fea68ef14e3d02ed0e8522a4baa328d9319d1ab.zip mxe-5fea68ef14e3d02ed0e8522a4baa328d9319d1ab.tar.gz mxe-5fea68ef14e3d02ed0e8522a4baa328d9319d1ab.tar.bz2 | |
tck.tk plugin: use new style options, full install, and fix build
Users of this plugin probably want a full install and newer autotools treat unrecognized options as warnings
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/tcl.tk/tcl.mk | 8 | ||||
| -rw-r--r-- | plugins/tcl.tk/tk.mk | 12 |
2 files changed, 12 insertions, 8 deletions
diff --git a/plugins/tcl.tk/tcl.mk b/plugins/tcl.tk/tcl.mk index 42d7360..0f6a06d 100644 --- a/plugins/tcl.tk/tcl.mk +++ b/plugins/tcl.tk/tcl.mk @@ -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 - diff --git a/plugins/tcl.tk/tk.mk b/plugins/tcl.tk/tk.mk index 7b88ca6..086f89a 100644 --- a/plugins/tcl.tk/tk.mk +++ b/plugins/tcl.tk/tk.mk @@ -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 - |