diff options
| author | Tim Orling <TicoTimo@gmail.com> | 2014-03-30 17:44:17 -0700 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2014-04-21 13:31:47 +0200 |
| commit | 8b29bc67af47e3f6ca272731e5ccf1ff1c59b14c (patch) | |
| tree | 0a97a56f5396ef679dccdfbbe09426c62ef37a34 /meta-oe/recipes-extended/gnuplot/gnuplot-4.6.5 | |
| parent | 72b21ffad37e520da3e10fe91bf3246774da0e46 (diff) | |
| download | meta-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.6.5')
| -rw-r--r-- | meta-oe/recipes-extended/gnuplot/gnuplot-4.6.5/lua-loadlibs-configure-in-fix.patch | 16 | ||||
| -rw-r--r-- | meta-oe/recipes-extended/gnuplot/gnuplot-4.6.5/subdirs.patch | 11 |
2 files changed, 27 insertions, 0 deletions
diff --git a/meta-oe/recipes-extended/gnuplot/gnuplot-4.6.5/lua-loadlibs-configure-in-fix.patch b/meta-oe/recipes-extended/gnuplot/gnuplot-4.6.5/lua-loadlibs-configure-in-fix.patch new file mode 100644 index 0000000000..23f2cd26a5 --- /dev/null +++ b/meta-oe/recipes-extended/gnuplot/gnuplot-4.6.5/lua-loadlibs-configure-in-fix.patch | |||
| @@ -0,0 +1,16 @@ | |||
| 1 | Index: gnuplot-4.6.5/configure.in | ||
| 2 | =================================================================== | ||
| 3 | --- gnuplot-4.6.5.orig/configure.in | ||
| 4 | +++ gnuplot-4.6.5/configure.in | ||
| 5 | @@ -690,6 +690,11 @@ if test "${with_lua}" = yes ; then | ||
| 6 | fi | ||
| 7 | |||
| 8 | if test "$with_lua" != no; then | ||
| 9 | + dnl check for dlopen/dl to fix loadlibs link failure | ||
| 10 | + AC_CHECK_FUNC([dlopen], [], | ||
| 11 | + AC_CHECK_LIB([dl], [dlopen], DLOPEN_LIBS="-ldl")) | ||
| 12 | + AC_SUBST(DLOPEN_LIBS) | ||
| 13 | + LUA_LIBS="$LUA_LIBS $DLOPEN_LIBS" | ||
| 14 | TERMLIBS="$TERMLIBS $LUA_LIBS" | ||
| 15 | CPPFLAGS="$CPPFLAGS $LUA_CFLAGS" | ||
| 16 | else | ||
diff --git a/meta-oe/recipes-extended/gnuplot/gnuplot-4.6.5/subdirs.patch b/meta-oe/recipes-extended/gnuplot/gnuplot-4.6.5/subdirs.patch new file mode 100644 index 0000000000..8c7d1f0d35 --- /dev/null +++ b/meta-oe/recipes-extended/gnuplot/gnuplot-4.6.5/subdirs.patch | |||
| @@ -0,0 +1,11 @@ | |||
| 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 \ | ||
