summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2018-01-09 14:32:06 +0100
committerAndreas Sturmlechner <asturm@gentoo.org>2018-01-09 14:46:14 +0100
commit011a496c85cf6f36b24082a3ac55f6b63162f2e5 (patch)
tree9d3c9586e516f95061edea7638773d003d49bc44 /app-office/scribus/files
parentnet-analyzer/wapiti: 3.0.0 bump (diff)
downloadgentoo-011a496c85cf6f36b24082a3ac55f6b63162f2e5.tar.gz
gentoo-011a496c85cf6f36b24082a3ac55f6b63162f2e5.tar.bz2
gentoo-011a496c85cf6f36b24082a3ac55f6b63162f2e5.zip
app-office/scribus: Fix build w/ x86 on 17.0 profile
Closes: https://bugs.gentoo.org/642242 Package-Manager: Portage-2.3.19, Repoman-2.3.6
Diffstat (limited to 'app-office/scribus/files')
-rw-r--r--app-office/scribus/files/scribus-1.5.3-x86-fpic.patch16
1 files changed, 16 insertions, 0 deletions
diff --git a/app-office/scribus/files/scribus-1.5.3-x86-fpic.patch b/app-office/scribus/files/scribus-1.5.3-x86-fpic.patch
new file mode 100644
index 000000000000..03d4dc4daa3c
--- /dev/null
+++ b/app-office/scribus/files/scribus-1.5.3-x86-fpic.patch
@@ -0,0 +1,16 @@
+--- a/CMakeLists.txt 2017-05-28 11:10:27.000000000 +0200
++++ b/CMakeLists.txt 2018-01-09 14:26:14.494922353 +0100
+@@ -155,11 +155,11 @@
+ set(ARCH_HPPA 1)
+ endif()
+
+-# We need to pass -fPIC to lib2geom on amd64, mips, mipsel, and hppa. See:
++# We need to pass -fPIC to lib2geom on amd64, mips, mipsel, hppa and x86. See:
+ # http://www.gentoo.org/proj/en/base/amd64/howtos/index.xml?part=1&chap=3 and
+ # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=559133
+
+-if (ARCH_X86_64 EQUAL 1 OR ARCH_HPPA EQUAL 1 OR ARCH_MIPS EQUAL 1 OR ARCH_MIPS_64 EQUAL 1 OR ARCH_PPC_64 EQUAL 1)
++if (ARCH_X86 EQUAL 1 OR ARCH_X86_64 EQUAL 1 OR ARCH_HPPA EQUAL 1 OR ARCH_MIPS EQUAL 1 OR ARCH_MIPS_64 EQUAL 1 OR ARCH_PPC_64 EQUAL 1)
+ set(CMAKE_CXX_FLAGS_FPIC "-fPIC")
+ endif()
+