Mercurial > mxe-octave
comparison src/gnuplot.mk @ 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 | 1ab2022ff6c7 |
children | a397ccee4b57 |
comparison
equal
deleted
inserted
replaced
3667:48a6501044c0 | 3668:ceeb3ec75690 |
---|---|
8 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) | 8 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) |
9 $(PKG)_FILE := gnuplot-$($(PKG)_VERSION).tar.gz | 9 $(PKG)_FILE := gnuplot-$($(PKG)_VERSION).tar.gz |
10 $(PKG)_URL := http://sourceforge.net/projects/gnuplot/files/gnuplot/$($(PKG)_VERSION)/$($(PKG)_FILE) | 10 $(PKG)_URL := http://sourceforge.net/projects/gnuplot/files/gnuplot/$($(PKG)_VERSION)/$($(PKG)_FILE) |
11 $(PKG)_DEPS := | 11 $(PKG)_DEPS := |
12 | 12 |
13 ifeq ($(MXE_NATIVE_MINGW_BUILD),yes) | |
14 $(PKG)_EXTRAFLAGS := ICONV_CFLAGS='-I$(HOST_INCDIR)' ICONV_LDFLAGS='-L$(HOST_LIBDIR)' | |
15 endif | |
16 | |
13 define $(PKG)_UPDATE | 17 define $(PKG)_UPDATE |
14 echo 'Warning: Updates are temporarily disabled for package gnuplot.' >&2; | 18 echo 'Warning: Updates are temporarily disabled for package gnuplot.' >&2; |
15 echo $(gnuplot_VERSION) | 19 echo $(gnuplot_VERSION) |
16 endef | 20 endef |
17 | 21 |
18 ifeq ($(MXE_SYSTEM),mingw) | 22 ifeq ($(MXE_SYSTEM),mingw) |
19 define $(PKG)_BUILD | 23 define $(PKG)_BUILD |
20 make -C '$(1)/config/mingw' CC='$(MXE_CC)' CXX='$(MXE_CXX)' RC='$(MXE_WINDRES)' -j '$(JOBS)' TARGET=gnuplot.exe gnuplot.exe | 24 make -C '$(1)/config/mingw' $($(PKG)_EXTRAFLAGS) CC='$(MXE_CC)' CXX='$(MXE_CXX)' RC='$(MXE_WINDRES)' -j '$(JOBS)' TARGET=gnuplot.exe gnuplot.exe |
21 make -C '$(1)/config/mingw' CC='$(MXE_CC)' CXX='$(MXE_CXX)' RC='$(MXE_WINDRES)' -j '$(JOBS)' TARGET=wgnuplot.exe wgnuplot.exe | 25 make -C '$(1)/config/mingw' $($(PKG)_EXTRAFLAGS) CC='$(MXE_CC)' CXX='$(MXE_CXX)' RC='$(MXE_WINDRES)' -j '$(JOBS)' TARGET=wgnuplot.exe wgnuplot.exe |
22 | 26 |
23 $(INSTALL) -d '$(3)$(HOST_BINDIR)' | 27 $(INSTALL) -d '$(3)$(HOST_BINDIR)' |
24 $(INSTALL) -m755 '$(1)/config/mingw/gnuplot.exe' '$(3)$(HOST_BINDIR)' | 28 $(INSTALL) -m755 '$(1)/config/mingw/gnuplot.exe' '$(3)$(HOST_BINDIR)' |
25 $(INSTALL) -m755 '$(1)/config/mingw/wgnuplot.exe' '$(3)$(HOST_BINDIR)' | 29 $(INSTALL) -m755 '$(1)/config/mingw/wgnuplot.exe' '$(3)$(HOST_BINDIR)' |
26 $(INSTALL) -m644 '$(1)/src/win/wgnuplot.mnu' '$(3)$(HOST_BINDIR)' | 30 $(INSTALL) -m644 '$(1)/src/win/wgnuplot.mnu' '$(3)$(HOST_BINDIR)' |