Ticket #62023: patch-portfile-fix-lipo-archs.diff

Portfile

@@ -174 +174 @@
 
 variant universal {
     post-patch {
+
+        # first null out any existing lipo extract archs
+        reinplace \
+          "s|LIPO_32BIT_FLAGS=\".*\"|LIPO_32BIT_FLAGS=\"\"|" \
+          ${worksrcpath}/configure
+
         set universal_arch_flags {}
         set arch_run_32bit {}
+        set lipo_32bit_flags {}
         foreach arch ${universal_archs} {
             lappend universal_arch_flags -arch ${arch}
             if {${arch} eq "i386" || ${arch} eq "ppc"} {
                 lappend arch_run_32bit -${arch}
+                lappend lipo_32bit_flags -extract ${arch}
             }
         }
         reinplace \
@@ -189 +197 @@
             reinplace \
               "s|ARCH_RUN_32BIT=\".*\"|ARCH_RUN_32BIT=\"arch ${arch_run_32bit}\"|" \
               ${worksrcpath}/configure
+            reinplace \
+              "s|LIPO_32BIT_FLAGS=\".*\"|LIPO_32BIT_FLAGS=\"${lipo_32bit_flags}\"|" \
+              ${worksrcpath}/configure
         }
     }
     if {${configure.sdkroot} ne ""} {