Mercurial > mxe-octave

annotate src/gnuplot.mk @ 4355:7f5714e37725

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
gnupplot: use -std=gnu++11 option when compiling gnuplot for mingw * src/gnuplot add -std=gnu++11 to CXX
author John D
date Thu, 23 Feb 2017 14:08:40 -0500
parents b144c3e1ba5a
children 6aa7dd77d82c
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2891
848118c648ae Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
1 # This file is part of MXE.
848118c648ae Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
2 # See index.html for further information.
848118c648ae Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
3
848118c648ae Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
4 PKG := gnuplot
848118c648ae Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
5 $(PKG)_IGNORE :=
4343
16d2b997c31b gnuplot: update t 5.0.5
John D
parents: 4326
diff changeset
6 $(PKG)_VERSION := 5.0.5
16d2b997c31b gnuplot: update t 5.0.5
John D
parents: 4326
diff changeset
7 $(PKG)_CHECKSUM := c35f55657fdc33217dd70bbf3148578563ecaad1
2891
848118c648ae Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
8 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION)
848118c648ae Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
9 $(PKG)_FILE := gnuplot-$($(PKG)_VERSION).tar.gz
3281
53c8b9c843c6 Update gnuplot to 4.6.4
John Donoghue <john.donoghue@ieee.org>
parents: 3221
diff changeset
10 $(PKG)_URL := http://sourceforge.net/projects/gnuplot/files/gnuplot/$($(PKG)_VERSION)/$($(PKG)_FILE)
3048
5ef49fb3299d treat gcc and binutils as build tools
John W. Eaton <jwe@octave.org>
parents: 3022
diff changeset
11 $(PKG)_DEPS :=
2891
848118c648ae Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
12
4297
8f864b4ea93b gnuplot: enable wx terminal type
John D
parents: 4177
diff changeset
13 $(PKG)_EXTRAFLAGS :=
8f864b4ea93b gnuplot: enable wx terminal type
John D
parents: 4177
diff changeset
14
4345
b144c3e1ba5a gnuplot: only use wxwidgets in windows gnuplot
John D
parents: 4343
diff changeset
15 ifeq ($(MXE_WINDOWS_BUILD),yes)
b144c3e1ba5a gnuplot: only use wxwidgets in windows gnuplot
John D
parents: 4343
diff changeset
16 $(PKG)_DEPS += wxwidgets cairo pango
b144c3e1ba5a gnuplot: only use wxwidgets in windows gnuplot
John D
parents: 4343
diff changeset
17 $(PKG)_EXTRAFLAGS += CAIROTERMS=1 CAIROLIBS=1
b144c3e1ba5a gnuplot: only use wxwidgets in windows gnuplot
John D
parents: 4343
diff changeset
18 $(PKG)_EXTRAFLAGS += WXT=1 WX_CONFIG=$(MXE_TOOL_PREFIX)wx-config
b144c3e1ba5a gnuplot: only use wxwidgets in windows gnuplot
John D
parents: 4343
diff changeset
19 endif
4297
8f864b4ea93b gnuplot: enable wx terminal type
John D
parents: 4177
diff changeset
20
8f864b4ea93b gnuplot: enable wx terminal type
John D
parents: 4177
diff changeset
21 #ifeq ($(ENABLE_QT5),yes)
8f864b4ea93b gnuplot: enable wx terminal type
John D
parents: 4177
diff changeset
22 # $(PKG)_DEPS += qt5
8f864b4ea93b gnuplot: enable wx terminal type
John D
parents: 4177
diff changeset
23 # $(PKG)_EXTRAFLAGS += QT=1 QT_DIR=$(HOST_PREFIX)/qt5
8f864b4ea93b gnuplot: enable wx terminal type
John D
parents: 4177
diff changeset
24 #endif
8f864b4ea93b gnuplot: enable wx terminal type
John D
parents: 4177
diff changeset
25
3668
ceeb3ec75690 gnuplot: provide way to specify where iconv is
John Donoghue
parents: 3577
diff changeset
26 ifeq ($(MXE_NATIVE_MINGW_BUILD),yes)
4297
8f864b4ea93b gnuplot: enable wx terminal type
John D
parents: 4177
diff changeset
27 $(PKG)_EXTRAFLAGS += ICONV_CFLAGS='-I$(HOST_INCDIR)' ICONV_LDFLAGS='-L$(HOST_LIBDIR)'
3668
ceeb3ec75690 gnuplot: provide way to specify where iconv is
John Donoghue
parents: 3577
diff changeset
28 endif
ceeb3ec75690 gnuplot: provide way to specify where iconv is
John Donoghue
parents: 3577
diff changeset
29
2891
848118c648ae Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
30 define $(PKG)_UPDATE
848118c648ae Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
31 echo 'Warning: Updates are temporarily disabled for package gnuplot.' >&2;
848118c648ae Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
32 echo $(gnuplot_VERSION)
848118c648ae Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
33 endef
848118c648ae Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
34
2997
4f9b72cf7ee7 allow native builds too
John W. Eaton <jwe@octave.org>
parents: 2990
diff changeset
35 ifeq ($(MXE_SYSTEM),mingw)
2891
848118c648ae Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
36 define $(PKG)_BUILD
4355
7f5714e37725 gnupplot: use -std=gnu++11 option when compiling gnuplot for mingw
John D
parents: 4345
diff changeset
37 make -C '$(1)/config/mingw' $($(PKG)_EXTRAFLAGS) CC='$(MXE_CC)' CXX='$(MXE_CXX) -std=gnu++11' RC='$(MXE_WINDRES)' -j '$(JOBS)' TARGET=gnuplot.exe gnuplot.exe
7f5714e37725 gnupplot: use -std=gnu++11 option when compiling gnuplot for mingw
John D
parents: 4345
diff changeset
38 make -C '$(1)/config/mingw' $($(PKG)_EXTRAFLAGS) CC='$(MXE_CC)' CXX='$(MXE_CXX) -std=gnu++11' RC='$(MXE_WINDRES)' -j '$(JOBS)' TARGET=wgnuplot.exe wgnuplot.exe
2891
848118c648ae Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
39
3293
cf6f40cededb Support file list generation in packages.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3281
diff changeset
40 $(INSTALL) -d '$(3)$(HOST_BINDIR)'
cf6f40cededb Support file list generation in packages.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3281
diff changeset
41 $(INSTALL) -m755 '$(1)/config/mingw/gnuplot.exe' '$(3)$(HOST_BINDIR)'
cf6f40cededb Support file list generation in packages.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3281
diff changeset
42 $(INSTALL) -m755 '$(1)/config/mingw/wgnuplot.exe' '$(3)$(HOST_BINDIR)'
cf6f40cededb Support file list generation in packages.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3281
diff changeset
43 $(INSTALL) -m644 '$(1)/src/win/wgnuplot.mnu' '$(3)$(HOST_BINDIR)'
2891
848118c648ae Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
44
3577
1ab2022ff6c7 gnuplot: In mingw, install required auxillary files
John Donoghue <john.donoghue@ieee.org>
parents: 3480
diff changeset
45 # config files
1ab2022ff6c7 gnuplot: In mingw, install required auxillary files
John Donoghue <john.donoghue@ieee.org>
parents: 3480
diff changeset
46 $(INSTALL) -d '$(3)$(HOST_PREFIX)/share'
1ab2022ff6c7 gnuplot: In mingw, install required auxillary files
John Donoghue <john.donoghue@ieee.org>
parents: 3480
diff changeset
47 $(INSTALL) -m644 '$(1)/share/gnuplotrc' '$(3)$(HOST_PREFIX)/share/'
1ab2022ff6c7 gnuplot: In mingw, install required auxillary files
John Donoghue <john.donoghue@ieee.org>
parents: 3480
diff changeset
48
1ab2022ff6c7 gnuplot: In mingw, install required auxillary files
John Donoghue <john.donoghue@ieee.org>
parents: 3480
diff changeset
49 for f in $(1)/share/*.gp; do \
1ab2022ff6c7 gnuplot: In mingw, install required auxillary files
John Donoghue <john.donoghue@ieee.org>
parents: 3480
diff changeset
50 $(INSTALL) -m644 "$$f" '$(3)$(HOST_PREFIX)/share/'; \
1ab2022ff6c7 gnuplot: In mingw, install required auxillary files
John Donoghue <john.donoghue@ieee.org>
parents: 3480
diff changeset
51 done
1ab2022ff6c7 gnuplot: In mingw, install required auxillary files
John Donoghue <john.donoghue@ieee.org>
parents: 3480
diff changeset
52
1ab2022ff6c7 gnuplot: In mingw, install required auxillary files
John Donoghue <john.donoghue@ieee.org>
parents: 3480
diff changeset
53 # terminal support
1ab2022ff6c7 gnuplot: In mingw, install required auxillary files
John Donoghue <john.donoghue@ieee.org>
parents: 3480
diff changeset
54 $(INSTALL) -d '$(3)$(HOST_PREFIX)/share/PostScript'
1ab2022ff6c7 gnuplot: In mingw, install required auxillary files
John Donoghue <john.donoghue@ieee.org>
parents: 3480
diff changeset
55 for f in $(1)/term/PostScript/*.ps; do \
1ab2022ff6c7 gnuplot: In mingw, install required auxillary files
John Donoghue <john.donoghue@ieee.org>
parents: 3480
diff changeset
56 $(INSTALL) -m644 "$$f" '$(3)$(HOST_PREFIX)/share/PostScript/'; \
1ab2022ff6c7 gnuplot: In mingw, install required auxillary files
John Donoghue <john.donoghue@ieee.org>
parents: 3480
diff changeset
57 done
1ab2022ff6c7 gnuplot: In mingw, install required auxillary files
John Donoghue <john.donoghue@ieee.org>
parents: 3480
diff changeset
58 for f in $(1)/term/PostScript/*.txt; do \
1ab2022ff6c7 gnuplot: In mingw, install required auxillary files
John Donoghue <john.donoghue@ieee.org>
parents: 3480
diff changeset
59 $(INSTALL) -m644 "$$f" '$(3)$(HOST_PREFIX)/share/PostScript/'; \
1ab2022ff6c7 gnuplot: In mingw, install required auxillary files
John Donoghue <john.donoghue@ieee.org>
parents: 3480
diff changeset
60 done
1ab2022ff6c7 gnuplot: In mingw, install required auxillary files
John Donoghue <john.donoghue@ieee.org>
parents: 3480
diff changeset
61
3293
cf6f40cededb Support file list generation in packages.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3281
diff changeset
62 ## MG: not sure what to do with these and how to integrate with DESTDIR
3012
100e618349f7 Improve handling of prefix directories by defining HOST_PREFIX and
John W. Eaton <jwe@octave.org>
parents: 2997
diff changeset
63 $(INSTALL) -d '$(TOP_DIR)/gnuplot/bin'
100e618349f7 Improve handling of prefix directories by defining HOST_PREFIX and
John W. Eaton <jwe@octave.org>
parents: 2997
diff changeset
64 $(INSTALL) -m755 '$(1)/config/mingw/gnuplot.exe' '$(TOP_DIR)/gnuplot/bin/'
100e618349f7 Improve handling of prefix directories by defining HOST_PREFIX and
John W. Eaton <jwe@octave.org>
parents: 2997
diff changeset
65 $(INSTALL) -m755 '$(1)/config/mingw/wgnuplot.exe' '$(TOP_DIR)/gnuplot/bin/'
3281
53c8b9c843c6 Update gnuplot to 4.6.4
John Donoghue <john.donoghue@ieee.org>
parents: 3221
diff changeset
66 $(INSTALL) -m644 '$(1)/src/win/wgnuplot.mnu' '$(TOP_DIR)/gnuplot/bin/'
2891
848118c648ae Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
67 endef
2997
4f9b72cf7ee7 allow native builds too
John W. Eaton <jwe@octave.org>
parents: 2990
diff changeset
68 else
3115
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3048
diff changeset
69 ifeq ($(MXE_SYSTEM),msvc)
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3048
diff changeset
70 define $(PKG)_BUILD
3293
cf6f40cededb Support file list generation in packages.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3281
diff changeset
71 $(INSTALL) -d '$(3)$(HOST_PREFIX)'
3115
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3048
diff changeset
72 cd '$(1)/config/msvc' && \
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3048
diff changeset
73 env -u MAKE -u MAKEFLAGS nmake DESTDIR=$(shell (cd '$(HOST_PREFIX)' && pwd -W) | sed -e 's#/#\\\\#g') && \
3293
cf6f40cededb Support file list generation in packages.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3281
diff changeset
74 env -u MAKE -u MAKEFLAGS nmake DESTDIR=$(shell (cd '$(3)$(HOST_PREFIX)' && pwd -W) | sed -e 's#/#\\\\#g') install
3115
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3048
diff changeset
75 endef
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3048
diff changeset
76 else
2997
4f9b72cf7ee7 allow native builds too
John W. Eaton <jwe@octave.org>
parents: 2990
diff changeset
77 define $(PKG)_BUILD
3221
c05da3e2f652 gnuplot.mk: find locally built libiconv for native builds
John W. Eaton <jwe@octave.org>
parents: 3115
diff changeset
78 cd '$(1)' && ./configure \
c05da3e2f652 gnuplot.mk: find locally built libiconv for native builds
John W. Eaton <jwe@octave.org>
parents: 3115
diff changeset
79 $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) LIBS=-liconv \
4149
aa31b3163501 workaround for gnuplot build on native build
Tatsuro Matsuoka <tmacchant@yahoo.co.jp>
parents: 3945
diff changeset
80 --without-lua --prefix='$(HOST_PREFIX)'
3293
cf6f40cededb Support file list generation in packages.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3281
diff changeset
81 make -C '$(1)' -j '$(JOBS)' install DESTDIR='$(3)'
2997
4f9b72cf7ee7 allow native builds too
John W. Eaton <jwe@octave.org>
parents: 2990
diff changeset
82 endef
4f9b72cf7ee7 allow native builds too
John W. Eaton <jwe@octave.org>
parents: 2990
diff changeset
83 endif
3115
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3048
diff changeset
84 endif