Mercurial > mxe-octave
view src/gnuplot-3-iconv.patch @ 3853:58935b4de51f
Enable build cross mkoctfile and compile of-XXXX package files
* Makefile.in
Add ENABLE_BINARY_PACKAGES, MXE_MKOCTFILE variable.
Add OCTAVE_FORGE_PKG_COMPILE, OCTAVE_FORGE_PKG_BUILD_NOCOMPILE macros
* configure.ac: add --enable-binary-packages option
* src/default-octave.mk:
if mingw, enable cross compile of mkoctfile, install the cross built mkoctfile to usr/bin
* src/of-communications.mk:
use OCTAVE_FORGE_PKG_BUILD_NOCOMPILE rule
* src/of-control.mk:
use OCTAVE_FORGE_PKG_BUILD_NOCOMPILE rule
* src/of-dicom.mk:
use OCTAVE_FORGE_PKG_BUILD_NOCOMPILE rule
* src/of-fits.mk:
use OCTAVE_FORGE_PKG_BUILD_NOCOMPILE rule
* src/of-fl-core.mk:
use OCTAVE_FORGE_PKG_BUILD_NOCOMPILE rule
* src/of-image.mk:
use OCTAVE_FORGE_PKG_BUILD_NOCOMPILE rule
* src/of-linear-algebra.mk:
use OCTAVE_FORGE_PKG_BUILD_NOCOMPILE rule
* src/of-ltfat.mk:
use OCTAVE_FORGE_PKG_BUILD_NOCOMPILE rule
* src/of-linear-algebra.mk:
use OCTAVE_FORGE_PKG_BUILD_NOCOMPILE rule
* src/of-miscellaneous.mk:
use OCTAVE_FORGE_PKG_BUILD with UNITS_AVAILABLE=yes arg
* src/of-netcdf.mk:
use OCTAVE_FORGE_PKG_BUILD_NOCOMPILE rule
* src/of-odepkg.mk:
use OCTAVE_FORGE_PKG_BUILD_NOCOMPILE rule
* src/of-sockets.mk:
use OCTAVE_FORGE_PKG_BUILD_NOCOMPILE rule
* src/of-windows.mk:
use OCTAVE_FORGE_PKG_BUILD_NOCOMPILE rule
author | John Donoghue |
---|---|
date | Thu, 19 Mar 2015 14:03:28 -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