[52890] trunk/dports/archivers/lzma

[ryandesign at macports.org]

Revision: 52890
          http://trac.macports.org/changeset/52890
Author:   ryandesign at macports.org
Date:     2009-06-24 23:55:54 -0700 (Wed, 24 Jun 2009)
Log Message:
-----------
lzma: use ${configure.cc} and ${configure.cxx}; see UsingTheRightCompiler

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

Added Paths:
-----------
    trunk/dports/archivers/lzma/files/patch-makefile.gcc

Modified: trunk/dports/archivers/lzma/Portfile
===================================================================
--- trunk/dports/archivers/lzma/Portfile	2009-06-25 06:53:54 UTC (rev 52889)
+++ trunk/dports/archivers/lzma/Portfile	2009-06-25 06:55:54 UTC (rev 52890)
@@ -23,10 +23,19 @@
                 sha1 36b5fe39014c9f1f114ab4dfbe5768cb20529d3e \
                 rmd160 d3506df1996d72be7d4e914c56b5b2e43c5a0b8a
 
-patchfiles      patch-lzma.1
-
 extract.mkdir   yes
+post-extract {
+    # Convert DOS to UNIX line endings so we can patch
+    reinplace "s|\r||g" ${worksrcpath}/CPP/7zip/Compress/LZMA_Alone/makefile.gcc
+}
 
+patchfiles      patch-lzma.1 \
+                patch-makefile.gcc
+post-patch {
+    reinplace "s|@CC@|${configure.cc}|g" ${worksrcpath}/CPP/7zip/Compress/LZMA_Alone/makefile.gcc
+    reinplace "s|@CXX@|${configure.cxx}|g" ${worksrcpath}/CPP/7zip/Compress/LZMA_Alone/makefile.gcc
+}
+
 use_configure   no
 
 build.dir       ${worksrcpath}/CPP/7zip/Compress/LZMA_Alone

Added: trunk/dports/archivers/lzma/files/patch-makefile.gcc
===================================================================
--- trunk/dports/archivers/lzma/files/patch-makefile.gcc	                        (rev 0)
+++ trunk/dports/archivers/lzma/files/patch-makefile.gcc	2009-06-25 06:55:54 UTC (rev 52890)
@@ -0,0 +1,11 @@
+--- CPP/7zip/Compress/LZMA_Alone/makefile.gcc	2008-12-26 00:51:47.000000000 -0600
++++ CPP/7zip/Compress/LZMA_Alone/makefile.gcc	2009-06-25 01:47:12.000000000 -0500
+@@ -1,6 +1,6 @@
+ PROG = lzma
+-CXX = g++ -O2 -Wall
+-CXX_C = gcc -O2 -Wall
++CXX = @CXX@ -O2 -Wall
++CXX_C = @CC@ -O2 -Wall
+ LIB = -lm
+ RM = rm -f
+ CFLAGS = -c
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090624/3a24fed0/attachment.html>