diff options
| author | dillo <dillo@pkgsrc.org> | 2007-01-26 11:40:36 +0000 |
|---|---|---|
| committer | dillo <dillo@pkgsrc.org> | 2007-01-26 11:40:36 +0000 |
| commit | a3753b25b1686608bf134a035fb24f4cbc10152e (patch) | |
| tree | 4eb256da52b7e83842a51d574c2b73fc973e9170 /games/wesnoth | |
| parent | ca89d4c8453541d5d88f6f9d9af9db91179f4a22 (diff) | |
| download | pkgsrc-a3753b25b1686608bf134a035fb24f4cbc10152e.tar.gz | |
On NetBSD 3, turn off optimization for unit_types.cpp, since it
causes gcc to segfault with -O2.
Diffstat (limited to 'games/wesnoth')
| -rw-r--r-- | games/wesnoth/Makefile | 11 | ||||
| -rw-r--r-- | games/wesnoth/distinfo | 3 | ||||
| -rw-r--r-- | games/wesnoth/patches/patch-ab | 19 |
3 files changed, 31 insertions, 2 deletions
diff --git a/games/wesnoth/Makefile b/games/wesnoth/Makefile index 32f433e89ca..6d8a02469b9 100644 --- a/games/wesnoth/Makefile +++ b/games/wesnoth/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2007/01/15 22:26:25 wiz Exp $ +# $NetBSD: Makefile,v 1.34 2007/01/26 11:40:36 dillo Exp $ DISTNAME= wesnoth-1.2.1 CATEGORIES= games @@ -17,6 +17,15 @@ UNLIMIT_RESOURCES+= datasize REPLACE_PERL+= utils/wmlxgettext USE_TOOLS+= perl:run msgfmt +.include "../../mk/bsd.prefs.mk" + +# unit_types.cpp causes gcc to segfault at least on NetBSD 3. +# If you see this on other platforms, add them to the list. +# XXX: should we check for gcc versions? which ones? +.if !empty(MACHINE_PLATFORM:MNetBSD-3.[0-9]*) +MAKE_ENV+= ICE_NO_OPT=-O +.endif + BUILDLINK_API_DEPENDS.SDL+= SDL>=1.2.7 BUILDLINK_API_DEPENDS.SDL_mixer+= SDL_mixer>=1.2.5nb3 diff --git a/games/wesnoth/distinfo b/games/wesnoth/distinfo index e06723b6691..580015c27d5 100644 --- a/games/wesnoth/distinfo +++ b/games/wesnoth/distinfo @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.20 2007/01/15 22:26:25 wiz Exp $ +$NetBSD: distinfo,v 1.21 2007/01/26 11:40:36 dillo Exp $ SHA1 (wesnoth-1.2.1.tar.gz) = dd3a330cd7d908cd7e2f556deb7e25e1b45ecc0d RMD160 (wesnoth-1.2.1.tar.gz) = 50b4bb877fd15867b04ca1c2371ce683cac8e02b Size (wesnoth-1.2.1.tar.gz) = 74936071 bytes SHA1 (patch-aa) = 81e6dfe9c61209f66e3807ec0608be26ade344d0 +SHA1 (patch-ab) = ec6b1090fc18e6c60b6fc7b32894506a72f1f10b SHA1 (patch-ac) = 8aa4707fb34581d9f27c371967551054cee05b6d diff --git a/games/wesnoth/patches/patch-ab b/games/wesnoth/patches/patch-ab new file mode 100644 index 00000000000..2d365568418 --- /dev/null +++ b/games/wesnoth/patches/patch-ab @@ -0,0 +1,19 @@ +$NetBSD: patch-ab,v 1.5 2007/01/26 11:40:36 dillo Exp $ + +--- src/Makefile.in.orig 2007-01-25 15:18:34.000000000 +0000 ++++ src/Makefile.in +@@ -1231,6 +1231,14 @@ distclean-compile: + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + ++unit_types.o: unit_types.cpp ++@am__fastdepCXX_TRUE@ depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ ++@am__fastdepCXX_TRUE@ $(CXXCOMPILE) $(ICE_NO_OPT) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ ++@am__fastdepCXX_TRUE@ mv -f $$depbase.Tpo $$depbase.Po ++@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< ++ + .cpp.o: + @am__fastdepCXX_TRUE@ depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ + @am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ |