changeset 3251:8c8dfed15638

merge away extra head
author John W. Eaton <jwe@octave.org>
date Mon, 23 Sep 2013 14:48:07 -0400
parents e3944cf36a54 (diff) e8240c0feedd (current diff)
children ebdaebefc651
files index.html src/llvm.mk
diffstat 5 files changed, 15 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/build_packages.m	Fri Sep 20 21:06:39 2013 -0400
+++ b/build_packages.m	Mon Sep 23 14:48:07 2013 -0400
@@ -1,13 +1,13 @@
 more ("off");
 echo ("on");
-pkg install general-1.3.2.tar.gz
-pkg install miscellaneous-1.2.0.tar.gz
-pkg install struct-1.0.10.tar.gz
-pkg install optim-1.2.2a.tar.gz
-pkg install specfun-1.1.0.tar.gz
-pkg install control-2.4.1.tar.gz
-pkg install signal-1.2.0.tar.gz
-pkg install communications-1.1.1a.tar.gz
-pkg install image-2.0.0.tar.gz
-pkg install io-1.2.0.tar.gz
-pkg install statistics-1.1.3.tar.gz
+pkg install -global -auto general-1.3.2.tar.gz
+pkg install -global -auto miscellaneous-1.2.0.tar.gz
+pkg install -global -auto struct-1.0.10.tar.gz
+pkg install -global -auto optim-1.2.2a.tar.gz
+pkg install -global -auto specfun-1.1.0.tar.gz
+pkg install -global -auto control-2.4.1.tar.gz
+pkg install -global -auto signal-1.2.0.tar.gz
+pkg install -global -auto communications-1.1.1a.tar.gz
+pkg install -global -auto image-2.0.0.tar.gz
+pkg install -global -auto io-1.2.0.tar.gz
+pkg install -global -auto statistics-1.1.3.tar.gz
--- a/configure.ac	Fri Sep 20 21:06:39 2013 -0400
+++ b/configure.ac	Mon Sep 23 14:48:07 2013 -0400
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.62])
-AC_INIT([MXE-Octave], [0.0.12], [http://octave.org/bugs.html], [mxe-octave])
+AC_INIT([MXE-Octave], [0.0.13], [http://octave.org/bugs.html], [mxe-octave])
 
 AC_CONFIG_SRCDIR([src/octave.mk])
 AC_CONFIG_AUX_DIR([tools])
--- a/index.html	Fri Sep 20 21:06:39 2013 -0400
+++ b/index.html	Mon Sep 23 14:48:07 2013 -0400
@@ -1865,7 +1865,7 @@
     </tr>
     <tr>
         <td id="native-gcc-package">native-gcc</td>
-        <td id="native-gcc-version">4.7.2</td>
+        <td id="native-gcc-version">4.8.1</td>
         <td id="native-gcc-website"><a href="http://gcc.gnu.org/">GCC</a></td>
     </tr>
     <tr>
--- a/src/llvm.mk	Fri Sep 20 21:06:39 2013 -0400
+++ b/src/llvm.mk	Mon Sep 23 14:48:07 2013 -0400
@@ -72,7 +72,7 @@
     mkdir '$(1)/build'
     cd '$(1)/build' && cmake .. \
         -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \
-        -DLIBTYPE=STATIC \
+        -DBUILD_SHARED_LIBS=ON \
         -DLLVM_TARGETS_TO_BUILD="X86" \
         -DLLVM_BUILD_TOOLS=OFF
     $(MAKE) -C '$(1)/build' -j $(JOBS) llvm-tblgen
--- a/src/native-gcc.mk	Fri Sep 20 21:06:39 2013 -0400
+++ b/src/native-gcc.mk	Mon Sep 23 14:48:07 2013 -0400
@@ -3,7 +3,7 @@
 
 PKG             := native-gcc
 $(PKG)_IGNORE   :=
-$(PKG)_CHECKSUM := a464ba0f26eef24c29bcd1e7489421117fb9ee35
+$(PKG)_CHECKSUM := 4e655032cda30e1928fcc3f00962f4238b502169
 $(PKG)_SUBDIR   := gcc-$($(PKG)_VERSION)
 $(PKG)_FILE     := gcc-$($(PKG)_VERSION).tar.bz2
 $(PKG)_URL      := ftp://ftp.gnu.org/pub/gnu/gcc/gcc-$($(PKG)_VERSION)/$($(PKG)_FILE)