gzdoom: stage host binaries

Install host-built binaries to STAGING_DIR_HOSTPKG as HOST_BUILD_DIR gets
cleared and should not be referenced after host build has completed.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>

diff --git a/games/gzdoom/Makefile b/games/gzdoom/Makefile
index b79e2a4a6332a0547ec34af5bc264adc4055811a..ae05680d9104db25aeb48d5bda214390a7f40280 100644 (file)
--- a/games/gzdoom/Makefile
+++ b/games/gzdoom/Makefile
@@ -48,7 +48,17 @@ endef
 
 define Host/Install
        $(INSTALL_DIR) $(STAGING_DIR_HOSTPKG)/share/gzdoom
+       $(INSTALL_BIN) $(HOST_BUILD_DIR)/tools/re2c/re2c $(STAGING_DIR_HOSTPKG)/share/gzdoom
+       $(INSTALL_BIN) $(HOST_BUILD_DIR)/tools/lemon/lemon $(STAGING_DIR_HOSTPKG)/share/gzdoom
+       $(INSTALL_DATA) $(HOST_BUILD_DIR)/tools/lemon/lempar.c $(STAGING_DIR_HOSTPKG)/share/gzdoom
+       $(INSTALL_BIN) $(HOST_BUILD_DIR)/tools/zipdir/zipdir $(STAGING_DIR_HOSTPKG)/share/gzdoom
        $(INSTALL_DATA) $(HOST_BUILD_DIR)/ImportExecutables.cmake $(STAGING_DIR_HOSTPKG)/share/gzdoom
+       $(SED) "s#$(HOST_BUILD_DIR)/tools/re2c/re2c#$(STAGING_DIR_HOSTPKG)/share/gzdoom/re2c#" \
+               $(STAGING_DIR_HOSTPKG)/share/gzdoom/ImportExecutables.cmake
+       $(SED) "s#$(HOST_BUILD_DIR)/tools/lemon/lemon#$(STAGING_DIR_HOSTPKG)/share/gzdoom/lemon#" \
+               $(STAGING_DIR_HOSTPKG)/share/gzdoom/ImportExecutables.cmake
+       $(SED) "s#$(HOST_BUILD_DIR)/tools/zipdir/zipdir#$(STAGING_DIR_HOSTPKG)/share/gzdoom/zipdir#" \
+               $(STAGING_DIR_HOSTPKG)/share/gzdoom/ImportExecutables.cmake
 endef
 
 define Host/Uninstall

diff --git a/games/gzdoom/patches/120-lzma-pthreads.patch b/games/gzdoom/patches/120-lzma-pthreads.patch
index 54f492c7705f066ddfdcd59539b6534bdd4d715b..30b708c5e5c33714427670c62428285a92cea7e6 100644 (file)
--- a/games/gzdoom/patches/120-lzma-pthreads.patch
+++ b/games/gzdoom/patches/120-lzma-pthreads.patch
@@ -2,7 +2,7 @@
 +++ b/libraries/lzma/CMakeLists.txt
 @@ -2,8 +2,6 @@ make_release_only()
  
- set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_GNU_SOURCE -DZ7_PPMD_SUPPORT -D_7ZIP_AFFINITY_DISABLE" )
+ set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_GNU_SOURCE -DZ7_PPMD_SUPPORT -DZ7_AFFINITY_DISABLE" )
  
 -find_package(Threads)
 -