Ticket #21590: Portfile.patch

Portfile

@@ -28 +28 @@
                     sha1    0364027c34eb69ce8c51d316c68f10a02a42d036 \
                     rmd160  5b390d09a5b1a5e5fbf29d245aee8543397a1f19
 
+patchfile                       patch-sipconfig_py
 set pyversion 2.6
 depends_lib-append port:python[strsed ${pyversion} {g/[.]//}]
 set pybin ${prefix}/bin/python${pyversion}
@@ -44 +45 @@
 }
 
 configure.cmd ${pybin} configure.py
+configure.universal_args 
 
 pre-configure {
     # Ensure correct compilers are used
@@ -51 +53 @@
         ${worksrcpath}/specs/macx-g++
     reinplace "s| c++\$| ${configure.cxx}|" \
         ${worksrcpath}/specs/macx-g++
+    
+    # By default, SIP uses i386 and ppc. Override.
+    set arch_x86  ""
+    set arch_ppc    ""
+    
+    if {[variant_isset universal]} {
+      # Manually enter flags
+      foreach arch ${universal_archs} {
+        if {[string match "*86*" ${arch}] == 1} {
+          # x86
+          append arch_x86 "-arch ${arch} "
+        } else {
+          append arch_ppc "-arch ${arch} "
+        }
+      }
+    } else {
+      # Guess arch
+      set arch [exec arch]
+      if {[string match "*86*" ${arch}] == 1} {
+        set arch_x86 "-arch ${arch} "
+      } else {
+        set arch_ppc "-arch ${arch} "
+      }
+    }
+
+    # Reinplace in siputils.py
+    
+    reinplace "s|-arch ppc -arch i386|${arch_x86}${arch_ppc}|" \
+        ${worksrcpath}/siputils.py
+    
+    # Set default values
+
+    if {${arch_x86} == ""} {set arch_intel "-arch i386"}
+    if {${arch_ppc} == ""} {set arch_ppc "-arch ppc"}
+    
+    # Reinplace in specs/macx-g++
+    reinplace "s|^QMAKE_CFLAGS_PPC.*|QMAKE_CFLAGS_PPC        = ${arch_ppc}|" \
+        ${worksrcpath}/specs/macx-g++
+        
+    reinplace "s|^QMAKE_LFLAGS_PPC.*|QMAKE_LFLAGS_PPC        = ${arch_ppc}|" \
+        ${worksrcpath}/specs/macx-g++
+    
+    reinplace "s|^QMAKE_CFLAGS_X86.*|QMAKE_CFLAGS_X86        = ${arch_x86}|" \
+        ${worksrcpath}/specs/macx-g++
+        
+    reinplace "s|^QMAKE_LFLAGS_X86.*|QMAKE_LFLAGS_X86        = ${arch_x86}|" \
+        ${worksrcpath}/specs/macx-g++
+}
+
+pre-build {
+  if {[variant_isset universal]} {
+    # Apparently we need to enforce universal flags
+    set uarchs [portconfigure::configure_get_universal_archflags]
+    
+    reinplace -E "s|^(CFLAGS.*)|\\1 ${uarchs}|" ${worksrcpath}/sipgen/Makefile
+    reinplace -E "s|^(CXXFLAGS.*)|\\1 ${uarchs}|" ${worksrcpath}/sipgen/Makefile
+    reinplace -E "s|^(LFLAGS.*)|\\1 ${uarchs}|" ${worksrcpath}/sipgen/Makefile
+
+    reinplace -E "s|^(CFLAGS.*)|\\1 ${uarchs}|" ${worksrcpath}/siplib/Makefile
+    reinplace -E "s|^(CXXFLAGS.*)|\\1 ${uarchs}|" ${worksrcpath}/siplib/Makefile
+    reinplace -E "s|^(LFLAGS.*)|\\1 ${uarchs}|" ${worksrcpath}/siplib/Makefile
+  }
 }
 
 # By default, everything gets installed in the Python Frameworks directory