Changeset 28665


Ignore:
Timestamp:
Sep 6, 2007, 12:27:36 PM (13 years ago)
Author:
nox@…
Message:

scite: Added universal support! Don't worry, be happy!

Location:
trunk/dports/editors/scite
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/editors/scite/Portfile

    r28642 r28665  
    4343pre-build {
    4444        cd ${workpath}/scintilla/gtk
    45         system "make GTK2=yes"
     45       
     46        if {[variant_isset universal]} {
     47                foreach {arch} {i386 ppc} {
     48                        system "make GTK2=yes UNIVERSAL_CFLAGS=\"-isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch ${arch}\""
     49
     50                        file mkdir ../bin/${arch}
     51                        move ../bin/scintilla.a ../bin/${arch}/scintilla.a
     52
     53                        system "make clean"
     54                }
     55        } else {
     56                system "make GTK2=yes"
     57        }
     58
     59        cd ../bin
     60        system "lipo -create -arch i386 i386/scintilla.a -arch ppc ppc/scintilla.a -output scintilla.a"
    4661}
    4762
     
    5267}
    5368
     69variant universal {
     70        post-patch {
     71                cd ${workpath}
     72
     73                reinplace -E "/^CXXBASEFLAGS/s|\$| \$(UNIVERSAL_CFLAGS)|" scintilla/gtk/makefile
     74                reinplace -E "/^CXXBASEFLAGS/s|\$| ${configure.universal_cflags}|" \
     75                        scite/gtk/makefile
     76        }
     77
     78        build.args-append "UNIVERSAL_LDFLAGS=\"${configure.universal_ldflags}\""
     79}
     80
    5481livecheck.distname SciTE
    5582
    56 universal_variant no
    57 
  • trunk/dports/editors/scite/files/patch-scite-gtk-makefile

    r28641 r28665  
    1 --- makefile.orig       2007-09-06 03:44:52.000000000 +0200
    2 +++ makefile    2007-09-06 03:46:16.000000000 +0200
     1--- makefile.orig       2007-09-06 13:10:24.000000000 +0200
     2+++ makefile    2007-09-06 13:11:55.000000000 +0200
    33@@ -45,7 +45,7 @@
    44 bindir=$(prefix)/bin
     
    2626 # make should be run in ../../scintilla/gtk to compile all the lexers.
    2727 COMPLIB=../../scintilla/bin/scintilla.a
     28@@ -103,7 +103,7 @@
     29 $(PROG): SciTEGTK.o FilePath.o SciTEBase.o SciTEBuffers.o SciTEIO.o Exporters.o \
     30 MultiplexExtension.o DirectorExtension.o SciTEProps.o Utf8_16.o \
     31        $(COMPLIB) $(LUA_OBJS)
     32-       $(CC) `$(CONFIGTHREADS)` -DGTK $^ -o $@ $(CONFIGLIB)
     33+       $(CC) `$(CONFIGTHREADS)` $(UNIVERSAL_LDFLAGS) -DGTK $^ -o $@ $(CONFIGLIB)
     34 
     35 # Automatically generate header dependencies with "make deps"
     36 include deps.mak
Note: See TracChangeset for help on using the changeset viewer.