[72363] trunk/dports/editors/scite/Portfile

[jmr at macports.org]

Revision: 72363
          http://trac.macports.org/changeset/72363
Author:   jmr at macports.org
Date:     2010-10-11 19:55:32 -0700 (Mon, 11 Oct 2010)
Log Message:
-----------
scite: don't hardcode universal archs or sdkroot (#26804), remove use of -pedantic (see #26806)

Modified Paths:
--------------
    trunk/dports/editors/scite/Portfile

Modified: trunk/dports/editors/scite/Portfile
===================================================================
--- trunk/dports/editors/scite/Portfile	2010-10-12 02:24:55 UTC (rev 72362)
+++ trunk/dports/editors/scite/Portfile	2010-10-12 02:55:32 UTC (rev 72363)
@@ -36,6 +36,9 @@
     reinplace -E "s/#ifdef (PLAT_MACOSX|__APPLE__)/#if PLAT_MACOSX/" \
         ${workpath}/scintilla/include/Platform.h \
         ${workpath}/scintilla/src/Editor.cxx
+    reinplace s/-pedantic//g ${worksrcpath}/makefile \
+                             ${workpath}/${name}/src/cpp.properties \
+                             ${workpath}/scintilla/gtk/makefile
 }
 
 use_configure   no
@@ -47,10 +50,14 @@
 pre-build {
     if {[variant_isset universal]} {
         set lipo_args {}
+        set sysrootflags ""
+        if {${configure.sdkroot} != ""} {
+            set sysrootflags "-isysroot ${configure.sdkroot} "
+        }
 
-        foreach {arch} {i386 ppc} {
+        foreach arch ${configure.universal_archs} {
             system "make -C ${workpath}/scintilla/gtk \
-                GTK2=yes UNIVERSAL_CFLAGS=\"-isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch ${arch}\""
+                GTK2=yes UNIVERSAL_CFLAGS=\"${sysrootflags}-arch ${arch}\""
 
             file mkdir ${workpath}/scintilla/bin/${arch}
             move ${workpath}/scintilla/bin/scintilla.a ${workpath}/scintilla/bin/${arch}/scintilla.a
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20101011/8487a30f/attachment.html>