# HG changeset patch # User John Donoghue # Date 1394148861 18000 # Node ID b1a7cff2d2a99eb76d8ce9cf2cded095cf53647d # Parent 22b42ac3fd68dd1623be1bec421cc95721ff52ad Add octave forge of-netcdf package (and support files) * src/of-netcdf.mk: New file. * src/netcdf.mk: Update checksum for version 4.3.0, install to DESTDIR. * src/hdf5.mk: make make and make install separate, modify libtool script to enable dynamic build of all sub libraries. * index.html: added of-netcdf * dist-files.mk: add of-netcdf.mk * Makefile.in: add of-netcdf * build_packages.m: add install of netcdf-1.0.2.tar.gz diff -r 22b42ac3fd68 -r b1a7cff2d2a9 Makefile.in --- a/Makefile.in Thu Feb 27 06:36:03 2014 -0500 +++ b/Makefile.in Thu Mar 06 18:34:21 2014 -0500 @@ -375,7 +375,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 sockets zenity actuarial data-smoothing fuzzy-logic-toolkit quaternion fits fl-core tsa dicom) +OCTAVE_FORGE_PACKAGES := $(addprefix of-,miscellaneous struct optim specfun general signal communications image io statistics control geometry windows odepkg linear-algebra sockets zenity actuarial data-smoothing fuzzy-logic-toolkit quaternion fits fl-core tsa dicom netcdf) BLAS_PACKAGES := blas ifeq ($(ENABLE_OPENBLAS),yes) diff -r 22b42ac3fd68 -r b1a7cff2d2a9 build_packages.m --- a/build_packages.m Thu Feb 27 06:36:03 2014 -0500 +++ b/build_packages.m Thu Mar 06 18:34:21 2014 -0500 @@ -31,4 +31,4 @@ pkg install fl-core-1.0.0.tar.gz pkg install tsa-4.2.7.tar.gz pkg install dicom-0.1.1.tar.gz - +pkg install netcdf-1.0.2.tar.gz diff -r 22b42ac3fd68 -r b1a7cff2d2a9 dist-files.mk --- a/dist-files.mk Thu Feb 27 06:36:03 2014 -0500 +++ b/dist-files.mk Thu Mar 06 18:34:21 2014 -0500 @@ -425,6 +425,7 @@ of-io.mk \ of-linear-algebra.mk \ of-miscellaneous.mk \ + of-netcdf.mk \ of-odepkg.mk \ of-optim-1-fixes.patch \ of-optim.mk \ diff -r 22b42ac3fd68 -r b1a7cff2d2a9 index.html --- a/index.html Thu Feb 27 06:36:03 2014 -0500 +++ b/index.html Thu Mar 06 18:34:21 2014 -0500 @@ -1835,6 +1835,10 @@ Octave Forge miscellaneous package + of-netcdf + Octave Forge netcdf package + + of-odepkg Octave Forge odepkg package diff -r 22b42ac3fd68 -r b1a7cff2d2a9 src/hdf5.mk --- a/src/hdf5.mk Thu Feb 27 06:36:03 2014 -0500 +++ b/src/hdf5.mk Thu Mar 06 18:34:21 2014 -0500 @@ -70,5 +70,9 @@ ;; \ esac - $(MAKE) -C '$(1)/.build' -j '$(JOBS)' install DESTDIR='$(3)' + # libtool is somehow created to effectively disallow shared builds + $(SED) -i 's,allow_undefined_flag="unsupported",allow_undefined_flag="",g' '$(1)/.build/libtool' + + $(MAKE) -C '$(1)/.build' -j '$(JOBS)' + $(MAKE) -C '$(1)/.build' -j 1 install DESTDIR='$(3)' endef diff -r 22b42ac3fd68 -r b1a7cff2d2a9 src/netcdf.mk --- a/src/netcdf.mk Thu Feb 27 06:36:03 2014 -0500 +++ b/src/netcdf.mk Thu Mar 06 18:34:21 2014 -0500 @@ -4,7 +4,7 @@ PKG := netcdf $(PKG)_IGNORE := $(PKG)_VERSION := 4.3.0 -$(PKG)_CHECKSUM := 31b4b3b17146cc8c14a8c7be3fe5f28e5a8a5deb +$(PKG)_CHECKSUM := 246e4963e66e1c175563cc9a714e9da0a19b8b07 $(PKG)_SUBDIR := netcdf-$($(PKG)_VERSION) $(PKG)_FILE := netcdf-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://www.unidata.ucar.edu/downloads/netcdf/ftp/netcdf-$($(PKG)_VERSION).tar.gz @@ -32,5 +32,5 @@ --enable-dll \ && $($(PKG)_CONFIGURE_POST_HOOK) $(MAKE) -C '$(1)' -j '$(JOBS)' - $(MAKE) -C '$(1)' -j 1 install + $(MAKE) -C '$(1)' -j 1 install DESTDIR='$(3)' endef diff -r 22b42ac3fd68 -r b1a7cff2d2a9 src/of-netcdf.mk --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/of-netcdf.mk Thu Mar 06 18:34:21 2014 -0500 @@ -0,0 +1,21 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := of-netcdf +$(PKG)_IGNORE := +$(PKG)_VERSION := 1.0.2 +$(PKG)_CHECKSUM := 5e90c5a5f4de45c200661b3a86fdb4e040bdc97b +$(PKG)_REMOTE_SUBDIR := +$(PKG)_SUBDIR := netcdf +$(PKG)_FILE := netcdf-$($(PKG)_VERSION).tar.gz +$(PKG)_URL := '$(OCTAVE_FORGE_BASE_URL)/$($(PKG)_FILE)/download' +$(PKG)_DEPS := netcdf + +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