From d7819c7bc5489b4e30c3b0782ccde78c5cd41cd8 Mon Sep 17 00:00:00 2001
From: GloriousEggroll <gloriouseggroll@gmail.com>
Date: Thu, 30 May 2019 01:02:18 -0600
Subject: [PATCH] add bison to proton build

---
 build/makefile_base.mak | 86 ++++++++++++++++++++++++++++++++++++++++-
 steamrt-bootstrap.sh    |  2 +-
 2 files changed, 85 insertions(+), 3 deletions(-)

diff --git a/build/makefile_base.mak b/build/makefile_base.mak
index 6f0bc91c..d7fc1eb2 100644
--- a/build/makefile_base.mak
+++ b/build/makefile_base.mak
@@ -238,6 +238,15 @@ CMAKE_OBJ64 := ./obj-cmake64
 CMAKE_BIN32 := $(CMAKE_OBJ32)/built/bin/cmake
 CMAKE_BIN64 := $(CMAKE_OBJ64)/built/bin/cmake
 
+BISON_VER = 3.3.2
+BISON_TARBALL := bison-$(BISON_VER).tar.xz
+BISON := $(SRCDIR)/contrib/bison-$(BISON_VER)
+BISON_OBJ32 := ./obj-bison32
+BISON_OBJ64 := ./obj-bison64
+BISON_BIN32 := $(BISON_OBJ32)/built/bin/bison
+BISON_BIN64 := $(BISON_OBJ64)/built/bin/bison
+
+
 FONTS := $(SRCDIR)/fonts
 FONTS_OBJ := ./obj-fonts
 
@@ -251,6 +260,7 @@ OBJ_DIRS := $(TOOLS_DIR32)        $(TOOLS_DIR64)        \
             $(VRCLIENT_OBJ32)     $(VRCLIENT_OBJ64)     \
             $(DXVK_OBJ32)         $(DXVK_OBJ64)         \
             $(D9VK_OBJ32)         $(D9VK_OBJ64)         \
+            $(BISON_OBJ32)        $(BISON_OBJ64)        \
             $(CMAKE_OBJ32)        $(CMAKE_OBJ64)
 
 $(OBJ_DIRS):
@@ -745,9 +755,10 @@ WINE32_MAKE_ARGS := \
 
 # 64bit-configure
 $(WINE_CONFIGURE_FILES64): SHELL = $(CONTAINER_SHELL64)
-$(WINE_CONFIGURE_FILES64): $(MAKEFILE_DEP) | faudio64 $(WINE_OBJ64)
+$(WINE_CONFIGURE_FILES64): $(MAKEFILE_DEP) | faudio64 $(WINE_OBJ64) bison64
 	cd $(dir $@) && \
 		STRIP=$(STRIP_QUOTED) \
+		BISON=$(abspath $(BISON_BIN64)) \
 		CFLAGS=-I$(abspath $(TOOLS_DIR64))"/include -g $(COMMON_FLAGS)" \
 		LDFLAGS=-L$(abspath $(TOOLS_DIR64))/lib \
 		PKG_CONFIG_PATH=$(abspath $(TOOLS_DIR64))/lib/pkgconfig \
@@ -760,9 +771,10 @@ $(WINE_CONFIGURE_FILES64): $(MAKEFILE_DEP) | faudio64 $(WINE_OBJ64)
 
 # 32-bit configure
 $(WINE_CONFIGURE_FILES32): SHELL = $(CONTAINER_SHELL32)
-$(WINE_CONFIGURE_FILES32): $(MAKEFILE_DEP) | faudio32 $(WINE_OBJ32)
+$(WINE_CONFIGURE_FILES32): $(MAKEFILE_DEP) | faudio32 $(WINE_OBJ32) bison32
 	cd $(dir $@) && \
 		STRIP=$(STRIP_QUOTED) \
+		BISON=$(abspath $(BISON_BIN32)) \
 		CFLAGS=-I$(abspath $(TOOLS_DIR32))"/include -g $(COMMON_FLAGS)" \
 		LDFLAGS=-L$(abspath $(TOOLS_DIR32))/lib \
 		PKG_CONFIG_PATH=$(abspath $(TOOLS_DIR32))/lib/pkgconfig \
