From 08f6310a0c4bfedfd6527e249fb2308ba5a2571f Mon Sep 17 00:00:00 2001 From: jc_gargma Date: Sat, 3 Aug 2024 21:29:19 -0700 Subject: Rebuild with fixed libs and fixed lto. --- PKGBUILD | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index dcd8454..d94f4e1 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -9,14 +9,16 @@ pkgname=openxcom pkgver=1.0 -pkgrel=8 +pkgrel=9 pkgdesc="An open-source reimplementation of the famous X-COM game" arch=('i686' 'x86_64' 'aarch64') url="https://openxcom.org/" -license=('GPL3') -depends=('sdl_gfx' 'sdl_mixer' 'sdl_image' 'yaml-cpp' 'mesa') -makedepends=('boost' 'glu' 'xmlto' 'docbook-xml' 'docbook-xsl' 'xorgproto') -options=('lto') +license=('GPL-3.0-or-later') +depends=('gcc-libs' 'glibc' 'libglvnd' 'sdl12-compat' 'sdl_gfx' 'sdl_image' 'sdl_mixer' 'yaml-cpp') +makedepends=('boost' 'docbook-xml' 'docbook-xsl' 'glu' 'xmlto' 'xorgproto') +# # For some reason this breaks compiling. "error: C++ compiler cannot create executables" +# # But old-fashioned raw injection of -flto=auto via export doesn't. +options=('!lto') install="${pkgname}.install" source=(${pkgname}-${pkgver}.tar.gz::"https://github.com/SupSuper/OpenXcom/archive/v1.0.tar.gz" "openxcom-abs-fix.patch" @@ -36,8 +38,8 @@ prepare() { build() { cd OpenXcom-${pkgver} - export CFLAGS="$CFLAGS -O3 -fstack-protector-all -fPIE" - export CXXFLAGS="$CXXFLAGS -O3 -fstack-protector-all -fPIE" + export CFLAGS="$CFLAGS -O3 -fstack-protector-all -flto=auto -fPIE" + export CXXFLAGS="$CXXFLAGS -O3 -fstack-protector-all -flto=auto -fPIE" export LDFLAGS="$LDFLAGS,-pie" ./autogen.sh ./configure --prefix=/usr --without-docs --disable-werror -- cgit v1.2.1