[hedgewars] 01/01: Disable fstack protector when BUILD_ENGINE_C=ON

[Gianfranco Costamagna]

This is an automated email from the git hooks/post-receive script.

locutusofborg-guest pushed a commit to branch experimental
in repository hedgewars.

commit bdcc359482f980300640d89518381a13f426f6ea
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Wed Dec 10 17:33:31 2014 +0100

    Disable fstack protector when BUILD_ENGINE_C=ON
---
 debian/changelog                              |  6 ++++++
 debian/control                                |  4 ++--
 debian/patches/disable-fstack-protector.patch | 13 +++++++++++++
 debian/patches/series                         |  1 +
 4 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d544fa1..4c3e7f9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+hedgewars (0.9.20.5+git20141210-2) experimental; urgency=medium
+
+  * Add disable-fstack-protector.patch
+
+ -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it>  Wed, 10 Dec 2014 17:33:06 +0100
+
 hedgewars (0.9.20.5+git20141210-1) experimental; urgency=medium
 
   * New upstream release snapshot.
diff --git a/debian/control b/debian/control
index cd09107..440cfb1 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Dmitry E. Oboukhov <unera at debian.org>,
            Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
 Standards-Version: 3.9.6
-Build-Depends: clang [arm64 hurd-i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel ppc64el alpha hppa m68k powerpcspe sh4 x32],
+Build-Depends: clang [arm64 hurd-i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel ppc64el s390x alpha hppa m68k powerpcspe sh4 x32],
                cmake,
                debhelper (>= 9),
                dpkg-dev (>= 1.16.1~),
@@ -28,7 +28,7 @@ Build-Depends: clang [arm64 hurd-i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel p
                libghc-utf8-string-dev,
                libghc-vector-dev,
                libghc-zlib-dev,
-               libglew-dev [arm64 hurd-i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel ppc64el alpha hppa m68k powerpcspe sh4 x32],
+               libglew-dev [arm64 hurd-i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel ppc64el s390x alpha hppa m68k powerpcspe sh4 x32],
                liblua5.1-dev,
 # new dependency
                libphysfs-dev,
diff --git a/debian/patches/disable-fstack-protector.patch b/debian/patches/disable-fstack-protector.patch
new file mode 100644
index 0000000..c225ecf
--- /dev/null
+++ b/debian/patches/disable-fstack-protector.patch
@@ -0,0 +1,13 @@
+diff --git a/cmake_modules/compilerchecks.cmake b/cmake_modules/compilerchecks.cmake
+index 2029712..aba4abc 100644
+--- a/cmake_modules/compilerchecks.cmake
++++ b/cmake_modules/compilerchecks.cmake
+@@ -17,7 +17,7 @@ if(NOT (WIN32 OR (CMAKE_SYSTEM_NAME MATCHES BSD.OS) OR (CMAKE_SYSTEM_NAME MATCHE
+     #some bsd installations reported problems too
+     #(see 822312 654424 on bugzilla.redhat.com)
+     check_c_compiler_flag("-fstack-protector-all -fstack-protector" HAVE_STACKPROTECTOR)
+-    if(HAVE_STACKPROTECTOR)
++    if(HAVE_STACKPROTECTOR AND NOT BUILD_ENGINE_C)
+         add_flag_append(CMAKE_C_FLAGS "-fstack-protector-all -fstack-protector")
+         add_flag_append(CMAKE_CXX_FLAGS "-fstack-protector-all -fstack-protector")
+     endif()
diff --git a/debian/patches/series b/debian/patches/series
index 0ba91bd..10c6876 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0001-Fix-segfault-when-BUILD_ENGINE_C-ON-and-FONTS_DIR-is.patch
+disable-fstack-protector.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/hedgewars.git