create rootf's & SDK from 2018.02.9 buildroot (#10)

---------

Co-authored-by: tiopex <tiopxyz@gmail.com>
Co-authored-by: tiopex <67048640+tiopex@users.noreply.github.com>
This commit is contained in:
Apaczer
2023-03-11 21:06:02 +01:00
committed by GitHub
parent 534f7aea40
commit dcf31c6a1e
12528 changed files with 149032 additions and 303063 deletions
@@ -3,16 +3,15 @@ Add options to enable/disable docs and demos
Originally written by Anthony Viallard
<viallard@syscom-instruments.com>.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
[Vincent: adapt patch to 5.0.5 version]
Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
[Michael: adapt patch to 5.4.0 version]
Signed-off-by: Michael Fischer <mf@go-sys.de>
diff -Naur a/configure.ac b/configure.ac
--- a/configure.ac 2020-07-12 02:29:47.000000000 +0200
+++ b/configure.ac 2020-08-06 14:21:17.918756893 +0200
@@ -713,6 +713,17 @@
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
@@ -25,14 +24,13 @@ diff -Naur a/configure.ac b/configure.ac
+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)
@@ -1095,6 +1106,24 @@
AC_DEFINE_UNQUOTED([DIST_CONTACT],["$DIST_CONTACT"],[Contact address for modified and binary distributed gnuplot versions])
fi
@@ -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
@@ -55,15 +53,15 @@ diff -Naur a/configure.ac b/configure.ac
dnl Substitute variables
AC_SUBST(PACKAGE)
AC_SUBST(VERSION_MAJOR)
diff -Naur a/Makefile.am b/Makefile.am
--- a/Makefile.am 2020-03-31 19:28:16.000000000 +0200
+++ b/Makefile.am 2020-08-06 14:34:12.995097799 +0200
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 man demo share
+SUBDIRS = config m4 term src $(DOCSUBDIR) man $(DEMOSUBDIR) share
-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 Copyright FAQ.pdf INSTALL INSTALL.gnu \
PATCHLEVEL PGPKEYS README RELEASE_NOTES \
EXTRA_DIST = BUGS CodeStyle Copyright FAQ.pdf GNUmakefile INSTALL INSTALL.gnu \
Makefile.maint PATCHLEVEL PGPKEYS PORTING README RELEASE_NOTES \
@@ -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"
+4 -5
View File
@@ -1,6 +1,5 @@
# From https://sourceforge.net/projects/gnuplot/files/gnuplot/5.4.2/
md5 9bb03cfa77e38924e08ffbb9eb59d8b1 gnuplot-5.4.3.tar.gz
sha1 c4b60fd7a700b22fa62b14829cbb0e17911627c9 gnuplot-5.4.3.tar.gz
# From https://sourceforge.net/projects/gnuplot/files/gnuplot/5.0.6/
md5 8ec46520a86a61163a701b00404faf1a gnuplot-5.0.6.tar.gz
sha1 f7b8948166b22e5bd658d5cf7579716f4821dba0 gnuplot-5.0.6.tar.gz
# Locally computed
sha256 51f89bbab90f96d3543f95235368d188eb1e26eda296912256abcd3535bd4d84 gnuplot-5.4.3.tar.gz
sha256 895928ec0735cca1c8cec42656c7e314a065d0242813bb8693c0c1bf61fd4e4d Copyright
sha256 5bbe4713e555c2e103b7d4ffd45fca69551fff09cf5c3f9cb17428aaacc9b460 gnuplot-5.0.6.tar.gz
+4 -3
View File
@@ -4,11 +4,10 @@
#
################################################################################
GNUPLOT_VERSION = 5.4.3
GNUPLOT_VERSION = 5.0.6
GNUPLOT_SITE = http://downloads.sourceforge.net/project/gnuplot/gnuplot/$(GNUPLOT_VERSION)
GNUPLOT_LICENSE = gnuplot license (open source)
GNUPLOT_LICENSE_FILES = Copyright
GNUPLOT_CPE_ID_VENDOR = gnuplot_project
GNUPLOT_AUTORECONF = YES
@@ -32,7 +31,9 @@ endif
ifeq ($(BR2_PACKAGE_GD)$(BR2_PACKAGE_LIBPNG),yy)
GNUPLOT_CONF_OPTS += --with-gd
GNUPLOT_DEPENDENCIES += host-pkgconf 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