[148706] trunk/dports/math/octave-devel

mcalhoun at macports.org mcalhoun at macports.org
Sun May 15 03:49:49 PDT 2016


Revision: 148706
          https://trac.macports.org/changeset/148706
Author:   mcalhoun at macports.org
Date:     2016-05-15 03:49:49 -0700 (Sun, 15 May 2016)
Log Message:
-----------
octave-devel, octave-devel-rc, octave-devel-release: update build system; should not affect build itself

Modified Paths:
--------------
    trunk/dports/math/octave-devel/Portfile

Removed Paths:
-------------
    trunk/dports/math/octave-devel/files/patch-stdio.in.h.diff

Modified: trunk/dports/math/octave-devel/Portfile
===================================================================
--- trunk/dports/math/octave-devel/Portfile	2016-05-15 10:45:33 UTC (rev 148705)
+++ trunk/dports/math/octave-devel/Portfile	2016-05-15 10:49:49 UTC (rev 148706)
@@ -108,12 +108,12 @@
 select.file  ${filespath}/${subport}
 
 # check http://hg.savannah.gnu.org/hgweb/octave/gnulib-hg/rev for latest version
-set hg_gnu_tag      7f19e7f2afa2
+set hg_gnu_tag      4a3a7c6111c8
 
 checksums-append \
     ${hg_gnu_tag}${extract.suffix} \
-    rmd160  9d906212fdb4201f8592da10524606dadb3f50e3 \
-    sha256  85add8ce0c53e8868d903c28c407d864ca54bd42e8d472e09b1a1bb4b105b741
+    rmd160  367b2811b5d4e3bab5ed22382c4ecfed808335e7 \
+    sha256  39f09d2000654d0d75a95b756fdd0724f869dfe65ef08f47814fbad230e8b25c
 
 master_sites        http://hg.savannah.gnu.org/hgweb/octave/archive:octave \
                     http://hg.savannah.gnu.org/hgweb/octave/gnulib-hg/archive:gnulib
@@ -131,10 +131,6 @@
     move ${worksrcpath}/../gnulib-hg-${hg_gnu_tag} ${worksrcpath}/gnulib-hg
 }
 
-# see http://git.savannah.gnu.org/cgit/gnulib.git/commit/lib/stdio.in.h?id=d6176702c3ffb6c56e6620397470e1b3bd540b10
-patchfiles-append   \
-    patch-stdio.in.h.diff
-
 pre-patch {
     # code located in pre-patch because variants from PortGroup compilers must
     #    be evaluated before it can be determined if clang is being used

Deleted: trunk/dports/math/octave-devel/files/patch-stdio.in.h.diff
===================================================================
--- trunk/dports/math/octave-devel/files/patch-stdio.in.h.diff	2016-05-15 10:45:33 UTC (rev 148705)
+++ trunk/dports/math/octave-devel/files/patch-stdio.in.h.diff	2016-05-15 10:49:49 UTC (rev 148706)
@@ -1,53 +0,0 @@
-From d6176702c3ffb6c56e6620397470e1b3bd540b10 Mon Sep 17 00:00:00 2001
-From: Jonathan Perkin <jperkin at joyent.com>
-Date: Thu, 04 Jun 2015 11:10:34 +0000
-Subject: stdio: Don't redefine gets when using C++
-
-We've hit this failure a few times in pkgsrc with packages which embed gnulib,
-an example being the latest gnutls:
-
-  ../../src/gl/stdio.h:1034:1: error: 'char* gets(char*)' conflicts with a previous declaration
-   _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
-   ^
-
-  /opt/tools/gcc49/lib/gcc/x86_64-sun-solaris2.11/4.9.2/include-fixed/iso/stdio_iso.h:259:14: note: previous declaration 'char* std::gets(char*)'
-   extern char *gets(char *);
-                ^
-
-Full build log is here:
-
-  http://us-east.manta.joyent.com/pkgsrc/public/reports/upstream-trunk32/20150602.2233/gnutls-3.3.15/build.log
-
-We've fixed it a few different ways over time:
-
-  https://github.com/joyent/pkgsrc/blob/joyent/release/2015Q1/devel/m4/patches/patch-lib_stdio.in.h
-  https://github.com/joyent/pkgsrc/blob/joyent/release/2015Q1/math/octave/patches/patch-libgnu_stdio.in.h
-  https://github.com/joyent/pkgsrc/blob/joyent/release/2015Q1/security/gnutls/patches/patch-gl_stdio.in.h
-
-but the cleanest fix appears to be the last, so I am proposing it here for
-inclusion upstream.
-
-Message-Id: <20150604111034.GG66573 at joyent.com>
-Signed-off-by: Eric Blake <eblake at redhat.com>
----
-(limited to 'lib/stdio.in.h')
-
-diff --git a/lib/stdio.in.h b/lib/stdio.in.h
-index fa6b595..476dee1 100644
---- a/lib/stdio.in.h
-+++ gnulib-hg/lib/stdio.in.h
-@@ -723,11 +723,10 @@ _GL_WARN_ON_USE (getline, "getline is unportable - "
-    so any use of gets warrants an unconditional warning; besides, C11
-    removed it.  */
- #undef gets
--#if HAVE_RAW_DECL_GETS
-+#if HAVE_RAW_DECL_GETS && !defined __cplusplus
- _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
- #endif
- 
--
- #if @GNULIB_OBSTACK_PRINTF@ || @GNULIB_OBSTACK_PRINTF_POSIX@
- struct obstack;
- /* Grow an obstack with formatted output.  Return the number of
---
-cgit v0.9.0.2
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160515/bd8f1606/attachment.html>


More information about the macports-changes mailing list