* [gentoo-commits] gentoo-x86 commit in games-board/pioneers/files: pioneers-15.1-build.patch
@ 2013-12-19 22:05 Julian Ospald (hasufell)
0 siblings, 0 replies; 3+ messages in thread
From: Julian Ospald (hasufell) @ 2013-12-19 22:05 UTC (permalink / raw
To: gentoo-commits
hasufell 13/12/19 22:05:19
Added: pioneers-15.1-build.patch
Log:
version bump
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key E73C35B3)
Revision Changes Path
1.1 games-board/pioneers/files/pioneers-15.1-build.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-board/pioneers/files/pioneers-15.1-build.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-board/pioneers/files/pioneers-15.1-build.patch?rev=1.1&content-type=text/plain
Index: pioneers-15.1-build.patch
===================================================================
From: Julian Ospald <hasufell@gentoo.org>
Date: Thu Dec 19 21:30:53 UTC 2013
* add --with-help switch
* don't use AM_CFLAGS in configure.ac, it is bad form
--- a/configure.ac
+++ b/configure.ac
@@ -129,12 +129,21 @@
*) pioneers_deprecationChecks=no ;;
esac])
+AC_ARG_WITH([help],
+ AS_HELP_STRING([--with-help],
+ [Enable gnome help via scrollkeeper.]),
+[case "${withval}" in
+ yes) with_help=yes ;;
+ "") with_help=yes ;;
+ *) with_help=no ;;
+esac])
+
## The warnings are in the same order as in 'man gcc'
if test "x$GCC" = xyes; then
# Flags from Debian hardening (dpkg-buildflags --get CFLAGS)
- AC_SUBST(AM_CFLAGS, ["$AM_CFLAGS -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -Werror=format-security"])
- AC_SUBST(AM_CFLAGS, ["$AM_CFLAGS -D_FORTIFY_SOURCE=2"])
- AC_SUBST(AM_CFLAGS, ["$AM_CFLAGS -pie -fPIE"])
+ AC_SUBST(CFLAGS, ["$CFLAGS -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -Werror=format-security"])
+ AC_SUBST(CFLAGS, ["$CFLAGS -D_FORTIFY_SOURCE=2"])
+ AC_SUBST(CFLAGS, ["$CFLAGS -pie -fPIE"])
if test "$pioneers_is_windows_port" = "no"; then
# Flags from Debian hardening (dpkg-buildflags --get LDFLAGS)
@@ -143,7 +152,7 @@
fi
# Only link the directly needed libraries
- AC_SUBST(AM_CFLAGS, ["$AM_CFLAGS -Wl,--as-needed"])
+ AC_SUBST(CFLAGS, ["$CFLAGS -Wl,--as-needed"])
if test "$pioneers_warnings" = yes -o "$pioneers_warnings" = full; then
AC_SUBST(WARNINGS, "-Wall")
@@ -385,7 +394,7 @@
AM_GLIB_GNU_GETTEXT
if test $pioneers_is_mingw_port = yes; then
- AC_SUBST(AM_CFLAGS, "-mms-bitfields $AM_CFLAGS")
+ AC_SUBST(CFLAGS, "-mms-bitfields $CFLAGS")
# No console window for the graphical applications
AC_SUBST(GTK2_LIBS, "$GTK2_LIBS -mwindows")
# Don't use bin, lib and share subdirectories
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in games-board/pioneers/files: pioneers-15.1-build.patch
@ 2013-12-19 23:24 Julian Ospald (hasufell)
0 siblings, 0 replies; 3+ messages in thread
From: Julian Ospald (hasufell) @ 2013-12-19 23:24 UTC (permalink / raw
To: gentoo-commits
hasufell 13/12/19 23:24:03
Modified: pioneers-15.1-build.patch
Log:
respect system CFLAGS/LDFLAGS
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key E73C35B3)
Revision Changes Path
1.2 games-board/pioneers/files/pioneers-15.1-build.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-board/pioneers/files/pioneers-15.1-build.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-board/pioneers/files/pioneers-15.1-build.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-board/pioneers/files/pioneers-15.1-build.patch?r1=1.1&r2=1.2
Index: pioneers-15.1-build.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/games-board/pioneers/files/pioneers-15.1-build.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pioneers-15.1-build.patch 19 Dec 2013 22:05:19 -0000 1.1
+++ pioneers-15.1-build.patch 19 Dec 2013 23:24:03 -0000 1.2
@@ -2,14 +2,24 @@
Date: Thu Dec 19 21:30:53 UTC 2013
* add --with-help switch
+* add --enable-minimal-flags switch
* don't use AM_CFLAGS in configure.ac, it is bad form
--- a/configure.ac
+++ b/configure.ac
-@@ -129,12 +129,21 @@
+@@ -129,21 +129,40 @@
*) pioneers_deprecationChecks=no ;;
esac])
++AC_ARG_ENABLE([minimal-flags],
++ AS_HELP_STRING([--enable-minimal-flags],
++ ["Don't add unneeded flags."]),
++[case "${enableval}" in
++ yes) minimal_flags=yes ;;
++ "") minimal_flags=no ;;
++ *) minimal_flags=no ;;
++esac])
++
+AC_ARG_WITH([help],
+ AS_HELP_STRING([--with-help],
+ [Enable gnome help via scrollkeeper.]),
@@ -19,33 +29,39 @@
+ *) with_help=no ;;
+esac])
+
++
## The warnings are in the same order as in 'man gcc'
- if test "x$GCC" = xyes; then
+-if test "x$GCC" = xyes; then
++if test "x$GCC" = xyes && test "x$minimal_flags" != xyes; then
# Flags from Debian hardening (dpkg-buildflags --get CFLAGS)
- AC_SUBST(AM_CFLAGS, ["$AM_CFLAGS -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -Werror=format-security"])
- AC_SUBST(AM_CFLAGS, ["$AM_CFLAGS -D_FORTIFY_SOURCE=2"])
- AC_SUBST(AM_CFLAGS, ["$AM_CFLAGS -pie -fPIE"])
-+ AC_SUBST(CFLAGS, ["$CFLAGS -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -Werror=format-security"])
-+ AC_SUBST(CFLAGS, ["$CFLAGS -D_FORTIFY_SOURCE=2"])
-+ AC_SUBST(CFLAGS, ["$CFLAGS -pie -fPIE"])
++ CFLAGS="$CFLAGS -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -Werror=format-security"
++ CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2"
++ CFLAGS="$CFLAGS -pie -fPIE"
if test "$pioneers_is_windows_port" = "no"; then
# Flags from Debian hardening (dpkg-buildflags --get LDFLAGS)
-@@ -143,7 +152,7 @@
+- AC_SUBST(AM_LDFLAGS, ["$AM_LDFLAGS -Wl,-z,relro"])
+- AC_SUBST(AM_LDFLAGS, ["$AM_LDFLAGS -Wl,-z,now"])
++ LDFLAGS="$LDFLAGS -Wl,-z,relro"
++ LDFLAGS="$LDFLAGS -Wl,-z,now"
fi
- # Only link the directly needed libraries
+- # Only link the directly needed libraries
- AC_SUBST(AM_CFLAGS, ["$AM_CFLAGS -Wl,--as-needed"])
-+ AC_SUBST(CFLAGS, ["$CFLAGS -Wl,--as-needed"])
++ # Only link the directly needed libraries
++ LDFLAGS="$LDFLAGS -Wl,--as-needed"
if test "$pioneers_warnings" = yes -o "$pioneers_warnings" = full; then
AC_SUBST(WARNINGS, "-Wall")
-@@ -385,7 +394,7 @@
+@@ -385,7 +404,7 @@
AM_GLIB_GNU_GETTEXT
if test $pioneers_is_mingw_port = yes; then
- AC_SUBST(AM_CFLAGS, "-mms-bitfields $AM_CFLAGS")
-+ AC_SUBST(CFLAGS, "-mms-bitfields $CFLAGS")
++ CFLAGS="-mms-bitfields $CFLAGS"
# No console window for the graphical applications
AC_SUBST(GTK2_LIBS, "$GTK2_LIBS -mwindows")
# Don't use bin, lib and share subdirectories
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in games-board/pioneers/files: pioneers-15.1-build.patch
@ 2015-03-12 18:48 Michael Sterrett (mr_bones_)
0 siblings, 0 replies; 3+ messages in thread
From: Michael Sterrett (mr_bones_) @ 2015-03-12 18:48 UTC (permalink / raw
To: gentoo-commits
mr_bones_ 15/03/12 18:48:21
Removed: pioneers-15.1-build.patch
Log:
old
(Portage version: 2.2.14/cvs/Linux x86_64, unsigned Manifest commit)
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-03-12 18:48 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-12-19 23:24 [gentoo-commits] gentoo-x86 commit in games-board/pioneers/files: pioneers-15.1-build.patch Julian Ospald (hasufell)
-- strict thread matches above, loose matches on Subject: below --
2015-03-12 18:48 Michael Sterrett (mr_bones_)
2013-12-19 22:05 Julian Ospald (hasufell)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox