lzma: Use the right CFLAGS and CXXFLAGS

This includes using our optimization flags and the right C++ standard library, so the revision is increased to rebuild it.
macports · Jun 1, 2018 · 536ead3 · 536ead3
1 parent a4b5245
commit 536ead3
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/archivers/lzma/Portfile b/archivers/lzma/Portfile
@@ -4,10 +4,11 @@ PortSystem      1.0
 
 name            lzma
 version         4.65
+revision        1
 categories      archivers
 license         public-domain
 platforms       darwin
-maintainers     ryandesign openmaintainer
+maintainers     {ryandesign @ryandesign} openmaintainer
 
 description     high compression ratio archiver
 
@@ -22,7 +23,8 @@ distname        lzma[strsed ${version} {/\.//}]
 use_bzip2       yes
 
 checksums       rmd160  70953d4ee8542addf566953e0ed62e9c75a016b5 \
-                sha256  c935fd04dd8e0e8c688a3078f3675d699679a90be81c12686837e0880aa0fa1e
+                sha256  c935fd04dd8e0e8c688a3078f3675d699679a90be81c12686837e0880aa0fa1e \
+                size    288122
 
 extract.mkdir   yes
 post-extract {
@@ -33,8 +35,8 @@ post-extract {
 patchfiles      patch-lzma.1 \
                 patch-makefile.gcc
 post-patch {
-    reinplace "s|@CC@|${configure.cc} [get_canonical_archflags cc]|g" ${worksrcpath}/CPP/7zip/Compress/LZMA_Alone/makefile.gcc
-    reinplace "s|@CXX@|${configure.cxx} [get_canonical_archflags cxx]|g" ${worksrcpath}/CPP/7zip/Compress/LZMA_Alone/makefile.gcc
+    reinplace "s|@CC@|${configure.cc} ${configure.cflags} [get_canonical_archflags cc]|g" ${worksrcpath}/CPP/7zip/Compress/LZMA_Alone/makefile.gcc
+    reinplace "s|@CXX@|${configure.cxx} ${configure.cxxflags} [get_canonical_archflags cxx]|g" ${worksrcpath}/CPP/7zip/Compress/LZMA_Alone/makefile.gcc
 }
 
 use_configure   no

diff --git a/archivers/lzma/files/patch-makefile.gcc b/archivers/lzma/files/patch-makefile.gcc
@@ -1,11 +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
+--- CPP/7zip/Compress/LZMA_Alone/makefile.gcc.orig	2018-05-31 22:49:29.000000000 -0500
++++ CPP/7zip/Compress/LZMA_Alone/makefile.gcc	2018-05-31 22:52:04.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
++CXX = @CXX@ -Wall
++CXX_C = @CC@ -Wall
  LIB = -lm
  RM = rm -f
  CFLAGS = -c