changeset 3755:bc32b686d0f5

default-octave: add patch for successful compile of current default branch * dist-files.mk: added default-octave-1-fixes.patch * src/default-octave-1-fixes.patch: new file * src/default-octave.mk: update to latest checksum
author John Donoghue
date Mon, 08 Dec 2014 12:55:20 -0500
parents 8657bb199f09
children bb70aeee012e
files dist-files.mk src/default-octave-1-fixes.patch src/default-octave.mk
diffstat 3 files changed, 13 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/dist-files.mk	Wed Dec 03 15:10:44 2014 -0500
+++ b/dist-files.mk	Mon Dec 08 12:55:20 2014 -0500
@@ -61,6 +61,7 @@
   dcmtk-2-ming64.patch \
   dcmtk.mk \
   default-octave-1-docinstall.patch \
+  default-octave-1-fixes.patch \
   default-octave.mk \
   devil-1-png.patch \
   devil.mk \
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/default-octave-1-fixes.patch	Mon Dec 08 12:55:20 2014 -0500
@@ -0,0 +1,11 @@
+--- a/libgnu/unistd.in.h	2013-11-26 03:43:39.000000000 -0500
++++ b/libgnu/unistd.in.h	2014-02-16 16:21:36.254338221 -0500
+@@ -714,7 +714,7 @@
+    Null terminate it if the name is shorter than LEN.
+    If the host name is longer than LEN, set errno = EINVAL and return -1.
+    Return 0 if successful, otherwise set errno and return -1.  */
+-# if @UNISTD_H_HAVE_WINSOCK2_H@
++# if !@HAVE_GETHOSTNAME@ && @UNISTD_H_HAVE_WINSOCK2_H@
+ #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+ #   undef gethostname
+ #   define gethostname rpl_gethostname
--- a/src/default-octave.mk	Wed Dec 03 15:10:44 2014 -0500
+++ b/src/default-octave.mk	Mon Dec 08 12:55:20 2014 -0500
@@ -4,7 +4,7 @@
 PKG             := default-octave
 $(PKG)_IGNORE   :=
 $(PKG)_VERSION  := 4.1.0+
-$(PKG)_CHECKSUM := 0a72ae6da93c7e8bf6b8230dab416fe77f77d1b6
+$(PKG)_CHECKSUM := 7ee5a7b3c65f29b7eb8ec92421b405f263ec6f6e
 $(PKG)_SUBDIR   := octave-$($(PKG)_VERSION)
 $(PKG)_FILE     := octave-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := http://hydra.nixos.org/job/gnu/octave-default/tarball/latest/download