<pre style='margin:0'>
MarcusCalhoun-Lopez pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/7519f9aeb46b10b14cb9d36589b55664df487403">https://github.com/macports/macports-ports/commit/7519f9aeb46b10b14cb9d36589b55664df487403</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 7519f9a octave: allow GCC to compile Carbon API
</span>7519f9a is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 7519f9aeb46b10b14cb9d36589b55664df487403
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Tue Dec 20 13:09:06 2016 -0700
<span style='display:block; white-space:pre;color:#404040;'> octave: allow GCC to compile Carbon API
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See https://trac.macports.org/ticket/53021
</span>---
math/octave/Portfile | 23 +++++++++++++++++++++++
math/octave/files/patch-force_cxx.diff | 20 ++++++++++++++++++++
2 files changed, 43 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave/Portfile b/math/octave/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b0a4095..b1345a7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -544,6 +544,29 @@ if { [variant_isset graphicsmagick] && ${configure.cxx_stdlib} eq "libstdc++"} {
</span> macports-gcc-4.7
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# see https://trac.macports.org/ticket/53021
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach gccVar ${compilers.gcc_variants} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_exists ${gccVar}] && [variant_isset ${gccVar}] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp ${xcodeversion} 7.0] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-force_cxx.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp ${xcodeversion} 8.0] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cppflags-append "-isystem ${worksrcpath}/Availability"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-extract {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if [file exists /usr/include/AvailabilityInternal.h] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0755 -d ${worksrcpath}/Availability
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0644 /usr/include/AvailabilityInternal.h ${worksrcpath}/Availability/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${worksrcpath}/Availability "/usr/bin/sed -i -e 's|__attribute__((availability(.*)))||g' AvailabilityInternal.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-destroot {
# put any startup commands in ${destroot}${prefix}/share/octave/${version}/m/startup/octaverc
# see https://www.gnu.org/software/octave/doc/interpreter/Startup-Files.html
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave/files/patch-force_cxx.diff b/math/octave/files/patch-force_cxx.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..5e3bcdc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave/files/patch-force_cxx.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Makefile.in.orig 2016-11-13 08:23:00.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Makefile.in 2016-12-10 06:52:04.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -15871,7 +15871,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libinterp/corefcn/libinterp_corefcn_libcorefcn_la-cdisplay.lo: libinterp/corefcn/cdisplay.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libinterp_corefcn_libcorefcn_la_CPPFLAGS) $(CPPFLAGS) $(libinterp_corefcn_libcorefcn_la_CFLAGS) $(CFLAGS) -MT libinterp/corefcn/libinterp_corefcn_libcorefcn_la-cdisplay.lo -MD -MP -MF libinterp/corefcn/$(DEPDIR)/libinterp_corefcn_libcorefcn_la-cdisplay.Tpo -c -o libinterp/corefcn/libinterp_corefcn_libcorefcn_la-cdisplay.lo `test [...]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) -x c++ $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libinterp_corefcn_libcorefcn_la_CPPFLAGS) $(CPPFLAGS) $(libinterp_corefcn_libcorefcn_la_CFLAGS) $(CFLAGS) -MT libinterp/corefcn/libinterp_corefcn_libcorefcn_la-cdisplay.lo -MD -MP -MF libinterp/corefcn/$(DEPDIR)/libinterp_corefcn_libcorefcn_la-cdisplay.Tpo -c -o libinterp/corefcn/libinterp_corefcn_libcorefcn_la-cdisplay.lo [...]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libinterp/corefcn/$(DEPDIR)/libinterp_corefcn_libcorefcn_la-cdisplay.Tpo libinterp/corefcn/$(DEPDIR)/libinterp_corefcn_libcorefcn_la-cdisplay.Plo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libinterp/corefcn/cdisplay.c' object='libinterp/corefcn/libinterp_corefcn_libcorefcn_la-cdisplay.lo' libtool=yes @AMDEPBACKSLASH@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -16172,7 +16172,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liboctave_wrappers_libwrappers_la_CPPFLAGS) $(CPPFLAGS) $(liboctave_wrappers_libwrappers_la_CFLAGS) $(CFLAGS) -c -o liboctave/wrappers/liboctave_wrappers_libwrappers_la-wait-wrappers.lo `test -f 'liboctave/wrappers/wait-wrappers.c' || echo '$(srcdir)/'`liboctave/wrappers/wait-wrappers.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/src_octave-display-available.o: src/display-available.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_octave_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/src_octave-display-available.o -MD -MP -MF src/$(DEPDIR)/src_octave-display-available.Tpo -c -o src/src_octave-display-available.o `test -f 'src/display-available.c' || echo '$(srcdir)/'`src/display-available.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) -x c++ $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_octave_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/src_octave-display-available.o -MD -MP -MF src/$(DEPDIR)/src_octave-display-available.Tpo -c -o src/src_octave-display-available.o `test -f 'src/display-available.c' || echo '$(srcdir)/'`src/display-available.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/$(DEPDIR)/src_octave-display-available.Tpo src/$(DEPDIR)/src_octave-display-available.Po
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/display-available.c' object='src/src_octave-display-available.o' libtool=no @AMDEPBACKSLASH@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
</span></pre><pre style='margin:0'>
</pre>