@@ -971,6 +983,76 @@ cmake32-intermediate: $(CMAKE_CONFIGURE_FILES32) $(filter $(MAKECMDGOALS),cmake3
 	+$(MAKE) -C $(CMAKE_OBJ32) install
 	touch $(CMAKE_BIN32)
 
+##
+## bison -- necessary for wine, steam runtime version too old
+##
+
+# TODO Don't bother with this in native mode
+
+$(BISON):
+	if [ -e "$(SRCDIR)/../bison/$(BISON_TARBALL)" ]; then \
+		mkdir -p $(dir $@); \
+		tar -xf "$(SRCDIR)/../bison/$(BISON_TARBALL)" -C "$(dir $@)"; \
+	else \
+		mkdir -p $(SRCDIR)/contrib/; \
+		if [ ! -e "$(SRCDIR)/contrib/$(BISON_TARBALL)" ]; then \
+			echo ">>>> Downloading bison. To avoid this in future, put it here: $(SRCDIR)/../bison/$(BISON_TARBALL)"; \
+			wget -O "$(SRCDIR)/contrib/$(BISON_TARBALL)" "https://ftpmirror.gnu.org/bison/$(BISON_TARBALL)"; \
+		fi; \
+		tar -xf "$(SRCDIR)/contrib/$(BISON_TARBALL)" -C "$(dir $@)"; \
+	fi
+
+BISON_CONFIGURE_FILES32 := $(BISON_OBJ32)/Makefile
+BISON_CONFIGURE_FILES64 := $(BISON_OBJ64)/Makefile
+
+# 64-bit configure
+$(BISON_CONFIGURE_FILES64): SHELL = $(CONTAINER_SHELL64)
+$(BISON_CONFIGURE_FILES64): $(MAKEFILE_DEP) $(BISON) | $(BISON_OBJ64)
+	cd "$(BISON_OBJ64)" && \
+		LIBS='-lrt' ../$(BISON)/configure --prefix=$(abspath $(BISON_OBJ64))/built
+
+# 32-bit configure
+$(BISON_CONFIGURE_FILES32): SHELL = $(CONTAINER_SHELL32)
+$(BISON_CONFIGURE_FILES32): $(MAKEFILE_DEP) $(BISON) | $(BISON_OBJ32)
+	cd "$(BISON_OBJ32)" && \
+		LIBS='-lrt' ../$(BISON)/configure --prefix=$(abspath $(BISON_OBJ32))/built
+
+
+## bison goals
+BISON_TARGETS = bison bison_configure bison32 bison64 bison_configure32 bison_configure64
+
+ALL_TARGETS += $(BISON_TARGETS)
+
+.PHONY: $(BISON_TARGETS)
+
+bison_configure: $(BISON_CONFIGURE_FILES32) $(BISON_CONFIGURE_FILES64)
+
+bison_configure32: $(BISON_CONFIGURE_FILES32)
+
+bison_configure64: $(BISON_CONFIGURE_FILES64)
+
+bison: bison32 bison64
+
+# These have multiple targets that come from one invocation.  The way to do that is to have both targets on a single
+# intermediate.
+.INTERMEDIATE: bison64-intermediate bison32-intermediate
+
+$(BISON_BIN64) bison64: bison64-intermediate
+
+bison64-intermediate: SHELL = $(CONTAINER_SHELL64)
+bison64-intermediate: $(BISON_CONFIGURE_FILES64) $(filter $(MAKECMDGOALS),bison64)
+	+$(MAKE) -C $(BISON_OBJ64)
+	+$(MAKE) -C $(BISON_OBJ64) install
+	touch $(BISON_BIN64)
+
+$(BISON_BIN32) bison32: bison32-intermediate
+
+bison32-intermediate: SHELL = $(CONTAINER_SHELL32)
+bison32-intermediate: $(BISON_CONFIGURE_FILES32) $(filter $(MAKECMDGOALS),bison32)
+	+$(MAKE) -C $(BISON_OBJ32)
+	+$(MAKE) -C $(BISON_OBJ32) install
+	touch $(BISON_BIN32)
+
 ##
 ## dxvk
 ##
diff --git a/steamrt-bootstrap.sh b/steamrt-bootstrap.sh
index e67839f9..15298547 100755
--- a/steamrt-bootstrap.sh
+++ b/steamrt-bootstrap.sh
@@ -12,7 +12,7 @@ fi
 
 set -xe
 
-apt-get install -y gcc-5 g++-5 g++-5-multilib flex bison libosmesa6-dev libpcap-dev \
+apt-get install -y gcc-5 g++-5 g++-5-multilib flex libosmesa6-dev libpcap-dev \
                    libhal-dev libsane-dev libv4l-dev libgphoto2-2-dev libcapi20-dev \
                    libgsm1-dev libmpg123-dev libvulkan-dev libxslt1-dev nasm yasm ccache
 update-alternatives --install "$(command -v gcc)" gcc "$(command -v gcc-5)" 50