* [gentoo-commits] gentoo-x86 commit in games-strategy/dunelegacy/files: dunelegacy-0.96.2-build.patch
@ 2012-08-09 20:44 Julian Ospald (hasufell)
0 siblings, 0 replies; 4+ messages in thread
From: Julian Ospald (hasufell) @ 2012-08-09 20:44 UTC (permalink / raw
To: gentoo-commits
hasufell 12/08/09 20:44:51
Added: dunelegacy-0.96.2-build.patch
Log:
initial commit
(Portage version: 2.2.0_alpha120/cvs/Linux x86_64)
Revision Changes Path
1.1 games-strategy/dunelegacy/files/dunelegacy-0.96.2-build.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/dunelegacy/files/dunelegacy-0.96.2-build.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/dunelegacy/files/dunelegacy-0.96.2-build.patch?rev=1.1&content-type=text/plain
Index: dunelegacy-0.96.2-build.patch
===================================================================
Author: hasufell <hasufell@gentoo.org>
Date: Thu Aug 9 18:57:40 2012 +0200
respect flags
use pkg-config
--- a/configure.ac
+++ b/configure.ac
@@ -16,37 +16,11 @@
AC_SUBST(dunelegacydatadir)
-dnl Some flags for gcc
-CXXFLAGS="-O3 -mno-fused-madd -pipe -pedantic -Wall -Wextra -Wno-unused-parameter"
-dnl Additional flags: -Wconversion -Wno-sign-conversion
-
-case "$target_cpu" in
-i*86) CXXFLAGS="$CXXFLAGS -mfpmath=sse -msse";;
-esac
-
-AC_ARG_ENABLE([debug],
- [AS_HELP_STRING([--enable-debug],
- [compile with debug information @<:@default=disabled@:>@])],
- [],
- [])
-
-if test "$enable_debug" = "yes" ; then
- CXXFLAGS="$CXXFLAGS -g"
-fi
-
dnl Check for SDL library
SDL_VERSION=1.2.0
-AM_PATH_SDL($SDL_VERSION, : , AC_MSG_ERROR([*** SDL version $SDL_VERSION not found!]))
-CFLAGS="$CFLAGS $SDL_CFLAGS"
-CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
-LIBS="$LIBS $SDL_LIBS"
-
-dnl Check for SDL_mixer library.
-AC_CHECK_LIB(SDL_mixer,
- Mix_OpenAudio,
- LIBS="$LIBS -lSDL_mixer",
- AC_MSG_ERROR([*** SDL_mixer library not found!])
-)
+PKG_CHECK_MODULES([SDL], [sdl >= 1.2.0 SDL_mixer])
+AM_CFLAGS="$SDL_CFLAGS"
+AM_CXXFLAGS="$SDL_CFLAGS"
dnl enet defines
AC_CHECK_FUNC(gethostbyaddr_r, [AC_DEFINE(HAS_GETHOSTBYADDR_R)])
@@ -71,4 +45,9 @@
dunelegacydatadir='.'
fi
+AC_SUBST([AM_CFLAGS])
+AC_SUBST([AM_CXXFLAGS])
+AC_SUBST([SDL_CFLAGS])
+AC_SUBST([SDL_LIBS])
+
AC_OUTPUT(Makefile src/Makefile tests/Makefile)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -194,4 +194,6 @@ dunelegacy_SOURCES = AStarSearch.cpp\
units/Trooper.cpp\
$(NULL)
+dunelegacy_LDADD = @SDL_LIBS@
+
AM_CPPFLAGS = -DDUNELEGACY_DATADIR='"$(dunelegacydatadir)"' -I$(top_srcdir)/include
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -54,5 +54,6 @@
-runtests_CXXFLAGS = $(CPPUNIT_CFLAGS) -DTESTSRC=\"$(srcdir)\" -I$(top_srcdir)/include
+runtests_CXXFLAGS = $(CPPUNIT_CFLAGS) -DTESTSRC=\"$(srcdir)\" -I$(top_srcdir)/include @SDL_CFLAGS@
+runtests_LDADD = @SDL_LIBS@
runtests_LDFLAGS = $(CPPUNIT_LIBS) -lcppunit
^ permalink raw reply [flat|nested] 4+ messages in thread* [gentoo-commits] gentoo-x86 commit in games-strategy/dunelegacy/files: dunelegacy-0.96.2-build.patch
@ 2012-08-10 20:24 Julian Ospald (hasufell)
0 siblings, 0 replies; 4+ messages in thread
From: Julian Ospald (hasufell) @ 2012-08-10 20:24 UTC (permalink / raw
To: gentoo-commits
hasufell 12/08/10 20:24:33
Modified: dunelegacy-0.96.2-build.patch
Log:
improve patch form
(Portage version: 2.2.0_alpha120/cvs/Linux x86_64)
Revision Changes Path
1.2 games-strategy/dunelegacy/files/dunelegacy-0.96.2-build.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/dunelegacy/files/dunelegacy-0.96.2-build.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/dunelegacy/files/dunelegacy-0.96.2-build.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/dunelegacy/files/dunelegacy-0.96.2-build.patch?r1=1.1&r2=1.2
Index: dunelegacy-0.96.2-build.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/games-strategy/dunelegacy/files/dunelegacy-0.96.2-build.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dunelegacy-0.96.2-build.patch 9 Aug 2012 20:44:51 -0000 1.1
+++ dunelegacy-0.96.2-build.patch 10 Aug 2012 20:24:33 -0000 1.2
@@ -6,7 +6,7 @@
--- a/configure.ac
+++ b/configure.ac
-@@ -16,37 +16,11 @@
+@@ -16,38 +16,13 @@
AC_SUBST(dunelegacydatadir)
@@ -31,48 +31,18 @@
dnl Check for SDL library
SDL_VERSION=1.2.0
-AM_PATH_SDL($SDL_VERSION, : , AC_MSG_ERROR([*** SDL version $SDL_VERSION not found!]))
--CFLAGS="$CFLAGS $SDL_CFLAGS"
--CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
--LIBS="$LIBS $SDL_LIBS"
--
++PKG_CHECK_MODULES([SDL], [sdl >= 1.2.0 SDL_mixer])
+ CFLAGS="$CFLAGS $SDL_CFLAGS"
+ CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
+ LIBS="$LIBS $SDL_LIBS"
+
-dnl Check for SDL_mixer library.
-AC_CHECK_LIB(SDL_mixer,
- Mix_OpenAudio,
- LIBS="$LIBS -lSDL_mixer",
- AC_MSG_ERROR([*** SDL_mixer library not found!])
-)
-+PKG_CHECK_MODULES([SDL], [sdl >= 1.2.0 SDL_mixer])
-+AM_CFLAGS="$SDL_CFLAGS"
-+AM_CXXFLAGS="$SDL_CFLAGS"
-
+-
dnl enet defines
AC_CHECK_FUNC(gethostbyaddr_r, [AC_DEFINE(HAS_GETHOSTBYADDR_R)])
-@@ -71,4 +45,9 @@
- dunelegacydatadir='.'
- fi
-
-+AC_SUBST([AM_CFLAGS])
-+AC_SUBST([AM_CXXFLAGS])
-+AC_SUBST([SDL_CFLAGS])
-+AC_SUBST([SDL_LIBS])
-+
- AC_OUTPUT(Makefile src/Makefile tests/Makefile)
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -194,4 +194,6 @@ dunelegacy_SOURCES = AStarSearch.cpp\
- units/Trooper.cpp\
- $(NULL)
-
-+dunelegacy_LDADD = @SDL_LIBS@
-+
- AM_CPPFLAGS = -DDUNELEGACY_DATADIR='"$(dunelegacydatadir)"' -I$(top_srcdir)/include
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -54,5 +54,6 @@
-
-
-
--runtests_CXXFLAGS = $(CPPUNIT_CFLAGS) -DTESTSRC=\"$(srcdir)\" -I$(top_srcdir)/include
-+runtests_CXXFLAGS = $(CPPUNIT_CFLAGS) -DTESTSRC=\"$(srcdir)\" -I$(top_srcdir)/include @SDL_CFLAGS@
-+runtests_LDADD = @SDL_LIBS@
- runtests_LDFLAGS = $(CPPUNIT_LIBS) -lcppunit
+ AC_CHECK_FUNC(gethostbyname_r, [AC_DEFINE(HAS_GETHOSTBYNAME_R)])
^ permalink raw reply [flat|nested] 4+ messages in thread
* [gentoo-commits] gentoo-x86 commit in games-strategy/dunelegacy/files: dunelegacy-0.96.2-build.patch
@ 2012-11-04 18:49 Julian Ospald (hasufell)
0 siblings, 0 replies; 4+ messages in thread
From: Julian Ospald (hasufell) @ 2012-11-04 18:49 UTC (permalink / raw
To: gentoo-commits
hasufell 12/11/04 18:49:44
Modified: dunelegacy-0.96.2-build.patch
Log:
use LDADD instead of LDFLAGS, possibly fixing bug 441694
(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key E73C35B3)
Revision Changes Path
1.3 games-strategy/dunelegacy/files/dunelegacy-0.96.2-build.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/dunelegacy/files/dunelegacy-0.96.2-build.patch?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/dunelegacy/files/dunelegacy-0.96.2-build.patch?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/dunelegacy/files/dunelegacy-0.96.2-build.patch?r1=1.2&r2=1.3
Index: dunelegacy-0.96.2-build.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/games-strategy/dunelegacy/files/dunelegacy-0.96.2-build.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- dunelegacy-0.96.2-build.patch 10 Aug 2012 20:24:33 -0000 1.2
+++ dunelegacy-0.96.2-build.patch 4 Nov 2012 18:49:44 -0000 1.3
@@ -3,9 +3,10 @@
respect flags
use pkg-config
+ use LDADD instead of LDFLAGS for libs
---- a/configure.ac
-+++ b/configure.ac
+--- configure.ac
++++ configure.ac
@@ -16,38 +16,13 @@
AC_SUBST(dunelegacydatadir)
@@ -46,3 +47,11 @@
dnl enet defines
AC_CHECK_FUNC(gethostbyaddr_r, [AC_DEFINE(HAS_GETHOSTBYADDR_R)])
AC_CHECK_FUNC(gethostbyname_r, [AC_DEFINE(HAS_GETHOSTBYNAME_R)])
+--- tests/Makefile.am
++++ tests/Makefile.am
+@@ -55,4 +55,4 @@
+
+
+ runtests_CXXFLAGS = $(CPPUNIT_CFLAGS) -DTESTSRC=\"$(srcdir)\" -I$(top_srcdir)/include
+-runtests_LDFLAGS = $(CPPUNIT_LIBS) -lcppunit
++runtests_LDADD = $(CPPUNIT_LIBS) -lcppunit
^ permalink raw reply [flat|nested] 4+ messages in thread* [gentoo-commits] gentoo-x86 commit in games-strategy/dunelegacy/files: dunelegacy-0.96.2-build.patch
@ 2015-01-28 17:44 Michael Sterrett (mr_bones_)
0 siblings, 0 replies; 4+ messages in thread
From: Michael Sterrett (mr_bones_) @ 2015-01-28 17:44 UTC (permalink / raw
To: gentoo-commits
mr_bones_ 15/01/28 17:44:27
Removed: dunelegacy-0.96.2-build.patch
Log:
old
(Portage version: 2.2.14/cvs/Linux x86_64, unsigned Manifest commit)
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-01-28 20:12 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-08-09 20:44 [gentoo-commits] gentoo-x86 commit in games-strategy/dunelegacy/files: dunelegacy-0.96.2-build.patch Julian Ospald (hasufell)
-- strict thread matches above, loose matches on Subject: below --
2012-08-10 20:24 Julian Ospald (hasufell)
2012-11-04 18:49 Julian Ospald (hasufell)
2015-01-28 17:44 Michael Sterrett (mr_bones_)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox