Upgrading to GitLab 11.11.0.

Commit 3ad50f15 authored by Mike Gabriel's avatar Mike Gabriel

debian/patches: Add 0007_Fix-build-failure-on-x32.patch. Fix FTBFS on x32...

debian/patches: Add 0007_Fix-build-failure-on-x32.patch. Fix FTBFS on x32 architecture. Thanks to Adam Borowski for providing this patch. (Closes: #808503).
parent 7298c5b6
>From 15d5037df438e60f2c5439184dbe7ea232cbd100 Mon Sep 17 00:00:00 2001
From: Adam Borowski <kilobyte@angband.pl>
Date: Thu, 29 Jan 2015 05:50:12 +0100
Subject: [PATCH] Fix build failure on x32.
Unlike i386, x32 can't accept -march=i686 but wants -fPIC, same as amd64
(both are x86_64 ABIs after all). Thus, check for the __x86_64__ define
instead of pointer width.
---
CMakeLists.txt | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -33,6 +33,7 @@
# Include cmake modules
include(CheckIncludeFiles)
include(CheckLibraryExists)
+include(CheckSymbolExists)
include(CheckStructHasMember)
include(CMakeDetermineSystem)
include(FindPkgConfig)
@@ -112,7 +113,8 @@
# Compiler-specific flags
if(CMAKE_COMPILER_IS_GNUCC)
if(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64" OR CMAKE_SYSTEM_PROCESSOR MATCHES "i686")
- if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+ CHECK_SYMBOL_EXISTS(__x86_64__ "" IS_X86_64)
+ if(IS_X86_64)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
else()
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -march=i686")
...@@ -16,3 +16,4 @@ ...@@ -16,3 +16,4 @@
1011_ffmpeg-2.9.patch 1011_ffmpeg-2.9.patch
0005_release-keys-when-xfreerdp-is-unfocused-to-prevent-s.patch 0005_release-keys-when-xfreerdp-is-unfocused-to-prevent-s.patch
0006_fix-null-cert-that-is-not-an-error.patch 0006_fix-null-cert-that-is-not-an-error.patch
0007_Fix-build-failure-on-x32.patch
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment