r14420 by malex - add checks for hppa and mips for lib2geom build with -fPIC

[scribus-commit]

Revision: 14420
Author: malex
Date: 2009-12-16T11:12:08.910377Z
Commit message: add checks for hppa and mips for lib2geom build with -fPIC

Changeset: 
M  /branches/Version135/Scribus/CMakeLists.txt
M  /branches/Version135/Scribus/scribus/plugins/tools/2geomtools/lib2geom/CMakeLists.txt

Diffs:
Index: scribus/plugins/tools/2geomtools/lib2geom/CMakeLists.txt
===================================================================
--- scribus/plugins/tools/2geomtools/lib2geom/CMakeLists.txt	(revision 14419)
+++ scribus/plugins/tools/2geomtools/lib2geom/CMakeLists.txt	(revision 14420)
@@ -14,10 +14,13 @@
 # SET(CMAKE_CXX_FLAGS "${GTK2_CFLAGS} ${cairo_CFLAGS} -Wall")
 #CB SET(CMAKE_CXX_FLAGS "-Wall")
 #CB SET(CMAKE_MAKE_PROGRAM "${CMAKE_MAKE_PROGRAM}")
-# We need to pass -fPIC only to lib2geom on amd64 - avoid it elsewhere see: http://www.gentoo.org/proj/en/base/amd64/howtos/index.xml?part=1&chap=3
-IF (ARCH_X86_64 EQUAL 1)
+# 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)
   SET(CMAKE_CXX_FLAGS "$(CMAKE_CXX_FLAGS) -fPIC")
-ENDIF (ARCH_X86_64 EQUAL 1)
+ENDIF (ARCH_X86_64 EQUAL 1 OR ARCH_HPPA EQUAL 1 OR ARCH_MIPS EQUAL 1 OR ARCH_MIPS_64 EQUAL 1)
 
 OPTION(2GEOM_BUILD_SHARED
   "Build lib2geom and libtoy as shared libraries."
Index: CMakeLists.txt
===================================================================
--- CMakeLists.txt	(revision 14419)
+++ CMakeLists.txt	(revision 14420)
@@ -120,6 +120,18 @@
     SET(ARCH_MIPS_64 1)
 ENDIF (_machine_mips_64)
 
+STRING(REGEX MATCH "(mips-*)|(MIPS-*)" _machine_mips "${MACHINE}")
+IF (_machine_mips)
+    MESSAGE(STATUS "Found target MIPS")
+    SET(ARCH_MIPS 1)
+ENDIF (_machine_mips)
+
+STRING(REGEX MATCH "(hppa-*)" _machine_hppa "${MACHINE}")
+IF (_machine_hppa)
+    MESSAGE(STATUS "Found target HPPA")
+    SET(ARCH_HPPA 1)
+ENDIF (_machine_hppa)
+
 STRING(REGEX MATCH "(ppc-*)|(powerpc-*)" _machine_ppc "${MACHINE}")
 IF (_machine_ppc)
     MESSAGE(STATUS "Found target PPC")