summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-extended/gnuplot/gnuplot-4.4.4
diff options
context:
space:
mode:
authorTim Orling <TicoTimo@gmail.com>2014-03-30 17:44:17 -0700
committerMartin Jansa <Martin.Jansa@gmail.com>2014-04-21 13:31:47 +0200
commit8b29bc67af47e3f6ca272731e5ccf1ff1c59b14c (patch)
tree0a97a56f5396ef679dccdfbbe09426c62ef37a34 /meta-oe/recipes-extended/gnuplot/gnuplot-4.4.4
parent72b21ffad37e520da3e10fe91bf3246774da0e46 (diff)
downloadmeta-openembedded-8b29bc67af47e3f6ca272731e5ccf1ff1c59b14c.tar.gz
gnuplot: upgrade to 4.6.5
* automake patch from 4.4.4 is no longer needed * PACKAGECONFIG for lua (lua term is only useful for LaTeX) * linking problems with dlopen, etc. in lua loadlibs.c fixed ** this same problem was seen in jansa world builds for 4.4.4 ** I am not able to replicate that error on 4.4.4 NOTE: qt is supported by this version, but I was not able to figure out the configuration... Signed-off-by: Tim Orling <TicoTimo@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-extended/gnuplot/gnuplot-4.4.4')
-rw-r--r--meta-oe/recipes-extended/gnuplot/gnuplot-4.4.4/automake-1.12.x.patch44
-rw-r--r--meta-oe/recipes-extended/gnuplot/gnuplot-4.4.4/subdirs.patch11
2 files changed, 0 insertions, 55 deletions
diff --git a/meta-oe/recipes-extended/gnuplot/gnuplot-4.4.4/automake-1.12.x.patch b/meta-oe/recipes-extended/gnuplot/gnuplot-4.4.4/automake-1.12.x.patch
deleted file mode 100644
index 51f703ce28..0000000000
--- a/meta-oe/recipes-extended/gnuplot/gnuplot-4.4.4/automake-1.12.x.patch
+++ /dev/null
@@ -1,44 +0,0 @@
1Upstream-Status: Backport
2
3It's fixed in 4.6 and 4.7(HEAD)
4
5http://sourceforge.net/tracker/?func=detail&aid=3523591&group_id=2055&atid=102055
6
7diff -uNr gnuplot-4.4.4.orig/Makefile.am gnuplot-4.4.4/Makefile.am
8--- gnuplot-4.4.4.orig/Makefile.am 2012-07-20 10:54:49.075828905 +0200
9+++ gnuplot-4.4.4/Makefile.am 2012-07-20 10:55:22.380831313 +0200
10@@ -1,5 +1,5 @@
11 ## Process this file with automake to produce Makefile.in -*-Makefile-*-
12-AUTOMAKE_OPTIONS = foreign 1.2h
13+AUTOMAKE_OPTIONS = foreign
14
15 SUBDIRS = config m4 term src $(LISPDIR) man share
16
17diff -uNr gnuplot-4.4.4.orig/configure.in gnuplot-4.4.4/configure.in
18--- gnuplot-4.4.4.orig/configure.in 2011-09-02 06:09:40.000000000 +0200
19+++ gnuplot-4.4.4/configure.in 2012-07-20 10:55:53.289833224 +0200
20@@ -16,10 +16,11 @@
21 dnl configure.in body
22
23 dnl Compiler characteristics
24-dnl Check for ANSI C prototypes, the const and inline keywords,
25-dnl and ANSI style stringification
26+dnl Check for the const and inline keywords and ANSI style stringification
27+dnl automake 1.12 dropped support for AM_C_PROTOTYPES and ansi2knr
28+dnl But our code still tests for #ifdef PROTOTYPES, so define it here
29+AC_DEFINE(PROTOTYPES,1,[Automake 1.12 dropped support for building without prototypes])
30 AC_PROG_CC
31-AM_C_PROTOTYPES
32 AC_PROG_CPP
33 AC_C_CONST
34 AC_C_INLINE
35diff -uNr gnuplot-4.4.4.orig/src/Makefile.am gnuplot-4.4.4/src/Makefile.am
36--- gnuplot-4.4.4.orig/src/Makefile.am 2010-10-06 06:53:16.000000000 +0200
37+++ gnuplot-4.4.4/src/Makefile.am 2012-07-20 10:56:02.376834548 +0200
38@@ -1,5 +1,5 @@
39 ## Process this file with automake to produce Makefile.in -*-Makefile-*-
40-AUTOMAKE_OPTIONS = ansi2knr foreign 1.2h
41+AUTOMAKE_OPTIONS = foreign
42
43 # in the spirit of automake ...
44 pkglibexecdir = $(libexecdir)/@PACKAGE@/@VERSION_MAJOR@
diff --git a/meta-oe/recipes-extended/gnuplot/gnuplot-4.4.4/subdirs.patch b/meta-oe/recipes-extended/gnuplot/gnuplot-4.4.4/subdirs.patch
deleted file mode 100644
index 8c7d1f0d35..0000000000
--- a/meta-oe/recipes-extended/gnuplot/gnuplot-4.4.4/subdirs.patch
+++ /dev/null
@@ -1,11 +0,0 @@
1--- /tmp/Makefile.am 2007-08-23 13:10:15.560659023 +0200
2+++ gnuplot-4.2.0/Makefile.am 2007-08-23 13:10:34.961764629 +0200
3@@ -1,7 +1,7 @@
4 ## Process this file with automake to produce Makefile.in -*-Makefile-*-
5 AUTOMAKE_OPTIONS = foreign 1.2h
6
7-SUBDIRS = config m4 term src docs $(LISPDIR) man demo tutorial share
8+SUBDIRS = config m4 term src $(LISPDIR) man share
9
10 EXTRA_DIST = BUGS CodeStyle Copyright FAQ GNUmakefile INSTALL INSTALL.gnu \
11 Makefile.maint PATCHLEVEL PGPKEYS PORTING README README.1ST README.exp \