[76975] trunk/dports/devel/fossil

[ryandesign at macports.org]

Revision: 76975
          http://trac.macports.org/changeset/76975
Author:   ryandesign at macports.org
Date:     2011-03-15 16:01:13 -0700 (Tue, 15 Mar 2011)
Log Message:
-----------
fossil: support universal and build_arch, and ensure we're UsingTheRightCompiler; see #28678

Modified Paths:
--------------
    trunk/dports/devel/fossil/Portfile

Added Paths:
-----------
    trunk/dports/devel/fossil/files/
    trunk/dports/devel/fossil/files/patch-Makefile.diff

Modified: trunk/dports/devel/fossil/Portfile
===================================================================
--- trunk/dports/devel/fossil/Portfile	2011-03-15 22:57:00 UTC (rev 76974)
+++ trunk/dports/devel/fossil/Portfile	2011-03-15 23:01:13 UTC (rev 76975)
@@ -32,7 +32,7 @@
 depends_lib         port:zlib \
                     port:openssl
 
-universal_variant   no
+patchfiles          patch-Makefile.diff
 
 post-extract {
     reinplace s|\$\(INSTALLDIR\)|\$(DESTDIR)/${prefix}/bin|g ${worksrcpath}/src/makemake.tcl
@@ -42,6 +42,16 @@
     system "cd ${worksrcpath}/src && tclsh ${worksrcpath}/src/makemake.tcl"
 }
 
+if {[variant_isset universal]} {
+    set archflags ${configure.universal_cflags}
+} else {
+    set archflags ${configure.cc_archflags}
+}
+
+build.args-append   CC="${configure.cc} ${archflags}" \
+                    CFLAGS=${configure.cflags} \
+                    LDFLAGS=${configure.ldflags}
+
 livecheck.type      regex
 livecheck.url       ${homepage}/download.html
 livecheck.regex     ${name}-src-(\\d{14})${extract.suffix}

Added: trunk/dports/devel/fossil/files/patch-Makefile.diff
===================================================================
--- trunk/dports/devel/fossil/files/patch-Makefile.diff	                        (rev 0)
+++ trunk/dports/devel/fossil/files/patch-Makefile.diff	2011-03-15 23:01:13 UTC (rev 76975)
@@ -0,0 +1,20 @@
+--- Makefile.orig	2011-03-01 15:48:18.000000000 -0600
++++ Makefile	2011-03-07 17:20:31.000000000 -0600
+@@ -20,7 +20,7 @@
+ #    to compile code-generator programs as part of the build process.
+ #    See TCC below for the C compiler for building the finished binary.
+ #
+-BCC = gcc
++BCC = $(CC)
+ 
+ #### The suffix to add to final executable file.  When cross-compiling
+ #    to windows, make this ".exe".  Otherwise leave it blank.
+@@ -35,7 +35,7 @@
+ #
+ #TCC = gcc -O6
+ #TCC = gcc -g -O0 -Wall -fprofile-arcs -ftest-coverage
+-TCC = gcc -g -Os -Wall
++TCC = $(CC) -g -Os -Wall
+ 
+ # To add support for HTTPS
+ TCC += -DFOSSIL_ENABLE_SSL
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110315/8f2538e2/attachment.html>