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

jmr at macports.org jmr at macports.org
Thu Jan 21 21:40:06 PST 2016


Revision: 144942
          https://trac.macports.org/changeset/144942
Author:   jmr at macports.org
Date:     2016-01-21 21:40:05 -0800 (Thu, 21 Jan 2016)
Log Message:
-----------
p7zip: fix reinplaces that were rendered incorrect by the makefile switch in r143900

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

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

Modified: trunk/dports/archivers/p7zip/Portfile
===================================================================
--- trunk/dports/archivers/p7zip/Portfile	2016-01-22 01:47:07 UTC (rev 144941)
+++ trunk/dports/archivers/p7zip/Portfile	2016-01-22 05:40:05 UTC (rev 144942)
@@ -37,13 +37,14 @@
 
 configure {
     copy -force ${worksrcpath}/makefile.macosx_llvm_64bits ${worksrcpath}/makefile.machine
-    reinplace "s|^CXX=c++|CXX=${configure.cxx}|g" \
+    # 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|-m32||g" \
+    reinplace "s|-m64||g" \
             ${worksrcpath}/makefile.machine
-    reinplace "s|\$(LOCAL_FLAGS)|[get_canonical_archflags] \$(LOCAL_FLAGS)|g" \
+    reinplace "s|\$(LOCAL_FLAGS)|[get_canonical_archflags] \$(LOCAL_FLAGS)|" \
             ${worksrcpath}/makefile.machine
 }
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160121/10ec247a/attachment.html>


More information about the macports-changes mailing list