This is an automated email from the git hooks/post-receive script. locutusofborg-guest pushed a commit to branch master in repository hedgewars.
commit fea90196e539eda6821b3c8a606cd44eddb4d01e Author: Gianfranco Costamagna <[email protected]> Date: Wed Jan 7 08:31:16 2015 +0100 Avoid fstack with -no-fstack flag --- debian/changelog | 7 +++++++ debian/control | 1 - debian/patches/disable-fstack-protector.patch | 9 +++++++-- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9eced39..f9149d9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +hedgewars (0.9.21.1-2) experimental; urgency=medium + + * Try to not use fstack-protector when BUILD_ENGINE_C, clang is + failing to build on arch != arm64. + + -- Gianfranco Costamagna <[email protected]> Wed, 07 Jan 2015 06:55:03 +0100 + hedgewars (0.9.21.1-1) unstable; urgency=medium * New upstream bugfix release. diff --git a/debian/control b/debian/control index 440cfb1..abd1662 100644 --- a/debian/control +++ b/debian/control @@ -30,7 +30,6 @@ Build-Depends: clang [arm64 hurd-i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel p libghc-zlib-dev, 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, libpng-dev, libqt4-dev, diff --git a/debian/patches/disable-fstack-protector.patch b/debian/patches/disable-fstack-protector.patch index c225ecf..087de2e 100644 --- a/debian/patches/disable-fstack-protector.patch +++ b/debian/patches/disable-fstack-protector.patch @@ -1,8 +1,8 @@ diff --git a/cmake_modules/compilerchecks.cmake b/cmake_modules/compilerchecks.cmake -index 2029712..aba4abc 100644 +index 2029712..26a15e4 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 +@@ -17,9 +17,12 @@ 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) @@ -10,4 +10,9 @@ index 2029712..aba4abc 100644 + 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") ++ else() ++ add_flag_append(CMAKE_C_FLAGS "-fnostack-protector") ++ add_flag_append(CMAKE_CXX_FLAGS "-fnostack-protector") endif() + endif() + -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/hedgewars.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
