[144751] trunk/dports/www/webkit2-gtk/Portfile

jeremyhu at macports.org jeremyhu at macports.org
Sun Jan 17 00:19:14 PST 2016


Revision: 144751
          https://trac.macports.org/changeset/144751
Author:   jeremyhu at macports.org
Date:     2016-01-17 00:19:13 -0800 (Sun, 17 Jan 2016)
Log Message:
-----------
webkit2-gtk: Only hack up WebKitPluginProcess2's link.txt if building +gtk2

Modified Paths:
--------------
    trunk/dports/www/webkit2-gtk/Portfile

Modified: trunk/dports/www/webkit2-gtk/Portfile
===================================================================
--- trunk/dports/www/webkit2-gtk/Portfile	2016-01-17 08:15:39 UTC (rev 144750)
+++ trunk/dports/www/webkit2-gtk/Portfile	2016-01-17 08:19:13 UTC (rev 144751)
@@ -119,9 +119,6 @@
     # https://bugs.webkit.org/show_bug.cgi?id=153176
     reinplace {s|\.\./\.\./lib/libWTFGTK\.a||} \
         ${build.dir}/Source/WebKit2/CMakeFiles/WebKit2.dir/link.txt \
-        ${build.dir}/Source/WebKit2/CMakeFiles/WebKitPluginProcess2.dir/link.txt
-    reinplace {s|-Wl,-all_load||g} \
-        ${build.dir}/Source/WebKit2/CMakeFiles/WebKitPluginProcess2.dir/link.txt
     reinplace {s|\.\./\.\./lib/libbmalloc\.a||} \
         ${build.dir}/Source/JavaScriptCore/CMakeFiles/JavaScriptCore.dir/link.txt
     reinplace {s|[\./]*\.\./lib/lib[^\.]*\.a||g} \
@@ -137,6 +134,12 @@
         reinplace {s|[\./]*\.\./lib/lib[^\.]*\.a||g} \
             ${build.dir}/Tools/MiniBrowser/gtk/CMakeFiles/MiniBrowser.dir/link.txt
     }
+    if {[variant_isset gtk2]} {
+        reinplace {s|\.\./\.\./lib/libWTFGTK\.a||} \
+            ${build.dir}/Source/WebKit2/CMakeFiles/WebKitPluginProcess2.dir/link.txt
+        reinplace {s|-Wl,-all_load||g} \
+            ${build.dir}/Source/WebKit2/CMakeFiles/WebKitPluginProcess2.dir/link.txt
+    }
 
     # https://bugs.webkit.org/show_bug.cgi?id=153192
     reinplace {s|\.\./\.\./lib/libWTFGTK\.a|-Wl,-all_load ../../lib/libWTFGTK.a|} \
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160117/fe704e94/attachment.html>


More information about the macports-changes mailing list