rpi/domo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

update buildroot to 2017.02.11

Browse Source
This commit is contained in:
jbnadal
2018-05-22 15:35:47 +02:00
parent 4bf1f5e091
commit a3c10bd762
9257 changed files with 433426 additions and 1701 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
bsp/buildroot-2017.02.11/package/gnuplot/0001-configure-add-without-demo-option.patch Normal file
View File

@@ -0,0 +1,67 @@
Add options to enable/disable docs and demos
Originally written by Anthony Viallard
<viallard@syscom-instruments.com>.
[Vincent: adapt patch to 5.0.5 version]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
diff -rup a/configure.in b/configure.in
--- a/configure.in 2016-09-07 05:14:29.000000000 +0100
+++ b/configure.in 2016-12-01 12:09:31.487464774 +0000
@@ -818,6 +818,16 @@ if test "$with_cwdrc" = yes; then
[ Define if you want to read .gnuplot from current directory (SECURITY RISK!).])
fi
+dnl Whether we want to build the doc files
+dnl Does nothing here, is passed on to the doc subdir
+AC_ARG_ENABLE(doc,dnl
+[ --disable-doc do not build doc files])
+
+dnl Whether we want to build the demo files
+dnl Does nothing here, is passed on to the demo subdir
+AC_ARG_ENABLE(demo,dnl
+[ --disable-demo do not build demo files])
+
dnl Sort help/subtopic tables by row or column
AC_ARG_WITH(row-help,dnl
[ --with-row-help format help and subtopic tables by row (default)
@@ -1303,6 +1313,24 @@ fi
dnl No configuration option for this one yet
AC_DEFINE(MAX_PARALLEL_AXES,7, [Maximum number of parallel axes supported])
+dnl build doc files
+if test "$enable_doc" != no; then
+ AC_CONFIG_SUBDIRS(docs)
+ DOCSUBDIR=docs
+else
+ DOCSUBDIR=
+fi
+AC_SUBST(DOCSUBDIR)
+
+dnl build demo files
+if test "$enable_demo" != no; then
+ AC_CONFIG_SUBDIRS(demo)
+ DEMOSUBDIR=demo
+else
+ DEMOSUBDIR=
+fi
+AC_SUBST(DEMOSUBDIR)
+
dnl Substitute variables
AC_SUBST(PACKAGE)
AC_SUBST(VERSION_MAJOR)
diff -rup a/Makefile.am b/Makefile.am
--- a/Makefile.am 2014-05-30 17:38:08.000000000 +0100
+++ b/Makefile.am 2016-12-01 12:09:31.488464794 +0000
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in -*-Makefile-*-
AUTOMAKE_OPTIONS = foreign
-SUBDIRS = config m4 term src docs $(LISPDIR) man demo tutorial share
+SUBDIRS = config m4 term src $(DOCSUBDIR) $(LISPDIR) man $(DEMOSUBDIR) tutorial share
EXTRA_DIST = BUGS CodeStyle Copyright FAQ.pdf GNUmakefile INSTALL INSTALL.gnu \
Makefile.maint PATCHLEVEL PGPKEYS PORTING README RELEASE_NOTES \

27
bsp/buildroot-2017.02.11/package/gnuplot/0002-use-gdlib-config-properly.patch Normal file
View File

@@ -0,0 +1,27 @@
Fix usage of gdlib-config
gnuplot configure.in script properly takes care of finding
gdlib-config using AC_PATH_PROG... but then directly uses gdlib-config
instead of going through the GDLIB_CONFIG variable that AC_PATH_PROG
has defined. Which means that whenever a gdlib-config binary not in
the PATH is being used, it does not use it.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Index: b/configure.in
===================================================================
--- a/configure.in
+++ b/configure.in
@@ -537,9 +537,9 @@
if test "$with_gd" != no; then
AC_PATH_PROG([GDLIB_CONFIG], [gdlib-config])
if test -n "$GDLIB_CONFIG"; then
- libgd_CPPFLAGS=`gdlib-config --cflags`
- libgd_LDFLAGS=`gdlib-config --ldflags`
- libgd_LIBS=`gdlib-config --libs`
+ libgd_CPPFLAGS=`$GDLIB_CONFIG --cflags`
+ libgd_LDFLAGS=`$GDLIB_CONFIG --ldflags`
+ libgd_LIBS=`$GDLIB_CONFIG --libs`
elif test -d "$with_gd"; then
libgd_CPPFLAGS="-I$with_gd/include"
libgd_LDFLAGS="-L$with_gd/lib"

6
bsp/buildroot-2017.02.11/package/gnuplot/Config.in Normal file
View File

@@ -0,0 +1,6 @@
config BR2_PACKAGE_GNUPLOT
bool "gnuplot"
help
A portable command-line driven graphing utility.
http://www.gnuplot.info/

3
bsp/buildroot-2017.02.11/package/gnuplot/gnuplot.hash Normal file
View File

@@ -0,0 +1,3 @@
# From https://sourceforge.net/projects/gnuplot/files/gnuplot/5.0.5/
md5 c5e96fca73afbee4f57cbc1bfce6b3b8 gnuplot-5.0.5.tar.gz
sha1 c35f55657fdc33217dd70bbf3148578563ecaad1 gnuplot-5.0.5.tar.gz

55
bsp/buildroot-2017.02.11/package/gnuplot/gnuplot.mk Normal file
View File

@@ -0,0 +1,55 @@
################################################################################
#
# gnuplot
#
################################################################################
GNUPLOT_VERSION = 5.0.5
GNUPLOT_SITE = http://downloads.sourceforge.net/project/gnuplot/gnuplot/$(GNUPLOT_VERSION)
GNUPLOT_LICENSE = gnuplot license (open source)
GNUPLOT_LICENSE_FILES = Copyright
GNUPLOT_AUTORECONF = YES
GNUPLOT_CONF_OPTS = \
--without-x \
--disable-raise-console \
--disable-mouse \
--without-tutorial \
--disable-demo \
--without-row-help \
--disable-history-file \
--disable-wxwidgets \
--without-lua \
--without-latex \
--without-cairo
# relocation truncated to fit: R_68K_GOT16O
ifeq ($(BR2_m68k_cf),y)
GNUPLOT_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -mxgot"
endif
ifeq ($(BR2_PACKAGE_GD)$(BR2_PACKAGE_LIBPNG),yy)
GNUPLOT_CONF_OPTS += --with-gd
GNUPLOT_DEPENDENCIES += gd
GNUPLOT_CONF_ENV += \
ac_cv_path_GDLIB_CONFIG=$(STAGING_DIR)/usr/bin/gdlib-config
else
GNUPLOT_CONF_OPTS += --without-gd
endif
ifeq ($(BR2_PACKAGE_READLINE),y)
GNUPLOT_CONF_OPTS += --with-readline=gnu
GNUPLOT_DEPENDENCIES += readline
else
GNUPLOT_CONF_OPTS += --without-readline
endif
# Remove Javascript scripts, lua scripts, PostScript files
define GNUPLOT_REMOVE_UNNEEDED_FILES
$(RM) -rf $(TARGET_DIR)/usr/share/gnuplot
endef
GNUPLOT_POST_INSTALL_TARGET_HOOKS += GNUPLOT_REMOVE_UNNEEDED_FILES
$(eval $(autotools-package))