Mercurial > mxe-octave

changeset 3421:7e0b4087cd58

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add octave forge tsa package * Makefile.in: Add of-tsa. * build_packages.m: Add install of tsa-4.2.7.tar.gz * dist-files: Add of-tsa.mk. * index.html: Added of-tsa-package. * src/of-tsa.mk: New file. * src/libgomp.mk: Install to HOST_PREFIX
author John Donoghue <john.donoghue@ieee.org>
date Mon, 13 Jan 2014 21:28:53 -0500
parents 207b5f6713d9
children 2a0e9378056c
files Makefile.in build_packages.m dist-files.mk index.html src/libgomp.mk src/of-tsa.mk
diffstat 6 files changed, 35 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile.in	Mon Jan 13 21:27:34 2014 -0500
+++ b/Makefile.in	Mon Jan 13 21:28:53 2014 -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 sockets zenity actuarial data-smoothing fuzzy-logic-toolkit quaternion fits fl-core)
+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)
 
 MAKE_SHARED_FROM_STATIC := \
   $(TOP_DIR)/tools/make-shared-from-static $(MAKE_SHARED_FROM_STATIC_OPTIONS)
--- a/build_packages.m	Mon Jan 13 21:27:34 2014 -0500
+++ b/build_packages.m	Mon Jan 13 21:28:53 2014 -0500
@@ -23,4 +23,5 @@
 pkg install quaternion-2.2.0.tar.gz
 pkg install fits-1.0.3.tar.gz
 pkg install fl-core-1.0.0.tar.gz
+pkg install tsa-4.2.7.tar.gz
 
--- a/dist-files.mk	Mon Jan 13 21:27:34 2014 -0500
+++ b/dist-files.mk	Mon Jan 13 21:28:53 2014 -0500
@@ -405,6 +405,7 @@
   of-specfun.mk \
   of-statistics.mk \
   of-struct.mk \
+  of-tsa.mk \
   of-windows.mk \
   of-zenity.mk \
   ogg.mk \
--- a/index.html	Mon Jan 13 21:27:34 2014 -0500
+++ b/index.html	Mon Jan 13 21:28:53 2014 -0500
@@ -2048,6 +2048,11 @@
         <td id="of-struct-website"><a href="http://octave.sf.net/">Octave Forge struct package</a></td>
     </tr>
     <tr>
+        <td id="of-tsa-package">of-tsa</td>
+        <td id="of-tsa-version">4.2.7</td>
+        <td id="of-tsa-website"><a href="http://octave.sf.net/">Octave Forge tsa package</a></td>
+    </tr>
+    <tr>
         <td id="of-windows-package">of-windows</td>
         <td id="of-windows-version">1.2.1</td>
         <td id="of-windows-website"><a href="http://octave.sf.net/">Octave Forge struct package</a></td>
--- a/src/libgomp.mk	Mon Jan 13 21:27:34 2014 -0500
+++ b/src/libgomp.mk	Mon Jan 13 21:28:53 2014 -0500
@@ -19,15 +19,16 @@
     cd       '$(1)/build/$(TARGET)/libgomp' && '$(1)/libgomp/configure' \
         $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         --target='$(TARGET)' \
-        --prefix='$(BUILD_TOOLS_PREFIX)' \
+        --prefix='$(HOST_PREFIX)' \
         --enable-version-specific-runtime-libs \
         --with-gnu-ld \
         $(ENABLE_SHARED_OR_STATIC) \
         LIBS='-lws2_32'
-    $(MAKE) -C '$(1)/build/$(TARGET)/libgomp' -j '$(JOBS)' install
+    $(MAKE) -C '$(1)/build/$(TARGET)/libgomp' -j '$(JOBS)'
+    $(MAKE) -C '$(1)/build/$(TARGET)/libgomp' -j '1' install DESTDIR='$(3)'
 
-    '$(MXE_CC)' \
-        -W -Wall -Werror -ansi -pedantic \
-        '$(2).c' -o '$(HOST_BINDIR)/test-libgomp.exe' \
-        -fopenmp
+    #'$(MXE_CC)' \
+    #    -W -Wall -Werror -ansi -pedantic \
+    #    '$(2).c' -o '$(HOST_BINDIR)/test-libgomp.exe' \
+    #    -fopenmp
 endef
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/of-tsa.mk	Mon Jan 13 21:28:53 2014 -0500
@@ -0,0 +1,20 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+PKG             := of-tsa
+$(PKG)_IGNORE   :=
+$(PKG)_CHECKSUM := 80d2faa61c32043bf1edc2c0fa48fe0c00eacd89
+$(PKG)_REMOTE_SUBDIR := 
+$(PKG)_SUBDIR   := tsa
+$(PKG)_FILE     := tsa-$($(PKG)_VERSION).tar.gz
+$(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/octave/$($(PKG)_FILE)?download
+$(PKG)_DEPS     := libgomp
+
+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