diff --git a/common/hooks/post-install/06-strip-and-debug-pkgs.sh b/common/hooks/post-install/06-strip-and-debug-pkgs.sh index 4f05442525..109563deb5 100644 --- a/common/hooks/post-install/06-strip-and-debug-pkgs.sh +++ b/common/hooks/post-install/06-strip-and-debug-pkgs.sh @@ -99,7 +99,14 @@ hook() { return 1 fi echo " Stripped executable: ${f#$PKGDESTDIR}" - if [ -z "$nopie" ]; then + unset nopie_found + for x in ${nopie_files}; do + if [ "$x" = "${f#$PKGDESTDIR}" ]; then + nopie_found=1 + break + fi + done + if [ -z "$nopie" ] && [ -z "$nopie_found" ]; then msg_red "$pkgver: non-PIE executable found in PIE build: ${f#$PKGDESTDIR}\n" return 1 fi diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template index e01b732a58..d90322ac09 100644 --- a/srcpkgs/wine/template +++ b/srcpkgs/wine/template @@ -11,6 +11,8 @@ homepage="http://www.winehq.org/" distfiles="https://dl.winehq.org/wine/source/${version%.*}.x/wine-${version}.tar.xz" checksum=bafa04e8cfbb3c5fbb6bb5080fb5d3f2f6816ac69518d0ed50aceadb66b4abef +nopie_files="/usr/bin/wine" + CC="gcc" CFLAGS="-O2 -pipe" @@ -35,10 +37,7 @@ binfmts="/usr/bin/wine --magic MZ" build_options="staging" desc_option_staging="Enable wine-staging patchset" -#build_options_default="staging" - -# non-PIE executable found in PIE build: /usr/bin/wine -broken="https://build.voidlinux.eu/builders/i686_builder/builds/6118/steps/shell_3/logs/stdio" +build_options_default="staging" if [ ${build_option_staging} ]; then hostmakedepends+=" automake" @@ -47,7 +46,7 @@ fi if [ ${build_option_staging} ]; then makedepends+=" libva-devel gtk+3-devel" distfiles+=" https://github.com/wine-compholio/wine-staging/archive/v${version}.tar.gz" - checksum+=" 2fdb083a484708362433000f92b54a5d648df190b2ab084647c45f5624063bd2" + checksum+=" 20ff258de2dcc2f886fcb804c313963da060a55c89f5265c69510a2adfd04ba6" fi post_extract() {