Mercurial > mxe-octave

diff src/gnuplot.mk @ 3668:ceeb3ec75690

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
gnuplot: provide way to specify where iconv is * dist-files.mk: add gnuplot-3-iconv.patch * src/gnuplot-3-iconv.patch: new file * src/gnuplot.mk: if native ming set iconv lib/inc dir to host folders.
author John Donoghue
date Thu, 24 Jul 2014 22:18:41 -0400
parents 1ab2022ff6c7
children a397ccee4b57
line wrap: on
line diff
--- a/src/gnuplot.mk	Fri Jul 25 10:28:02 2014 -0400
+++ b/src/gnuplot.mk	Thu Jul 24 22:18:41 2014 -0400
@@ -10,6 +10,10 @@
 $(PKG)_URL      := http://sourceforge.net/projects/gnuplot/files/gnuplot/$($(PKG)_VERSION)/$($(PKG)_FILE)
 $(PKG)_DEPS     :=
 
+ifeq ($(MXE_NATIVE_MINGW_BUILD),yes)
+    $(PKG)_EXTRAFLAGS := ICONV_CFLAGS='-I$(HOST_INCDIR)' ICONV_LDFLAGS='-L$(HOST_LIBDIR)'
+endif
+
 define $(PKG)_UPDATE
     echo 'Warning: Updates are temporarily disabled for package gnuplot.' >&2;
     echo $(gnuplot_VERSION)
@@ -17,8 +21,8 @@
 
 ifeq ($(MXE_SYSTEM),mingw)
 define $(PKG)_BUILD
-    make -C '$(1)/config/mingw' CC='$(MXE_CC)' CXX='$(MXE_CXX)' RC='$(MXE_WINDRES)' -j '$(JOBS)' TARGET=gnuplot.exe gnuplot.exe
-    make -C '$(1)/config/mingw' CC='$(MXE_CC)' CXX='$(MXE_CXX)' RC='$(MXE_WINDRES)' -j '$(JOBS)' TARGET=wgnuplot.exe wgnuplot.exe
+    make -C '$(1)/config/mingw' $($(PKG)_EXTRAFLAGS) CC='$(MXE_CC)' CXX='$(MXE_CXX)' RC='$(MXE_WINDRES)' -j '$(JOBS)' TARGET=gnuplot.exe gnuplot.exe
+    make -C '$(1)/config/mingw' $($(PKG)_EXTRAFLAGS) CC='$(MXE_CC)' CXX='$(MXE_CXX)' RC='$(MXE_WINDRES)' -j '$(JOBS)' TARGET=wgnuplot.exe wgnuplot.exe
 
     $(INSTALL) -d '$(3)$(HOST_BINDIR)'
     $(INSTALL) -m755 '$(1)/config/mingw/gnuplot.exe' '$(3)$(HOST_BINDIR)'