annotate src/gnuplot-3-iconv.patch @ 3929:6cb1bf4d1ab4

osmesa: update path to package * src/osmesa.mk: update package urk
author John Donoghue
date Tue, 05 May 2015 15:08:30 -0400
parents ceeb3ec75690
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
3668
ceeb3ec75690 gnuplot: provide way to specify where iconv is
John Donoghue
parents:
diff changeset
1 diff -ur gnuplot-4.6.4.orig/config/mingw/Makefile gnuplot-4.6.4/config/mingw/Makefile
ceeb3ec75690 gnuplot: provide way to specify where iconv is
John Donoghue
parents:
diff changeset
2 --- gnuplot-4.6.4.orig/config/mingw/Makefile 2014-07-24 20:30:33 -0400
ceeb3ec75690 gnuplot: provide way to specify where iconv is
John Donoghue
parents:
diff changeset
3 +++ gnuplot-4.6.4/config/mingw/Makefile 2014-07-24 20:30:50 -0400
ceeb3ec75690 gnuplot: provide way to specify where iconv is
John Donoghue
parents:
diff changeset
4 @@ -382,8 +382,9 @@
ceeb3ec75690 gnuplot: provide way to specify where iconv is
John Donoghue
parents:
diff changeset
5 endif
ceeb3ec75690 gnuplot: provide way to specify where iconv is
John Donoghue
parents:
diff changeset
6
ceeb3ec75690 gnuplot: provide way to specify where iconv is
John Donoghue
parents:
diff changeset
7 ifdef ICONV
ceeb3ec75690 gnuplot: provide way to specify where iconv is
John Donoghue
parents:
diff changeset
8 - CFLAGS += -DHAVE_ICONV
ceeb3ec75690 gnuplot: provide way to specify where iconv is
John Donoghue
parents:
diff changeset
9 - TERMLIBS += -liconv
ceeb3ec75690 gnuplot: provide way to specify where iconv is
John Donoghue
parents:
diff changeset
10 + CFLAGS += -DHAVE_ICONV $(ICONV_CFLAGS)
ceeb3ec75690 gnuplot: provide way to specify where iconv is
John Donoghue
parents:
diff changeset
11 + LDFLAGS += $(ICONV_LDFLAGS)
ceeb3ec75690 gnuplot: provide way to specify where iconv is
John Donoghue
parents:
diff changeset
12 + TERMLIBS += -liconv
ceeb3ec75690 gnuplot: provide way to specify where iconv is
John Donoghue
parents:
diff changeset
13 endif
ceeb3ec75690 gnuplot: provide way to specify where iconv is
John Donoghue
parents:
diff changeset
14
ceeb3ec75690 gnuplot: provide way to specify where iconv is
John Donoghue
parents:
diff changeset
15 ifdef GNU_RC