view src/gnuplot-3-iconv.patch @ 3908:5863c4ed08b1

of-dicom: patch to compile in octave 4.0.0 (Bug #44624) * src/of-dicom-1-fixes.patch: new file * dist-files.mk: add of-dicom-1-fixes.patch * src/of-dicom.mk: allow cross compile
author John Donoghue <john.donoghue@ieee.org>
date Wed, 15 Apr 2015 21:52:37 -0400
parents ceeb3ec75690
children
line wrap: on
line source

diff -ur gnuplot-4.6.4.orig/config/mingw/Makefile gnuplot-4.6.4/config/mingw/Makefile
--- gnuplot-4.6.4.orig/config/mingw/Makefile	2014-07-24 20:30:33 -0400
+++ gnuplot-4.6.4/config/mingw/Makefile	2014-07-24 20:30:50 -0400
@@ -382,8 +382,9 @@
 endif
 
 ifdef ICONV
-	CFLAGS += -DHAVE_ICONV
-	TERMLIBS += -liconv
+	CFLAGS += -DHAVE_ICONV $(ICONV_CFLAGS)
+        LDFLAGS += $(ICONV_LDFLAGS)
+	TERMLIBS += -liconv 
 endif
 
 ifdef GNU_RC