[hedgewars] 01/01: Prepare fix for fPIC/arm

[Gianfranco Costamagna]

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

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

commit 9f2f674e4c9133bece6108293d1bbf863a02a965
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Tue Mar 8 17:11:41 2016 +0100

    Prepare fix for fPIC/arm
---
 debian/changelog                      |  6 ++++--
 debian/patches/fix-arm-failures.patch | 12 ++++++++++++
 debian/patches/series                 |  1 +
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a260291..0cc1d3b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
-hedgewars (0.9.22-dfsg-5) UNRELEASED; urgency=medium
+hedgewars (0.9.22-dfsg-5) unstable; urgency=medium
 
-  * Fix VCS fields.
+  * Fix insecure VCS fields.
   * Bump std-version to 3.9.7.
   * Bump watch file to 4.
+  * Fix build on arm* by disabling again fPIC (cfr: #813452).
+    - patch actually commented.
 
  -- Gianfranco Costamagna <locutusofborg at debian.org>  Mon, 22 Feb 2016 16:02:39 +0100
 
diff --git a/debian/patches/fix-arm-failures.patch b/debian/patches/fix-arm-failures.patch
new file mode 100644
index 0000000..f35937c
--- /dev/null
+++ b/debian/patches/fix-arm-failures.patch
@@ -0,0 +1,12 @@
+Description: disable again fPIC on arm.
+--- hedgewars-0.9.22-dfsg.orig/hedgewars/CMakeLists.txt
++++ hedgewars-0.9.22-dfsg/hedgewars/CMakeLists.txt
+@@ -15,7 +15,7 @@ add_flag_append(CMAKE_Pascal_FLAGS_RELEA
+ if(UNIX)
+     include(TargetArch)
+     target_architecture(CMAKE_TARGET_ARCHITECTURES)
+-    if(${CMAKE_Pascal_COMPILER_VERSION} VERSION_GREATER 2.7 OR ${CMAKE_TARGET_ARCHITECTURES} MATCHES "x86_64" OR ${CMAKE_TARGET_ARCHITECTURES} MATCHES "i386")
++    if((${CMAKE_Pascal_COMPILER_VERSION} VERSION_GREATER 2.7 AND ${CMAKE_Pascal_COMPILER_VERSION} VERSION_LESS 3.0) OR ${CMAKE_TARGET_ARCHITECTURES} MATCHES "x86_64" OR ${CMAKE_TARGET_ARCHITECTURES} MATCHES "i386")
+         add_flag_append(CMAKE_Pascal_FLAGS "-fPIC")
+     endif()
+ endif(UNIX)
diff --git a/debian/patches/series b/debian/patches/series
index 6283151..9aac284 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,3 +12,4 @@ a0e5bd1d4d77c1558394d9ac6b6b8a5030ef5282.patch
 ce3a58617e5732376b4ef5d47fc2be73b705a154.patch
 93292d80924aeadfda9f327ba78891cc4bab6c3c.patch
 f121e6c350a041a429a57ba4748ad673aa8420ea.patch
+#fix-arm-failures.patch

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