Mercurial > mxe-octave

changeset 3381:311f0d70597b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add octave forge sockets package * Makefile.in: add sockets to OCTAVE_FORGE_PACKAGES, fix forge install rule to install newly tar zipped files instead of copying from pkg/. * build_packages: add sockets-1.0.8.tar.gz * dist-files.mk: add of-sockets.mk and mingw-of-sockets-1-winsock.patch * index.html: add of-sockets-package. * src/of-sockets.mk: New file. * src/mingw-of-sockets-1-winsock.patch: new file.
author John Donoghue <john.donoghue@ieee.org>
date Tue, 31 Dec 2013 23:33:29 -0500
parents 654ecdc435a4
children d86edd4ec1d6
files Makefile.in build_packages.m dist-files.mk index.html src/mingw-of-sockets-1-winsock.patch src/of-sockets.mk
diffstat 6 files changed, 43 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile.in	Tue Dec 31 22:13:28 2013 -0500
+++ b/Makefile.in	Tue Dec 31 23:33:29 2013 -0500
@@ -350,7 +350,7 @@
 endif
 
 OCTAVE_FORGE_BASE_URL := 'http://sourceforge.net/projects/octave/files/Octave Forge Packages/Individual Package Releases'
-OCTAVE_FORGE_PACKAGES := $(addprefix of-,miscellaneous struct optim specfun general signal communications image io statistics control geometry windows odepkg linear-algebra)
+OCTAVE_FORGE_PACKAGES := $(addprefix of-,miscellaneous struct optim specfun general signal communications image io statistics control geometry windows odepkg linear-algebra sockets)
 
 MAKE_SHARED_FROM_STATIC := \
   $(TOP_DIR)/tools/make-shared-from-static $(MAKE_SHARED_FROM_STATIC_OPTIONS)
@@ -532,7 +532,7 @@
     mkdir -p '$(3)$(HOST_PREFIX)/src'
     cd '$(1)/..' \
       && tar cvfz $($(PKG)_FILE) $($(PKG)_SUBDIR) \
-      && $(INSTALL) -m644 '$(PKG_DIR)/$($(PKG)_FILE)' '$(3)$(HOST_PREFIX)/src'
+      && $(INSTALL) -m644 '$($(PKG)_FILE)' '$(3)$(HOST_PREFIX)/src'
 endef
 endif
 
--- a/build_packages.m	Tue Dec 31 22:13:28 2013 -0500
+++ b/build_packages.m	Tue Dec 31 23:33:29 2013 -0500
@@ -15,4 +15,5 @@
 pkg install -global -auto windows-1.2.1.tar.gz
 pkg install -global -auto odepkg-0.8.4.tar.gz
 pkg install -global -auto linear-algebra-2.2.0.tar.gz
+pkg install -global -auto sockets-1.0.8.tar.gz
 
--- a/dist-files.mk	Tue Dec 31 22:13:28 2013 -0500
+++ b/dist-files.mk	Tue Dec 31 23:33:29 2013 -0500
@@ -282,6 +282,7 @@
   mingw-glib-1-fixes.patch \
   mingw-glib-2-fixes.patch \
   mingw-hdf5-1.patch \
+  mingw-of-sockets-1-winsock.patch \
   mingw-pango-1-fixes.patch \
   mingw-utils-1-portability-fix.patch \
   mingw-units-1-fixes.patch \
@@ -390,6 +391,7 @@
   of-optim-1-fixes.patch \
   of-optim.mk \
   of-signal.mk \
+  of-sockets.mk \
   of-specfun.mk \
   of-statistics.mk \
   of-struct.mk \
--- a/index.html	Tue Dec 31 22:13:28 2013 -0500
+++ b/index.html	Tue Dec 31 23:33:29 2013 -0500
@@ -1998,6 +1998,11 @@
         <td id="of-signal-website"><a href="http://octave.sf.net/">Octave Forge signal package</a></td>
     </tr>
     <tr>
+        <td id="of-sockets-package">of-sockets</td>
+        <td id="of-sockets-version">1.0.8</td>
+        <td id="of-sockets-website"><a href="http://octave.sf.net/">Octave Forge sockets package</a></td>
+    </tr>
+    <tr>
         <td id="of-specfun-package">of-specfun</td>
         <td id="of-specfun-version">1.1.0</td>
         <td id="of-specfun-website"><a href="http://octave.sf.net/">Octave Forge specfun package</a></td>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/mingw-of-sockets-1-winsock.patch	Tue Dec 31 23:33:29 2013 -0500
@@ -0,0 +1,12 @@
+diff -ur sockets.orig/src/Makefile sockets/src/Makefile
+--- sockets.orig/src/Makefile	2013-12-31 22:17:49.000000000 -0500
++++ sockets/src/Makefile	2013-12-31 22:25:31.000000000 -0500
+@@ -14,7 +14,7 @@
+ all: $(OCT)
+ 
+ %.oct: %.cc
+-	mkoctfile $(VFLAGS) -s $<
++	mkoctfile $(VFLAGS) -s $< -lws2_32
+ 
+ test: $(OCT)
+ 	test_octave_sockets
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/of-sockets.mk	Tue Dec 31 23:33:29 2013 -0500
@@ -0,0 +1,21 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+PKG             := of-sockets
+$(PKG)_IGNORE   :=
+$(PKG)_CHECKSUM := c4d4f6bea306dd4d722b3f7d8cf475a9fdd0dbba
+$(PKG)_REMOTE_SUBDIR := 
+$(PKG)_SUBDIR   := sockets
+$(PKG)_FILE     := sockets-$($(PKG)_VERSION).tar.gz
+$(PKG)_FIXED_FILE := sockets-$($(PKG)_VERSION)a.tar.gz
+$(PKG)_URL      := '$(OCTAVE_FORGE_BASE_URL)/$($(PKG)_FILE)/download'
+$(PKG)_DEPS     := 
+
+define $(PKG)_UPDATE
+    echo 'Warning: Updates are temporarily disabled for package $(PKG).' >&2;
+    echo $($(PKG)_VERSION)
+endef
+
+define $(PKG)_BUILD
+    $(OCTAVE_FORGE_PKG_BUILD)
+endef