<pre style='margin:0'>
Andrea D'Amore (anddam) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/1b13f71ef0c34f5e52a20e285fb777df3cad4132">https://github.com/macports/macports-ports/commit/1b13f71ef0c34f5e52a20e285fb777df3cad4132</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 1b13f71ef0c34f5e52a20e285fb777df3cad4132
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sun Dec 11 15:20:56 2016 -0700
<span style='display:block; white-space:pre;color:#404040;'> chicken: fix universal build and respect configure.build_arch
</span>---
lang/chicken/Portfile | 48 +++++++++++++++++----------
lang/chicken/files/patch-Makefile.macosx.diff | 18 ++--------
lang/chicken/files/patch-rules.make.diff | 11 ------
3 files changed, 33 insertions(+), 44 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/chicken/Portfile b/lang/chicken/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 86512ec..5b1f3f9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/chicken/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/chicken/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,9 +1,13 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# from the README:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# For 10.6 and later, universal builds are not supported.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup muniversal 1.0
</span>
name chicken
version 4.11.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories lang scheme
license BSD public-domain
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,16 +20,14 @@ long_description Chicken produces portable, efficient C, supports \
</span> homepage http://www.call-with-current-continuation.org/
platforms darwin
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Source contains some assembly files for PPC, i386, and x86_64. Not
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# sure if the PPC one can be assembled with "-arch ppc64".
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-supported_archs ppc i386 x86_64
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> set branch [join [lrange [split ${version} .] 0 2] .]
master_sites http://code.call-cc.org/releases/${branch}
checksums rmd160 3207bdd9e5b7d8f454d7612634c1da5bb3b820c7 \
sha256 e3dc2b8f95b6a3cd59c85b5bb6bdb2bd9cefc45b5d536a20cad74e3c63f4ad89
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-Makefile.macosx.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> use_configure no
# Upstream explicitly requires GNU make.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,29 +39,39 @@ build.args C_COMPILER=${configure.cc} \
</span> # Upstream does not support parallel builds.
use_parallel_build no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant universal {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # Correctly identify selected arch(s) to build system.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-array set archs {ppc ppc.darwin i386 x86 x86_64 x86-64}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+array set archs {ppc ppc.darwin ppc64 ppc.darwin i386 x86 x86_64 x86-64}
</span> if {[variant_isset universal]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- build.args-append ARCH=universal \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- UNIVERSAL_ARCHS="[string map [array get archs] \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${configure.universal_archs}]"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} elseif {[info exists archs(${configure.build_arch})]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.args-append ARCH=$archs(${configure.build_arch})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach arch ${configure.universal_archs} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend merger_build_args(${arch}) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ARCH=$archs(${configure.build_arch})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ARCH=$archs(${configure.build_arch})
</span> }
# Pass in correct arch and SDK flags.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set cflags "[get_canonical_archflags cc]"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set ldflags "[get_canonical_archflags ld]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set cflags ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set ldflags ""
</span> if {${configure.sdkroot} != ""} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set cflags "${cflags} -isysroot ${configure.sdkroot}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set cflags "${cflags} -isysroot ${configure.sdkroot}"
</span> set ldflags "${ldflags} -Wl,-syslibroot,${configure.sdkroot}"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.args-append CFLAGS="${cflags}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDFLAGS="${ldflags}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach arch ${configure.universal_archs} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ eval lappend merger_build_args(${arch}) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS='${cflags} -arch ${arch}' \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LDFLAGS='${ldflags} -arch ${arch}'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS="${cflags} -arch ${configure.build_arch}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LDFLAGS="${ldflags} -arch ${configure.build_arch}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.args ${build.args}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.args PLATFORM=macosx \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PREFIX=${prefix}
</span>
test.run yes
test.target PLATFORM=macosx check
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/chicken/files/patch-Makefile.macosx.diff b/lang/chicken/files/patch-Makefile.macosx.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 93059c1..c7c8a09 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/chicken/files/patch-Makefile.macosx.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/chicken/files/patch-Makefile.macosx.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Makefile.macosx.orig 2013-01-08 22:57:09.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Makefile.macosx 2013-02-23 22:03:57.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -69,18 +69,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Makefile.macosx.orig 2016-05-28 04:30:50.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Makefile.macosx 2016-12-11 14:07:16.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -66,18 +66,12 @@
</span>
# architectures
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,15 +22,3 @@
</span> endif
# select default and internal settings
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -140,7 +134,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- apply-hack.x86$(O): $(SRCDIR)apply-hack.x86.S
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(ASSEMBLER) $(ASSEMBLER_OPTIONS) -arch i386 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(ASSEMBLER_COMPILE_OPTION) $< $(ASSEMBLER_OUTPUT)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--$(APPLY_HACK_OBJECT): apply-hack.x86$(O) apply-hack.ppc.darwin$(O)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+apply-hack.x86-64$(O): $(SRCDIR)apply-hack.x86-64.S
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(ASSEMBLER) $(ASSEMBLER_OPTIONS) -arch x86_64 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(ASSEMBLER_COMPILE_OPTION) $< $(ASSEMBLER_OUTPUT)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+$(APPLY_HACK_OBJECT): $(foreach arch,$(UNIVERSAL_ARCHS),apply-hack.$(arch)$(O))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lipo -create -output $@ $^
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/chicken/files/patch-rules.make.diff b/lang/chicken/files/patch-rules.make.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 04ef2ee..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/chicken/files/patch-rules.make.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- rules.make.orig 2013-01-08 22:57:09.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ rules.make 2013-02-23 01:23:22.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -181,7 +181,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ifneq ($(HACKED_APPLY),)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(APPLY_HACK_OBJECT): $(SRCDIR)apply-hack.$(ARCH)$(ASM)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(ASSEMBLER) $(ASSEMBLER_OPTIONS) $(ASSEMBLER_COMPILE_OPTION) $< $(ASSEMBLER_OUTPUT)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(ASSEMBLER) $(CFLAGS) $(ASSEMBLER_OPTIONS) $(ASSEMBLER_COMPILE_OPTION) $< $(ASSEMBLER_OUTPUT)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # program objects
</span></pre><pre style='margin:0'>
</pre>