From 759f73ede522f01c18de9a222c930dbf8e532924 Mon Sep 17 00:00:00 2001 From: Christian Neukirchen Date: Tue, 24 May 2016 15:14:02 +0200 Subject: [PATCH] bsd-games: apply CFLAGS/LDFLAGS when hardening is active. --- srcpkgs/bsd-games/template | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/srcpkgs/bsd-games/template b/srcpkgs/bsd-games/template index 101e037ba1..87e1ba5d6f 100644 --- a/srcpkgs/bsd-games/template +++ b/srcpkgs/bsd-games/template @@ -1,7 +1,7 @@ # Template file for 'bsd-games'. Based on Arch PKGBUILD by Chris Brannon. pkgname=bsd-games version=2.17 -revision=2 +revision=3 patch_args="-Np1" build_style=gnu-configure make_dirs=" @@ -20,13 +20,6 @@ checksum=066f924aef6c1c5ea946f588e36f303021f5dfc093944738f025d8edbc6fff60 nocross=yes post_extract() { - cp ${FILESDIR}/config.params . - - echo "bsd_games_cfg_cc='$CC'" >>config.params - echo "bsd_games_cfg_cxx='$CXX'" >>config.params - echo "bsd_games_cfg_other_cflags='$CFLAGS'" >>config.params - echo "bsd_games_cfg_other_ldflags='$LDFLAGS'" >>config.params - sed -i "s/FISH/GO-FISH/g; s/\.Nm fish/\.Nm go-fish/g" fish/fish.6 sed -i "s/tenths/tenth/g" tests/number.-0.1 sed -i "s/Elegy{ Written in a Country Church{-| }Yard:/Elegy{ Written in a Country Church{-| }Yard}:/g" quiz/datfiles/poetry @@ -42,7 +35,13 @@ post_extract() { sed -i '1i#include ' wump/wump.c sed -i 's/-DOTTO//' hunt/Makeconfig } - +pre_configure() { + cp ${FILESDIR}/config.params . + echo "bsd_games_cfg_cc='$CC'" >>config.params + echo "bsd_games_cfg_cxx='$CXX'" >>config.params + echo "bsd_games_cfg_other_cflags='$CFLAGS'" >>config.params + echo "bsd_games_cfg_other_ldflags='$LDFLAGS'" >>config.params +} do_install() { echo >install-score sed -i "s|PKGDIR|$DESTDIR|g" hide-game install-man install-score Makeconfig subst.sed