[103446] trunk/dports/graphics/graphite2

ryandesign at macports.org ryandesign at macports.org
Mon Feb 25 20:51:43 PST 2013


Revision: 103446
          https://trac.macports.org/changeset/103446
Author:   ryandesign at macports.org
Date:     2013-02-25 20:51:43 -0800 (Mon, 25 Feb 2013)
Log Message:
-----------
graphite2: fix i386 ppc universal build (#38209)

Modified Paths:
--------------
    trunk/dports/graphics/graphite2/Portfile
    trunk/dports/graphics/graphite2/files/patch-Graphite.cmake.diff

Modified: trunk/dports/graphics/graphite2/Portfile
===================================================================
--- trunk/dports/graphics/graphite2/Portfile	2013-02-26 04:29:45 UTC (rev 103445)
+++ trunk/dports/graphics/graphite2/Portfile	2013-02-26 04:51:43 UTC (rev 103446)
@@ -3,6 +3,7 @@
 
 PortSystem          1.0
 PortGroup           cmake 1.0
+PortGroup           muniversal 1.0
 
 name                graphite2
 version             1.2.0
@@ -56,10 +57,12 @@
     }
 }
 
-platform powerpc {
-    # Disable segment caching code which fails to build.
-    # https://sourceforge.net/tracker/?func=detail&atid=513479&aid=3593055&group_id=66144
-    configure.args-append -DGRAPHITE2_NSEGCACHE:BOOL=ON
+# Disable segment caching code on PowerPC where it fails to build.
+# https://sourceforge.net/tracker/?func=detail&atid=513479&aid=3593055&group_id=66144
+set merger_configure_args(ppc) -DGRAPHITE2_NSEGCACHE:BOOL=ON
+set merger_configure_args(ppc64) -DGRAPHITE2_NSEGCACHE:BOOL=ON
+if {![variant_isset universal] && [info exists merger_configure_args(${configure.build_arch})]} {
+    configure.args-append $merger_configure_args(${configure.build_arch})
 }
 
 livecheck.regex     /${name}-(\[0-9.\]+)${extract.suffix}

Modified: trunk/dports/graphics/graphite2/files/patch-Graphite.cmake.diff
===================================================================
--- trunk/dports/graphics/graphite2/files/patch-Graphite.cmake.diff	2013-02-26 04:29:45 UTC (rev 103445)
+++ trunk/dports/graphics/graphite2/files/patch-Graphite.cmake.diff	2013-02-26 04:51:43 UTC (rev 103446)
@@ -1,5 +1,6 @@
 http://lists.freedesktop.org/archives/harfbuzz/2012-December/002735.html
 http://projects.palaso.org/projects/graphitedev/repository/revisions/1112
+Plus a comment change to make the .la file merge properly.
 --- Graphite.cmake.orig
 +++ Graphite.cmake
 @@ -32,7 +32,7 @@
@@ -11,3 +12,12 @@
    GET_TARGET_PROPERTY_WITH_DEFAULT(_target_dlopen ${_target} LT_DLOPEN "")
    GET_TARGET_PROPERTY_WITH_DEFAULT(_target_dlpreopen ${_target} LT_DLPREOPEN "")
    GET_FILENAME_COMPONENT(_lanamewe ${_target_location} NAME_WE)
+@@ -51,7 +51,7 @@
+   FILE(APPEND ${_laname} "dependency_libs='${_target_dependency_libs}'\n\n")
+   FILE(APPEND ${_laname} "# Names of additional weak libraries provided by this library\n")
+   FILE(APPEND ${_laname} "weak_library_names=\n\n")
+-  FILE(APPEND ${_laname} "# Version information for ${_laname}.\n")
++  FILE(APPEND ${_laname} "# Version information\n")
+   FILE(APPEND ${_laname} "current=${_target_current}\n")
+   FILE(APPEND ${_laname} "age=${_target_age}\n")
+   FILE(APPEND ${_laname} "revision=${_target_revision}\n\n")
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130225/ec39504b/attachment.html>


More information about the macports-changes mailing list