From aa05f9120c747c8efc2f53bbe77a8b10ba7f0443 Mon Sep 17 00:00:00 2001 From: Jelle Raaijmakers Date: Tue, 1 Nov 2022 21:42:41 +0100 Subject: [PATCH] Ports: Update build flags for ScummVM These were no longer being picked up after some recent changes. Since port builds happen in subshells nowadays, we can get rid of the export / unset combo anyway. This fixes ScummVM crashing on startup, caused by `-fvisibility` not being set. --- Ports/scummvm/package.sh | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/Ports/scummvm/package.sh b/Ports/scummvm/package.sh index 10ab632737..4d212deab2 100755 --- a/Ports/scummvm/package.sh +++ b/Ports/scummvm/package.sh @@ -15,19 +15,10 @@ launcher_category=Games launcher_command=/usr/local/bin/scummvm icon_file=icons/scummvm.ico -function pre_configure() { - export CPPFLAGS="-fvisibility=hidden" - export FREETYPE2_CFLAGS="-I${SERENITY_INSTALL_ROOT}/usr/local/include/freetype2" - export OPENGL_CFLAGS="-I${SERENITY_INSTALL_ROOT}/usr/include/LibGL" - export SDL_CFLAGS="-I${SERENITY_INSTALL_ROOT}/usr/local/include/SDL2" -} - -function post_configure() { - unset CPPFLAGS - unset FREETYPE2_CFLAGS - unset OPENGL_CFLAGS - unset SDL_CFLAGS -} +export CPPFLAGS="-fvisibility=hidden" +export FREETYPE2_CFLAGS="-I${SERENITY_INSTALL_ROOT}/usr/local/include/freetype2" +export OPENGL_CFLAGS="-I${SERENITY_INSTALL_ROOT}/usr/include/LibGL" +export SDL_CFLAGS="-I${SERENITY_INSTALL_ROOT}/usr/local/include/SDL2" function post_install() { icons_build_dir="${PORT_BUILD_DIR}/scummvm-icons"