diff --git a/srcpkgs/rott/patches/no_execinfo.patch b/srcpkgs/rott/patches/no_execinfo.patch deleted file mode 100644 index 3391de78ef1..00000000000 --- a/srcpkgs/rott/patches/no_execinfo.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- rott/dosutil.c.orig 2016-07-06 16:39:54.045772922 -0400 -+++ rott/dosutil.c 2016-07-06 16:40:27.862760218 -0400 -@@ -197,7 +197,7 @@ - printf ("\033[m"); - } - --#if !defined(__CYGWIN__) && !defined(__MINGW32__) -+#if defined(__GLIBC__) - #include - - void print_stack (int level) diff --git a/srcpkgs/rott/template b/srcpkgs/rott/template index 428807ab076..8ed9236e672 100644 --- a/srcpkgs/rott/template +++ b/srcpkgs/rott/template @@ -1,20 +1,22 @@ # Template file for 'rott' pkgname=rott version=1.1.2 -revision=1 -build_style=gnu-makefile +revision=2 build_wrksrc=rott -makedepends="SDL_mixer-devel" -short_desc="A port of Apogee's 3D action title Rise of the Triad" +build_style=gnu-makefile +make_use_env=yes +makedepends="SDL_mixer-devel SDL-devel" +short_desc="Port of Apogee's 3D action title Rise of the Triad" maintainer="Diogo Leal " -license="GPL-2" +license="GPL-2.0-or-later" homepage="http://icculus.org/rott/" distfiles="${homepage}/releases/rott-${version}.tar.gz" checksum=102516e8c312f6b0bbf6c623e1f01cbfbbc314ace8adfe1f201d47b15bd927ff -do_build() { - make -} +if [ "$XBPS_TARGET_LIBC" = musl ]; then + makedepends+=" libexecinfo-devel" + export LDLIBS="-lexecinfo" +fi do_install() { vbin "${FILESDIR}/rott" @@ -23,9 +25,3 @@ do_install() { vinstall ../misc/rott.desktop 644 usr/share/applications vinstall ../misc/rott.xpm 644 usr/share/pixmaps/rott.xpm } - -# REMARKS: -# There is a single patch in place because a feature is optionally disabled for -# mingw but we need it disabled for musl, since it's not in muslc. -# The makefile is currently very nice and uses our CFLAGS and LDFLAGS without -# any patching.