[145784] trunk/dports/graphics/graphite2/files/patch-src-CMakeLists.txt. diff

[ryandesign at macports.org]

Revision: 145784
          https://trac.macports.org/changeset/145784
Author:   ryandesign at macports.org
Date:     2016-02-16 22:49:02 -0800 (Tue, 16 Feb 2016)
Log Message:
-----------
graphite2: fix build on Snow Leopard and earlier by not using -Wimplicit-fallthrough when not using clang

Modified Paths:
--------------
    trunk/dports/graphics/graphite2/files/patch-src-CMakeLists.txt.diff

Modified: trunk/dports/graphics/graphite2/files/patch-src-CMakeLists.txt.diff
===================================================================
--- trunk/dports/graphics/graphite2/files/patch-src-CMakeLists.txt.diff	2016-02-17 06:13:02 UTC (rev 145783)
+++ trunk/dports/graphics/graphite2/files/patch-src-CMakeLists.txt.diff	2016-02-17 06:49:02 UTC (rev 145784)
@@ -1,20 +1,21 @@
-Undefined symbols:
-  "saveFP", referenced from:
-      __ZN9graphite27Segment7justifyEPNS_4SlotEPKNS_4FontEfNS_9justFlagsES2_S2_ in Justifier.cpp.o
-      __ZN9graphite24Slot8finaliseEPKNS_7SegmentEPKNS_4FontERNS_8PositionERNS_4RectEhRf in Slot.cpp.o
-  "restFP", referenced from:
-      __ZN9graphite27Segment7justifyEPNS_4SlotEPKNS_4FontEfNS_9justFlagsES2_S2_ in Justifier.cpp.o
-      __ZN9graphite24Slot8finaliseEPKNS_7SegmentEPKNS_4FontERNS_8PositionERNS_4RectEhRf in Slot.cpp.o
-ld: symbol(s) not found
+Don't disable the use of default libs, to prevent link failure on PowerPC.
+https://sourceforge.net/p/silgraphite/bugs/56/
 
-https://sourceforge.net/p/silgraphite/bugs/56/
+Use -Wimplicit-fallthrough only with clang, to prevent compile failure with gcc.
+https://sourceforge.net/p/silgraphite/bugs/60/
 --- src/CMakeLists.txt.orig	2016-01-14 22:17:18.000000000 -0600
-+++ src/CMakeLists.txt	2016-02-16 17:09:44.000000000 -0600
-@@ -136,7 +136,6 @@
++++ src/CMakeLists.txt	2016-02-17 00:35:03.000000000 -0600
+@@ -135,9 +135,11 @@
+ 
  if  (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
      set_target_properties(graphite2 PROPERTIES 
-         COMPILE_FLAGS   "-Wall -Wextra -Wno-unknown-pragmas -Wimplicit-fallthrough -Wendif-labels -Wshadow -Wno-ctor-dtor-privacy -Wno-non-virtual-dtor -fno-rtti -fno-exceptions -fvisibility=hidden -fvisibility-inlines-hidden -fno-stack-protector"
+-        COMPILE_FLAGS   "-Wall -Wextra -Wno-unknown-pragmas -Wimplicit-fallthrough -Wendif-labels -Wshadow -Wno-ctor-dtor-privacy -Wno-non-virtual-dtor -fno-rtti -fno-exceptions -fvisibility=hidden -fvisibility-inlines-hidden -fno-stack-protector"
 -        LINK_FLAGS      "-nodefaultlibs" 
++        COMPILE_FLAGS   "-Wall -Wextra -Wno-unknown-pragmas -Wendif-labels -Wshadow -Wno-ctor-dtor-privacy -Wno-non-virtual-dtor -fno-rtti -fno-exceptions -fvisibility=hidden -fvisibility-inlines-hidden -fno-stack-protector"
          LINKER_LANGUAGE C)
++    if (${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
++        add_definitions(-Wimplicit-fallthrough)
++    endif (${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
      target_link_libraries(graphite2 c)
      include(Graphite)
+     nolib_test(stdc++ $<TARGET_SONAME_FILE:graphite2>)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160216/d2dcaf36/attachment.html>