[145182] trunk/dports/archivers/p7zip/Portfile

[jmr at macports.org]

Revision: 145182
          https://trac.macports.org/changeset/145182
Author:   jmr at macports.org
Date:     2016-01-27 16:51:11 -0800 (Wed, 27 Jan 2016)
Log Message:
-----------
p7zip: revert r145156 because it introduced bugs and the issue it was meant to fix (#50146) was already fixed

Revision Links:
--------------
    https://trac.macports.org/changeset/145156

Modified Paths:
--------------
    trunk/dports/archivers/p7zip/Portfile

Modified: trunk/dports/archivers/p7zip/Portfile
===================================================================
--- trunk/dports/archivers/p7zip/Portfile	2016-01-28 00:02:23 UTC (rev 145181)
+++ trunk/dports/archivers/p7zip/Portfile	2016-01-28 00:51:11 UTC (rev 145182)
@@ -36,28 +36,16 @@
 }
 
 configure {
-    if {${build_arch} eq "x86_64"} {
-        copy -force ${worksrcpath}/makefile.macosx_llvm_64bits ${worksrcpath}/makefile.machine
-        # this also corrects a typo in the makefile ('XX' rather than 'CXX')
-        reinplace "s|^XX=/usr/bin/llvm-g++|CXX=${configure.cxx}|g" \
-             ${worksrcpath}/makefile.machine
-        reinplace "s|^CC=/usr/bin/llvm-gcc|CC=${configure.cc}|g" \
-             ${worksrcpath}/makefile.machine
-    } else {
-        if {${build_arch} eq "ppc"} {
-            copy -force ${worksrcpath}/makefile.macosx_gcc_32bits_ppc ${worksrcpath}/makefile.machine
-        } elseif {${build_arch} eq "ppc64"} {
-            copy -force ${worksrcpath}/makefile.macosx_gcc_64bits ${worksrcpath}/makefile.machine
-        } else {
-            copy -force ${worksrcpath}/makefile.macosx_gcc_32bits_asm ${worksrcpath}/makefile.machine
-        }
-        reinplace "s|^CXX=c++|CXX=${configure.cxx}|g" \
+    copy -force ${worksrcpath}/makefile.macosx_llvm_64bits ${worksrcpath}/makefile.machine
+    # this also corrects a typo in the makefile ('XX' rather than 'CXX')
+    reinplace "s|^XX=/usr/bin/llvm-g++|CXX=${configure.cxx}|" \
             ${worksrcpath}/makefile.machine
-        reinplace "s|^CC=cc|CC=${configure.cc}|g" \
+    reinplace "s|^CC=/usr/bin/llvm-gcc|CC=${configure.cc}|" \
             ${worksrcpath}/makefile.machine
-    }
-    reinplace "s|\$(LOCAL_FLAGS)|[get_canonical_archflags] \$(LOCAL_FLAGS)|g" \
-        ${worksrcpath}/makefile.machine
+    reinplace "s|-m64||g" \
+            ${worksrcpath}/makefile.machine
+    reinplace "s|\$(LOCAL_FLAGS)|[get_canonical_archflags] \$(LOCAL_FLAGS)|" \
+            ${worksrcpath}/makefile.machine
 }
 
 # build 7za, 7z and 7zr
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160127/d86bbc8f/attachment.html>