diff options
author | B. Watson <yalhcru@gmail.com> | 2022-02-23 00:13:24 -0500 |
---|---|---|
committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2022-02-23 20:10:27 +0700 |
commit | 00d56f29de0007d37da66a075ebc51b33cd97c56 (patch) | |
tree | 754f08a9cd90ae35ff900751b13cecc953d16734 /games | |
parent | 0f3ba2783edc290ad5725552e522d72375928996 (diff) |
games/crack-attack: Fix conflict with enet.
Signed-off-by: B. Watson <yalhcru@gmail.com>
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'games')
-rw-r--r-- | games/crack-attack/crack-attack.SlackBuild | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/games/crack-attack/crack-attack.SlackBuild b/games/crack-attack/crack-attack.SlackBuild index a9dfab654703..1d97535a9b78 100644 --- a/games/crack-attack/crack-attack.SlackBuild +++ b/games/crack-attack/crack-attack.SlackBuild @@ -22,11 +22,14 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# 20220222 bkw: Modified by SlackBuilds.org, BUILD=2: stop installing +# bogus libenet.a and enet includes that overwrite the ones from enet! + cd $(dirname $0) ; CWD=$(pwd) PRGNAM=crack-attack VERSION=${VERSION:-1.1.15_cvs_01} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -40,9 +43,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -77,9 +77,9 @@ cd $PRGNAM-$SRCVER chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ + -o -perm 511 \) -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ patch -p1 < $CWD/includes.patch @@ -100,6 +100,12 @@ LIBS="-ldl" \ make make install DESTDIR=$PKG +# 20220223 bkw: this builds its own (older) static enet library and +# links with it... but 'make install' erroneously installs it (which +# overwrites files from our enet package, breaking various other +# builds, including 7kaa). Kill it with fire. +rm -rf $PKG/usr/lib$LIBDIRSUFFIX $PKG/usr/include + find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true |