r20469 by craig -
scribus-commit
scribus-commit at lists.scribus.net
Sat Oct 17 21:38:42 UTC 2015
Author: craig
Date: Sat Oct 17 21:38:41 2015
New Revision: 20469
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=20469
Log:
#13427: Apple Gentoo patch to standardise use of -fPIC
Modified:
trunk/Scribus/CMakeLists.txt
trunk/Scribus/scribus/colormgmt/CMakeLists.txt
trunk/Scribus/scribus/desaxe/CMakeLists.txt
trunk/Scribus/scribus/fonts/CMakeLists.txt
trunk/Scribus/scribus/styles/CMakeLists.txt
trunk/Scribus/scribus/text/CMakeLists.txt
trunk/Scribus/scribus/third_party/lib2geom/CMakeLists.txt
trunk/Scribus/scribus/third_party/pgf/CMakeLists.txt
trunk/Scribus/scribus/third_party/rtf-qt/CMakeLists.txt
trunk/Scribus/scribus/third_party/wpg/CMakeLists.txt
trunk/Scribus/scribus/third_party/zip/CMakeLists.txt
Modified: trunk/Scribus/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20469&path=/trunk/Scribus/CMakeLists.txt
==============================================================================
--- trunk/Scribus/CMakeLists.txt (original)
+++ trunk/Scribus/CMakeLists.txt Sat Oct 17 21:38:41 2015
@@ -130,6 +130,20 @@
SET(ARCH_SPARC64 1)
SET(ARCH64BIT 1)
ENDIF (_machine_sparc64)
+
+STRING(REGEX MATCH "(hppa*)" _machine_hppa "${MACHINE}")
+IF (_machine_hppa)
+ MESSAGE(STATUS "Found target Hppa")
+ SET(ARCH_HPPA 1)
+ENDIF (_machine_hppa)
+
+# We need to pass -fPIC to lib2geom on amd64, mips, mipsel, and hppa. 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)
+ SET(CMAKE_CXX_FLAGS_FPIC "-fPIC")
+ENDIF (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)
## Do our Apple OSX version setup
IF (APPLE AND CMAKE_SIZEOF_VOID_P EQUAL 8 AND (ARCH_X86 EQUAL 1 OR ARCH_X86_64 EQUAL 1))
Modified: trunk/Scribus/scribus/colormgmt/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20469&path=/trunk/Scribus/scribus/colormgmt/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/colormgmt/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/colormgmt/CMakeLists.txt Sat Oct 17 21:38:41 2015
@@ -2,6 +2,8 @@
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/scribus
)
+
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}")
INCLUDE_DIRECTORIES( ${LCMS2_INCLUDE_DIR} )
SET(SCRIBUS_LCMS_IMPL_SOURCES
Modified: trunk/Scribus/scribus/desaxe/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20469&path=/trunk/Scribus/scribus/desaxe/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/desaxe/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/desaxe/CMakeLists.txt Sat Oct 17 21:38:41 2015
@@ -4,6 +4,7 @@
${FREETYPE_INCLUDE_DIRS}
)
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}")
SET(SCRIBUS_DESAXE_LIB_SOURCES
saxXML.cpp
Modified: trunk/Scribus/scribus/fonts/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20469&path=/trunk/Scribus/scribus/fonts/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/fonts/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/fonts/CMakeLists.txt Sat Oct 17 21:38:41 2015
@@ -4,6 +4,7 @@
${FREETYPE_INCLUDE_DIRS}
)
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}")
SET(SCRIBUS_FONTS_LIB_SOURCES
scface.cpp
Modified: trunk/Scribus/scribus/styles/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20469&path=/trunk/Scribus/scribus/styles/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/styles/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/styles/CMakeLists.txt Sat Oct 17 21:38:41 2015
@@ -3,6 +3,8 @@
${CMAKE_SOURCE_DIR}/scribus
${FREETYPE_INCLUDE_DIRS}
)
+
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}")
SET(SCRIBUS_STYLES_MOC_CLASSES
)
Modified: trunk/Scribus/scribus/text/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20469&path=/trunk/Scribus/scribus/text/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/text/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/text/CMakeLists.txt Sat Oct 17 21:38:41 2015
@@ -4,6 +4,7 @@
${FREETYPE_INCLUDE_DIRS}
)
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}")
SET(SCRIBUS_TEXT_MOC_CLASSES
storytext.h
Modified: trunk/Scribus/scribus/third_party/lib2geom/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20469&path=/trunk/Scribus/scribus/third_party/lib2geom/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/third_party/lib2geom/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/third_party/lib2geom/CMakeLists.txt Sat Oct 17 21:38:41 2015
@@ -5,13 +5,7 @@
SET(2GEOM_VERSION 0.1.0)
-# We need to pass -fPIC to lib2geom on amd64, mips, mipsel, and hppa. 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)
- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
-ENDIF (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 "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}")
OPTION(2GEOM_BUILD_SHARED
"Build lib2geom and libtoy as shared libraries."
Modified: trunk/Scribus/scribus/third_party/pgf/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20469&path=/trunk/Scribus/scribus/third_party/pgf/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/third_party/pgf/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/third_party/pgf/CMakeLists.txt Sat Oct 17 21:38:41 2015
@@ -2,6 +2,8 @@
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/scribus
)
+
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}")
SET(SCRIBUS_PGF_LIB_SOURCES
Decoder.cpp
Modified: trunk/Scribus/scribus/third_party/rtf-qt/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20469&path=/trunk/Scribus/scribus/third_party/rtf-qt/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/third_party/rtf-qt/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/third_party/rtf-qt/CMakeLists.txt Sat Oct 17 21:38:41 2015
@@ -2,6 +2,8 @@
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/scribus
)
+
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}")
SET(SCRIBUS_RTF_LIB_SOURCES
AbstractRtfOutput.cpp
Modified: trunk/Scribus/scribus/third_party/wpg/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20469&path=/trunk/Scribus/scribus/third_party/wpg/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/third_party/wpg/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/third_party/wpg/CMakeLists.txt Sat Oct 17 21:38:41 2015
@@ -2,10 +2,11 @@
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/scribus
)
+
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}")
+
SET(LIB_TYPE STATIC)
-IF (ARCH_X86_64 EQUAL 1)
- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
-ENDIF (ARCH_X86_64 EQUAL 1)
+
SET(WPG_SOURCES
WPG1Parser.cpp
WPG2Parser.cpp
Modified: trunk/Scribus/scribus/third_party/zip/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20469&path=/trunk/Scribus/scribus/third_party/zip/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/third_party/zip/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/third_party/zip/CMakeLists.txt Sat Oct 17 21:38:41 2015
@@ -3,6 +3,8 @@
${CMAKE_SOURCE_DIR}/scribus
${ZLIB_INCLUDE_DIR}
)
+
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}")
SET(SCRIBUS_ZIP_LIB_SOURCES
unzip.cpp
More information about the scribus-commit
mailing list