From 51287e2f17435eb828d4b5328b99d9f1cbea7c03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20K=C3=BChling?= <dvdkhlng@gmx.de>
Date: Fri, 23 Mar 2012 03:24:44 +0100
Subject: [PATCH] octave: fix compilation with latest openwrt toolchain

---
 octave/Makefile | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/octave/Makefile b/octave/Makefile
index 1b332df..9a20209 100644
--- a/octave/Makefile
+++ b/octave/Makefile
@@ -6,12 +6,20 @@
 # OpenWRT package for the GNU Octave
 #
 # todo: how do we enable octave's internal help system?
+#
+# todo: we may have a (slight) linking problem: it prefers liboctinterp.so &
+# friends from staging_dir/target-mipsel_uClibc-0.9.32/usr/lib/ over the one
+# freshly compiled.  As a workaround, try 'rm
+# openwrt-xburst/staging_dir/target-mipsel_uClibc-0.9.32/usr/lib/*oct*' if
+# compilation fails for you.  Mostly that doesn't matter on clean rebuilds
+# anyways.
+#
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=octave
 PKG_VERSION:=3.2.4
-PKG_RELEASE:=3
+PKG_RELEASE:=4
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=ftp://ftp.octave.org/pub/octave/
 PKG_MD5SUM:=90c39fa9e241ad2e978bcee4682a2ba9
@@ -75,6 +83,10 @@ endef
 # todo : need -enable-rpath?
 
 OCTAVE_LIB_DIR := /usr/lib
+
+# ugly workaround for octave 3.2.4 to compile with latest openwrt toolchain
+TARGET_CXXFLAGS += -include stddef.h -fpermissive
+
 CONFIGURE_ARGS += --without-x --without-fftw --disable-docs
 CONFIGURE_VARS += octlibdir=$(OCTAVE_LIB_DIR) \
 	FFLAGS="$(TARGET_CFLAGS)"