# HG changeset patch
# User John Donoghue
# Date 1428665738 14400
# Node ID b42e8f913ddce3c1c0a17fcb6cce2df79709e713
# Parent d135404e71a48472058c829eb82276b3b89edaf2
of-database: added of package
* src/of-database.mk: new file
* dist-files.mk: add of-database.mk, of-database-1-cross-fixes.patch
* Makefile.am: add database to octave forge packages
* index.html: add of-database
* build_packages.m: add of-database package
* src/of-database-1-cross-fixes.patch: new file
diff -r d135404e71a4 -r b42e8f913ddc Makefile.in
--- a/Makefile.in Fri Apr 10 15:12:22 2015 -0400
+++ b/Makefile.in Fri Apr 10 07:35:38 2015 -0400
@@ -419,7 +419,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 netcdf ltfat)
+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 ltfat database)
# get ALL deps for all of- packages, regardless of whethe building the actual forge package in the installer
OCTAVE_FORGE_DEPS:= $(sort $(foreach p,$(wildcard $(TOP_DIR)/src/of-*.mk),$(shell $(SED) -n 's/.*_DEPS.*:=\(.*\)/\1/p' $p)))
diff -r d135404e71a4 -r b42e8f913ddc build_packages.m
--- a/build_packages.m Fri Apr 10 15:12:22 2015 -0400
+++ b/build_packages.m Fri Apr 10 07:35:38 2015 -0400
@@ -47,4 +47,5 @@
try_install dicom-0.1.1.tar.gz
try_install netcdf-1.0.6.tar.gz
try_install ltfat-2.0.1.tar.gz
+try_install database-2.3.1.tar.gz
diff -r d135404e71a4 -r b42e8f913ddc dist-files.mk
--- a/dist-files.mk Fri Apr 10 15:12:22 2015 -0400
+++ b/dist-files.mk Fri Apr 10 07:35:38 2015 -0400
@@ -449,6 +449,8 @@
of-communications.mk \
of-control.mk \
of-data-smoothing.mk \
+ of-database-1-cross-fixes.patch \
+ of-database.mk \
of-dicom.mk \
of-fits-1-cross-fixes.patch \
of-fits.mk \
diff -r d135404e71a4 -r b42e8f913ddc index.html
--- a/index.html Fri Apr 10 15:12:22 2015 -0400
+++ b/index.html Fri Apr 10 07:35:38 2015 -0400
@@ -1846,6 +1846,10 @@
| Octave Forge data-smoothing package |
+ | of-database |
+ Octave Forge database package |
+
+
| of-dicom |
Octave Forge dicom package |
diff -r d135404e71a4 -r b42e8f913ddc src/of-database-1-cross-fixes.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/of-database-1-cross-fixes.patch Fri Apr 10 07:35:38 2015 -0400
@@ -0,0 +1,81 @@
+diff -ur database-2.3.1.orig/src/configure database-2.3.1/src/configure
+--- database-2.3.1.orig/src/configure 2015-04-09 14:43:58.349514050 -0400
++++ database-2.3.1/src/configure 2015-04-09 14:55:44.447432890 -0400
+@@ -591,6 +591,7 @@
+ CFLAGS
+ CC
+ PG_CONFIG
++OCTAVE_CONFIG
+ MKOCTFILE
+ OCTAVE
+ OBJEXT
+@@ -2407,6 +2408,43 @@
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
++fi
++
++
++# Extract the first word of "octave-config", so it can be a program name with args.
++set dummy octave-config; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if ${ac_cv_prog_OCTAVE_CONFIG+:} false; then :
++ $as_echo_n "(cached) " >&6
++else
++ if test -n "$OCTAVE_CONFIG"; then
++ ac_cv_prog_OCTAVE_CONFIG="$OCTAVE_CONFIG" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++ ac_cv_prog_OCTAVE_CONFIG="octave-config"
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++ done
++IFS=$as_save_IFS
++
++fi
++fi
++OCTAVE_CONFIG=$ac_cv_prog_OCTAVE_CONFIG
++if test -n "$OCTAVE_CONFIG"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OCTAVE_CONFIG" >&5
++$as_echo "$OCTAVE_CONFIG" >&6; }
++else
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ fi
+
+
+diff -ur database-2.3.1.orig/src/configure.ac database-2.3.1/src/configure.ac
+--- database-2.3.1.orig/src/configure.ac 2015-04-09 14:43:58.346513991 -0400
++++ database-2.3.1/src/configure.ac 2015-04-09 14:49:01.101482292 -0400
+@@ -13,6 +13,7 @@
+
+ AC_CHECK_PROG(OCTAVE, octave, octave)
+ AC_CHECK_PROG(MKOCTFILE, mkoctfile, mkoctfile)
++AC_CHECK_PROG(OCTAVE_CONFIG, octave-config, octave-config)
+ AC_CHECK_PROG(PG_CONFIG, pg_config, pg_config)
+ if test -z "$PG_CONFIG"; then
+ AC_MSG_ERROR([pg_config not found], 1);
+diff -ur database-2.3.1.orig/src/Makefile.in database-2.3.1/src/Makefile.in
+--- database-2.3.1.orig/src/Makefile.in 2015-04-09 14:43:58.348514031 -0400
++++ database-2.3.1/src/Makefile.in 2015-04-09 14:51:59.623001539 -0400
+@@ -1,8 +1,10 @@
+ # We rely on g++ features, configure assures CXX=g++.
+ CXX := @CXX@
+
++CANONICAL_HOST_TYPE := $(shell $(OCTAVE_CONFIG) -p CANONICAL_HOST_TYPE))
++
+ EXTRALIBS =
+-ifeq ($(OS),Windows_NT)
++ifneq (,$(findstring mingw,$(CANONICAL_HOST_TYPE)))
+ EXTRALIBS = -lws2_32
+ endif
+
diff -r d135404e71a4 -r b42e8f913ddc src/of-database.mk
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/of-database.mk Fri Apr 10 07:35:38 2015 -0400
@@ -0,0 +1,22 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+PKG := of-database
+$(PKG)_IGNORE :=
+$(PKG)_VERSION := 2.3.1
+$(PKG)_CHECKSUM := 8f319c3bbcf2e57602e62e6e966c348e5636a359
+$(PKG)_REMOTE_SUBDIR :=
+$(PKG)_SUBDIR := database-$($(PKG)_VERSION)
+$(PKG)_FILE := database-$($(PKG)_VERSION).tar.gz
+$(PKG)_URL := '$(OCTAVE_FORGE_BASE_URL)/$($(PKG)_FILE)/download'
+$(PKG)_DEPS :=
+
+define $(PKG)_UPDATE
+ $(WGET) -q -O- 'http://$(SOURCEFORGE_MIRROR)/projects/octave/files/Octave%20Forge%20Packages/Individual%20Package%20Releases/' | \
+ $(SED) -n 's,.*title="database-\([0-9][^"]*\).tar.gz".*,\1,p' | \
+ head -1
+endef
+
+define $(PKG)_BUILD
+ $(OCTAVE_FORGE_PKG_BUILD)
+endef