# HG changeset patch # User John W. Eaton # Date 1358192948 18000 # Node ID 04791633efbcedc758d7bc59b8ad3c690ec3d1fb # Parent 0c4eab3a790380002c67fc8210046ac4e1e74295 Octave Forge package sources and build script diff -r 0c4eab3a7903 -r 04791633efbc Makefile --- a/Makefile Mon Jan 14 14:47:09 2013 -0500 +++ b/Makefile Mon Jan 14 14:49:08 2013 -0500 @@ -57,6 +57,9 @@ MSYS_BASE_DIR := $(PREFIX)/../msys-base MSYS_BASE_PACKAGES := $(addprefix msys-,bash coreutils diffutils file findutils gawk grep gzip less libiconv libintl libmagic make msys-core regex sed tar termcap) +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) + MAKE_SHARED_FROM_STATIC := $(TOP_DIR)/tools/make-shared-from-static CMAKE_TOOLCHAIN_FILE := $(PREFIX)/$(TARGET)/share/cmake/mxe-conf.cmake @@ -121,6 +124,9 @@ .PHONY: msys-base msys-base: $(MSYS_BASE_PACKAGES) +.PHONY: octave-forge-packages +octave-forge-packages: $(OCTAVE_FORGE_PACKAGES) + .PHONY: check-requirements define CHECK_REQUIREMENT @if ! $(1) --help &>/dev/null; then \ diff -r 0c4eab3a7903 -r 04791633efbc index.html --- a/index.html Mon Jan 14 14:47:09 2013 -0500 +++ b/index.html Mon Jan 14 14:49:08 2013 -0500 @@ -1784,6 +1784,61 @@ Octave + of-communications + 1.1.1 + Octave Forge communications package + + + of-control + 2.4.1 + Octave Forge control package + + + of-general + 1.3.2 + Octave Forge general package + + + of-image + 2.0.0 + Octave Forge image package + + + of-io + 1.2.0 + Octave Forge io package + + + of-miscellaneous + 1.2.0 + Octave Forge miscellaneous package + + + of-optim + 1.2.2 + Octave Forge optim package + + + of-signal + 1.2.0 + Octave Forge signal package + + + of-specfun + 1.1.0 + Octave Forge specfun package + + + of-statistics + 1.1.3 + Octave Forge statistics package + + + of-struct + 1.0.10 + Octave Forge struct package + + stable-octave 3.6.4-rc1 Octave diff -r 0c4eab3a7903 -r 04791633efbc mk-dist --- a/mk-dist Mon Jan 14 14:47:09 2013 -0500 +++ b/mk-dist Mon Jan 14 14:49:08 2013 -0500 @@ -59,7 +59,7 @@ echo " octave and dependencies..." cd $TOPDIR/usr/$TARGET tar -c -h -X $TOPDIR/excluded-gcc-files -f - . | ( cd $TOPDIR/dist/octave ; tar xpf - ) - +cp $TOPDIR/build_packages.m $TOPDIR/dist/octave/src echo " native tools..." cd $TOPDIR/native-tools/usr diff -r 0c4eab3a7903 -r 04791633efbc src/of-communications-1-fixes.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/of-communications-1-fixes.patch Mon Jan 14 14:49:08 2013 -0500 @@ -0,0 +1,11 @@ +diff -rNu a/src/Makefile b/src/Makefile +--- a/src/Makefile 2012-05-08 08:06:50.000000000 -0400 ++++ b/src/Makefile 2013-01-11 22:50:36.000000000 -0500 +@@ -1,6 +1,6 @@ + sinclude Makeconf + +-HDF5_LIBS := $(shell grep "\#define OCTAVE_CONF_HDF5_LIBS" $(shell $(MKOCTFILE) -p OCTINCLUDEDIR)/oct-conf.h | sed 's/^.*LIBS //;s/"//g' ) ++HDF5_LIBS := $(shell grep "\#define OCTAVE_CONF_HDF5_LIBS" '$(shell $(MKOCTFILE) -p OCTINCLUDEDIR)/oct-conf.h' | sed 's/^.*LIBS //;s/"//g' ) + + GALOISTARGET = gf.oct + GALOISSOURCES = galois.cc galois-def.cc galoisfield.cc gf.cc \ diff -r 0c4eab3a7903 -r 04791633efbc src/of-communications.mk --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/of-communications.mk Mon Jan 14 14:49:08 2013 -0500 @@ -0,0 +1,24 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := of-communications +$(PKG)_IGNORE := +$(PKG)_CHECKSUM := 8c358c02ddd84047db62d5f36125630ea940e41b +$(PKG)_REMOTE_SUBDIR := +$(PKG)_SUBDIR := communications +$(PKG)_FILE := communications-$($(PKG)_VERSION).tar.gz +$(PKG)_FIXED_FILE := communications-$($(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 + mkdir -p '$(PREFIX)/$(TARGET)/src' + cd '$(1)/..' \ + && tar czf $($(PKG)_FIXED_FILE) $($(PKG)_SUBDIR) \ + && $(INSTALL) -m644 '$($(PKG)_FIXED_FILE)' '$(PREFIX)/$(TARGET)/src' +endef diff -r 0c4eab3a7903 -r 04791633efbc src/of-control.mk --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/of-control.mk Mon Jan 14 14:49:08 2013 -0500 @@ -0,0 +1,21 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := of-control +$(PKG)_IGNORE := +$(PKG)_CHECKSUM := c99e049fda72300a3e77a763b9c5a00829f91c0f +$(PKG)_REMOTE_SUBDIR := +$(PKG)_SUBDIR := +$(PKG)_FILE := control-$($(PKG)_VERSION).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 + mkdir -p '$(PREFIX)/$(TARGET)/src' + $(INSTALL) -m644 '$(PKG_DIR)/$($(PKG)_FILE)' '$(PREFIX)/$(TARGET)/src' +endef diff -r 0c4eab3a7903 -r 04791633efbc src/of-general.mk --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/of-general.mk Mon Jan 14 14:49:08 2013 -0500 @@ -0,0 +1,21 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := of-general +$(PKG)_IGNORE := +$(PKG)_CHECKSUM := 1662d97f0bf1be957e1a30a287d9c0aff7b5ecdd +$(PKG)_REMOTE_SUBDIR := +$(PKG)_SUBDIR := +$(PKG)_FILE := general-$($(PKG)_VERSION).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 + mkdir -p '$(PREFIX)/$(TARGET)/src' + $(INSTALL) -m644 '$(PKG_DIR)/$($(PKG)_FILE)' '$(PREFIX)/$(TARGET)/src' +endef diff -r 0c4eab3a7903 -r 04791633efbc src/of-image.mk --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/of-image.mk Mon Jan 14 14:49:08 2013 -0500 @@ -0,0 +1,21 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := of-image +$(PKG)_IGNORE := +$(PKG)_CHECKSUM := 30f33db706e8892f120f2d79e030c3f21dea4563 +$(PKG)_REMOTE_SUBDIR := +$(PKG)_SUBDIR := +$(PKG)_FILE := image-$($(PKG)_VERSION).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 + mkdir -p '$(PREFIX)/$(TARGET)/src' + $(INSTALL) -m644 '$(PKG_DIR)/$($(PKG)_FILE)' '$(PREFIX)/$(TARGET)/src' +endef diff -r 0c4eab3a7903 -r 04791633efbc src/of-io.mk --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/of-io.mk Mon Jan 14 14:49:08 2013 -0500 @@ -0,0 +1,21 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := of-io +$(PKG)_IGNORE := +$(PKG)_CHECKSUM := 3744a01b45cb8519ba1a5477ab1ce7a16ead889f +$(PKG)_REMOTE_SUBDIR := +$(PKG)_SUBDIR := +$(PKG)_FILE := io-$($(PKG)_VERSION).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 + mkdir -p '$(PREFIX)/$(TARGET)/src' + $(INSTALL) -m644 '$(PKG_DIR)/$($(PKG)_FILE)' '$(PREFIX)/$(TARGET)/src' +endef diff -r 0c4eab3a7903 -r 04791633efbc src/of-miscellaneous.mk --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/of-miscellaneous.mk Mon Jan 14 14:49:08 2013 -0500 @@ -0,0 +1,21 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := of-miscellaneous +$(PKG)_IGNORE := +$(PKG)_CHECKSUM := eec920357a581f26b2bc9079e32732b77c3a641b +$(PKG)_REMOTE_SUBDIR := +$(PKG)_SUBDIR := +$(PKG)_FILE := miscellaneous-$($(PKG)_VERSION).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 + mkdir -p '$(PREFIX)/$(TARGET)/src' + $(INSTALL) -m644 '$(PKG_DIR)/$($(PKG)_FILE)' '$(PREFIX)/$(TARGET)/src' +endef diff -r 0c4eab3a7903 -r 04791633efbc src/of-optim-1-fixes.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/of-optim-1-fixes.patch Mon Jan 14 14:49:08 2013 -0500 @@ -0,0 +1,11 @@ +diff -rNu a/src/__bfgsmin.cc b/src/__bfgsmin.cc +--- a/src/__bfgsmin.cc 2012-03-30 11:14:48.000000000 -0400 ++++ b/src/__bfgsmin.cc 2013-01-14 12:07:15.639384929 -0500 +@@ -25,6 +25,7 @@ + #include + #include + #include ++#include + #include "error.h" + + int __bfgsmin_obj(double &obj, const std::string f, const octave_value_list f_args, const ColumnVector theta, const int minarg) diff -r 0c4eab3a7903 -r 04791633efbc src/of-optim.mk --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/of-optim.mk Mon Jan 14 14:49:08 2013 -0500 @@ -0,0 +1,24 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := of-optim +$(PKG)_IGNORE := +$(PKG)_CHECKSUM := c1fbd588dd11150ff4e973d4b93582c8bd6126ed +$(PKG)_REMOTE_SUBDIR := +$(PKG)_SUBDIR := optim-$($(PKG)_VERSION) +$(PKG)_FILE := optim-$($(PKG)_VERSION).tar.gz +$(PKG)_FIXED_FILE := optim-$($(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 + mkdir -p '$(PREFIX)/$(TARGET)/src' + cd '$(1)/..' \ + && tar czf $($(PKG)_FIXED_FILE) $($(PKG)_SUBDIR) \ + && $(INSTALL) -m644 '$($(PKG)_FIXED_FILE)' '$(PREFIX)/$(TARGET)/src' +endef diff -r 0c4eab3a7903 -r 04791633efbc src/of-signal.mk --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/of-signal.mk Mon Jan 14 14:49:08 2013 -0500 @@ -0,0 +1,21 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := of-signal +$(PKG)_IGNORE := +$(PKG)_CHECKSUM := 87ed51b878ac49d32c328032500dff452132240b +$(PKG)_REMOTE_SUBDIR := +$(PKG)_SUBDIR := +$(PKG)_FILE := signal-$($(PKG)_VERSION).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 + mkdir -p '$(PREFIX)/$(TARGET)/src' + $(INSTALL) -m644 '$(PKG_DIR)/$($(PKG)_FILE)' '$(PREFIX)/$(TARGET)/src' +endef diff -r 0c4eab3a7903 -r 04791633efbc src/of-specfun.mk --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/of-specfun.mk Mon Jan 14 14:49:08 2013 -0500 @@ -0,0 +1,21 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := of-specfun +$(PKG)_IGNORE := +$(PKG)_CHECKSUM := 293a98dc2139057aa7119f3065d501616431c6a5 +$(PKG)_REMOTE_SUBDIR := +$(PKG)_SUBDIR := +$(PKG)_FILE := specfun-$($(PKG)_VERSION).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 + mkdir -p '$(PREFIX)/$(TARGET)/src' + $(INSTALL) -m644 '$(PKG_DIR)/$($(PKG)_FILE)' '$(PREFIX)/$(TARGET)/src' +endef diff -r 0c4eab3a7903 -r 04791633efbc src/of-statistics.mk --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/of-statistics.mk Mon Jan 14 14:49:08 2013 -0500 @@ -0,0 +1,21 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := of-statistics +$(PKG)_IGNORE := +$(PKG)_CHECKSUM := c8bb88b9da84f5b12e624b65828e58cf16c4e3f4 +$(PKG)_REMOTE_SUBDIR := +$(PKG)_SUBDIR := +$(PKG)_FILE := statistics-$($(PKG)_VERSION).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 + mkdir -p '$(PREFIX)/$(TARGET)/src' + $(INSTALL) -m644 '$(PKG_DIR)/$($(PKG)_FILE)' '$(PREFIX)/$(TARGET)/src' +endef diff -r 0c4eab3a7903 -r 04791633efbc src/of-struct.mk --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/of-struct.mk Mon Jan 14 14:49:08 2013 -0500 @@ -0,0 +1,21 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := of-struct +$(PKG)_IGNORE := +$(PKG)_CHECKSUM := 4703b20612c9e5ec48765af15c28e7a1fc90d427 +$(PKG)_REMOTE_SUBDIR := +$(PKG)_SUBDIR := +$(PKG)_FILE := struct-$($(PKG)_VERSION).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 + mkdir -p '$(PREFIX)/$(TARGET)/src' + $(INSTALL) -m644 '$(PKG_DIR)/$($(PKG)_FILE)' '$(PREFIX)/$(TARGET)/src' +endef