Mercurial > mxe-octave
changeset 3668:ceeb3ec75690
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 | 48a6501044c0 |
children | 99d5080d06a2 |
files | dist-files.mk src/gnuplot-3-iconv.patch src/gnuplot.mk |
diffstat | 3 files changed, 22 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/dist-files.mk Fri Jul 25 10:28:02 2014 -0400 +++ b/dist-files.mk Thu Jul 24 22:18:41 2014 -0400 @@ -129,6 +129,7 @@ gnu-linux-ghostscript-configure.patch \ gnuplot-1-fixes.patch \ gnuplot-2-win64.patch \ + gnuplot-3-iconv.patch \ gnuplot.mk \ gnutls-1-fixes.patch \ gnutls-test.c \
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/gnuplot-3-iconv.patch Thu Jul 24 22:18:41 2014 -0400 @@ -0,0 +1,15 @@ +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
--- 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)'