update buildroot to 2017.02.11
This commit is contained in:
jbnadal
@@ -0,0 +1,89 @@
|
||||
Change handling of PKG_CONFIG_LIBDIR
|
||||
|
||||
When PKG_CONFIG_LIBDIR was unset in the environment, the configure
|
||||
script was deducing the PKG_CONFIG_LIBDIR from the location of the
|
||||
pkg-config binary, which doesn't make a lot of sense, and isn't done
|
||||
by other autotools based packages.
|
||||
|
||||
Also, the configure script was checking that the directory really
|
||||
exists. This forced to create the directory *and* provide an absolute
|
||||
path in PKG_CONFIG_LIBDIR, which didn't play well with the fact that
|
||||
at installation time, PKG_CONFIG_LIBDIR is suffixed to DESTDIR, which
|
||||
means that we got two times the staging directory location.
|
||||
|
||||
This patch fixes both of those issues. Also, since ncurses uses a fork
|
||||
of autoconf 2.13, we can't simply use _AUTORECONF=YES, so we also fix
|
||||
the configure script in this patch.
|
||||
|
||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
|
||||
Index: b/configure
|
||||
===================================================================
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -3623,27 +3623,20 @@
|
||||
|
||||
# Leave this as something that can be overridden in the environment.
|
||||
if test -z "$PKG_CONFIG_LIBDIR" ; then
|
||||
- PKG_CONFIG_LIBDIR=`echo "$PKG_CONFIG" | sed -e 's,/[^/]*/[^/]*$,,'`/lib/pkgconfig
|
||||
+ PKG_CONFIG_LIBDIR="/usr/lib/pkgconfig"
|
||||
fi
|
||||
+
|
||||
PKG_CONFIG_LIBDIR=`echo "$PKG_CONFIG_LIBDIR" | sed -e 's/^://' -e 's/:.*//'`
|
||||
- if test -n "$PKG_CONFIG_LIBDIR" && test -d "$PKG_CONFIG_LIBDIR" ; then
|
||||
|
||||
-# Check whether --enable-pc-files or --disable-pc-files was given.
|
||||
-if test "${enable_pc_files+set}" = set; then
|
||||
- enableval="$enable_pc_files"
|
||||
- enable_pc_files=$enableval
|
||||
-else
|
||||
- enable_pc_files=no
|
||||
-fi;
|
||||
- echo "$as_me:3638: result: $enable_pc_files" >&5
|
||||
-echo "${ECHO_T}$enable_pc_files" >&6
|
||||
+ # Check whether --enable-pc-files or --disable-pc-files was given.
|
||||
+ if test "${enable_pc_files+set}" = set; then
|
||||
+ enableval="$enable_pc_files"
|
||||
+ enable_pc_files=$enableval
|
||||
else
|
||||
- echo "$as_me:3641: result: no" >&5
|
||||
-echo "${ECHO_T}no" >&6
|
||||
- { echo "$as_me:3643: WARNING: did not find library $PKG_CONFIG_LIBDIR" >&5
|
||||
-echo "$as_me: WARNING: did not find library $PKG_CONFIG_LIBDIR" >&2;}
|
||||
- enable_pc_files=no
|
||||
- fi
|
||||
+ enable_pc_files=no
|
||||
+ fi;
|
||||
+ echo "$as_me:3638: result: $enable_pc_files" >&5
|
||||
+ echo "${ECHO_T}$enable_pc_files" >&6
|
||||
fi
|
||||
|
||||
echo "$as_me:3649: checking if we should assume mixed-case filenames" >&5
|
||||
Index: b/configure.in
|
||||
===================================================================
|
||||
--- a/configure.in
|
||||
+++ b/configure.in
|
||||
@@ -174,20 +174,14 @@
|
||||
|
||||
# Leave this as something that can be overridden in the environment.
|
||||
if test -z "$PKG_CONFIG_LIBDIR" ; then
|
||||
- PKG_CONFIG_LIBDIR=`echo "$PKG_CONFIG" | sed -e 's,/[[^/]]*/[[^/]]*$,,'`/lib/pkgconfig
|
||||
+ PKG_CONFIG_LIBDIR="/usr/lib/pkgconfig"
|
||||
fi
|
||||
PKG_CONFIG_LIBDIR=`echo "$PKG_CONFIG_LIBDIR" | sed -e 's/^://' -e 's/:.*//'`
|
||||
- if test -n "$PKG_CONFIG_LIBDIR" && test -d "$PKG_CONFIG_LIBDIR" ; then
|
||||
- AC_ARG_ENABLE(pc-files,
|
||||
+ AC_ARG_ENABLE(pc-files,
|
||||
[ --enable-pc-files generate and install .pc files for pkg-config],
|
||||
[enable_pc_files=$enableval],
|
||||
[enable_pc_files=no])
|
||||
- AC_MSG_RESULT($enable_pc_files)
|
||||
- else
|
||||
- AC_MSG_RESULT(no)
|
||||
- AC_MSG_WARN(did not find library $PKG_CONFIG_LIBDIR)
|
||||
- enable_pc_files=no
|
||||
- fi
|
||||
+ AC_MSG_RESULT($enable_pc_files)
|
||||
fi
|
||||
AC_SUBST(PKG_CONFIG_LIBDIR)
|
||||
|
||||
@@ -0,0 +1,43 @@
|
||||
Fix gcc 5.x build failure
|
||||
|
||||
Extracted from upstream commit
|
||||
http://ncurses.scripts.mit.edu/?p=ncurses.git;a=commit;h=97bb4678dc03e753290b39bbff30ba2825df9517.
|
||||
|
||||
+ modify MKlib_gen.sh to work around change in development version of
|
||||
gcc introduced here:
|
||||
https://gcc.gnu.org/ml/gcc-patches/2014-06/msg02185.html
|
||||
https://gcc.gnu.org/ml/gcc-patches/2014-07/msg00236.html
|
||||
(reports by Marcus Shawcroft, Maohui Lei).
|
||||
|
||||
Original author: Thomas E. Dickey <dickey@invisible-island.net>
|
||||
Signed-off-by: Mikhail Peselnik <bas@bmail.ru>
|
||||
|
||||
--- a/ncurses/base/MKlib_gen.sh.orig 2015-07-23 21:52:32.239481505 +0300
|
||||
+++ b/ncurses/base/MKlib_gen.sh 2015-07-23 21:53:20.772966587 +0300
|
||||
@@ -437,11 +437,22 @@
|
||||
-e 's/gen_$//' \
|
||||
-e 's/ / /g' >>$TMP
|
||||
|
||||
+cat >$ED1 <<EOF
|
||||
+s/ / /g
|
||||
+s/^ //
|
||||
+s/ $//
|
||||
+s/P_NCURSES_BOOL/NCURSES_BOOL/g
|
||||
+EOF
|
||||
+
|
||||
+# A patch discussed here:
|
||||
+# https://gcc.gnu.org/ml/gcc-patches/2014-06/msg02185.html
|
||||
+# introduces spurious #line markers. Work around that by ignoring the system's
|
||||
+# attempt to define "bool" and using our own symbol here.
|
||||
+sed -e 's/bool/P_NCURSES_BOOL/g' $TMP > $ED2
|
||||
+cat $ED2 >$TMP
|
||||
+
|
||||
$preprocessor $TMP 2>/dev/null \
|
||||
-| sed \
|
||||
- -e 's/ / /g' \
|
||||
- -e 's/^ //' \
|
||||
- -e 's/_Bool/NCURSES_BOOL/g' \
|
||||
+| sed -f $ED1 \
|
||||
| $AWK -f $AW2 \
|
||||
| sed -f $ED3 \
|
||||
| sed \
|
||||
@@ -0,0 +1,30 @@
|
||||
aclocal: fix detection for uclinux hosts
|
||||
|
||||
uclinux is just a linux like the others...
|
||||
|
||||
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
|
||||
|
||||
diff -durN ncurses-5.9.orig/aclocal.m4 ncurses-5.9/aclocal.m4
|
||||
--- ncurses-5.9.orig/aclocal.m4 2011-04-01 01:35:38.000000000 +0200
|
||||
+++ ncurses-5.9/aclocal.m4 2016-08-21 15:24:47.003620029 +0200
|
||||
@@ -6531,7 +6531,7 @@
|
||||
irix[[56]].*) #(vi
|
||||
cf_xopen_source="-D_SGI_SOURCE"
|
||||
;;
|
||||
-linux*|gnu*|mint*|k*bsd*-gnu) #(vi
|
||||
+linux*|uclinux*|gnu*|mint*|k*bsd*-gnu) #(vi
|
||||
CF_GNU_SOURCE
|
||||
;;
|
||||
mirbsd*) #(vi
|
||||
diff -durN ncurses-5.9.orig/configure ncurses-5.9/configure
|
||||
--- ncurses-5.9.orig/configure 2016-08-21 15:21:50.789285661 +0200
|
||||
+++ ncurses-5.9/configure 2016-08-21 15:24:35.187463625 +0200
|
||||
@@ -6984,7 +6984,7 @@
|
||||
irix[56].*) #(vi
|
||||
cf_xopen_source="-D_SGI_SOURCE"
|
||||
;;
|
||||
-linux*|gnu*|mint*|k*bsd*-gnu) #(vi
|
||||
+linux*|uclinux*|gnu*|mint*|k*bsd*-gnu) #(vi
|
||||
|
||||
echo "$as_me:6996: checking if we must define _GNU_SOURCE" >&5
|
||||
echo $ECHO_N "checking if we must define _GNU_SOURCE... $ECHO_C" >&6
|
||||
26
bsp/buildroot-2017.02.11/package/ncurses/Config.in
Normal file
26
bsp/buildroot-2017.02.11/package/ncurses/Config.in
Normal file
@@ -0,0 +1,26 @@
|
||||
config BR2_PACKAGE_NCURSES
|
||||
bool "ncurses"
|
||||
help
|
||||
The Ncurses (new curses) library is a free software emulation of
|
||||
curses in System V Release 4.0, and more.
|
||||
|
||||
This package installs only a few vital termcap entries
|
||||
|
||||
http://www.gnu.org/software/ncurses/
|
||||
|
||||
if BR2_PACKAGE_NCURSES
|
||||
|
||||
config BR2_PACKAGE_NCURSES_WCHAR
|
||||
bool "enable wide char support"
|
||||
depends on BR2_USE_WCHAR
|
||||
# Build broken @ curses.priv.h with bad declarations
|
||||
depends on !(BR2_bfin && BR2_BINFMT_FLAT)
|
||||
help
|
||||
Enable wide char & UTF-8 support in ncurses libraries
|
||||
|
||||
config BR2_PACKAGE_NCURSES_TARGET_PROGS
|
||||
bool "ncurses programs"
|
||||
help
|
||||
Include ncurses programs in target (clear, reset, tput, ...)
|
||||
|
||||
endif
|
||||
2
bsp/buildroot-2017.02.11/package/ncurses/ncurses.hash
Normal file
2
bsp/buildroot-2017.02.11/package/ncurses/ncurses.hash
Normal file
@@ -0,0 +1,2 @@
|
||||
# Locally calculated after checking pgp signature
|
||||
sha256 9046298fb440324c9d4135ecea7879ffed8546dd1b58e59430ea07a4633f563b ncurses-5.9.tar.gz
|
||||
160
bsp/buildroot-2017.02.11/package/ncurses/ncurses.mk
Normal file
160
bsp/buildroot-2017.02.11/package/ncurses/ncurses.mk
Normal file
@@ -0,0 +1,160 @@
|
||||
################################################################################
|
||||
#
|
||||
# ncurses
|
||||
#
|
||||
################################################################################
|
||||
|
||||
NCURSES_VERSION = 5.9
|
||||
NCURSES_SITE = $(BR2_GNU_MIRROR)/ncurses
|
||||
NCURSES_INSTALL_STAGING = YES
|
||||
NCURSES_DEPENDENCIES = host-ncurses
|
||||
NCURSES_LICENSE = MIT with advertising clause
|
||||
NCURSES_LICENSE_FILES = README
|
||||
NCURSES_CONFIG_SCRIPTS = ncurses$(NCURSES_LIB_SUFFIX)$(NCURSES_ABI_VERSION)-config
|
||||
|
||||
NCURSES_CONF_OPTS = \
|
||||
--without-cxx \
|
||||
--without-cxx-binding \
|
||||
--without-ada \
|
||||
--without-tests \
|
||||
--disable-big-core \
|
||||
--without-profile \
|
||||
--disable-rpath \
|
||||
--disable-rpath-hack \
|
||||
--enable-echo \
|
||||
--enable-const \
|
||||
--enable-overwrite \
|
||||
--enable-pc-files \
|
||||
$(if $(BR2_PACKAGE_NCURSES_TARGET_PROGS),,--without-progs) \
|
||||
--without-manpages
|
||||
|
||||
ifeq ($(BR2_STATIC_LIBS),y)
|
||||
NCURSES_CONF_OPTS += --without-shared --with-normal
|
||||
else ifeq ($(BR2_SHARED_LIBS),y)
|
||||
NCURSES_CONF_OPTS += --with-shared --without-normal
|
||||
else ifeq ($(BR2_SHARED_STATIC_LIBS),y)
|
||||
NCURSES_CONF_OPTS += --with-shared --with-normal
|
||||
endif
|
||||
|
||||
# configure can't find the soname for libgpm when cross compiling
|
||||
ifeq ($(BR2_PACKAGE_GPM),y)
|
||||
NCURSES_CONF_OPTS += --with-gpm=libgpm.so.2
|
||||
NCURSES_DEPENDENCIES += gpm
|
||||
else
|
||||
NCURSES_CONF_OPTS += --without-gpm
|
||||
endif
|
||||
|
||||
NCURSES_TERMINFO_FILES = \
|
||||
a/ansi \
|
||||
d/dumb \
|
||||
l/linux \
|
||||
p/putty \
|
||||
p/putty-vt100 \
|
||||
s/screen \
|
||||
s/screen-256color \
|
||||
v/vt100 \
|
||||
v/vt100-putty \
|
||||
v/vt102 \
|
||||
v/vt200 \
|
||||
v/vt220 \
|
||||
x/xterm \
|
||||
x/xterm-color \
|
||||
x/xterm-xfree86 \
|
||||
|
||||
ifeq ($(BR2_PACKAGE_NCURSES_WCHAR),y)
|
||||
NCURSES_CONF_OPTS += --enable-widec
|
||||
NCURSES_LIB_SUFFIX = w
|
||||
NCURSES_LIBS = ncurses menu panel form
|
||||
|
||||
define NCURSES_LINK_LIBS_STATIC
|
||||
$(foreach lib,$(NCURSES_LIBS:%=lib%), \
|
||||
ln -sf $(lib)$(NCURSES_LIB_SUFFIX).a $(STAGING_DIR)/usr/lib/$(lib).a
|
||||
)
|
||||
ln -sf libncurses$(NCURSES_LIB_SUFFIX).a \
|
||||
$(STAGING_DIR)/usr/lib/libcurses.a
|
||||
endef
|
||||
|
||||
define NCURSES_LINK_LIBS_SHARED
|
||||
$(foreach lib,$(NCURSES_LIBS:%=lib%), \
|
||||
ln -sf $(lib)$(NCURSES_LIB_SUFFIX).so $(STAGING_DIR)/usr/lib/$(lib).so
|
||||
)
|
||||
ln -sf libncurses$(NCURSES_LIB_SUFFIX).so \
|
||||
$(STAGING_DIR)/usr/lib/libcurses.so
|
||||
endef
|
||||
|
||||
define NCURSES_LINK_PC
|
||||
$(foreach pc,$(NCURSES_LIBS), \
|
||||
ln -sf $(pc)$(NCURSES_LIB_SUFFIX).pc \
|
||||
$(STAGING_DIR)/usr/lib/pkgconfig/$(pc).pc
|
||||
)
|
||||
endef
|
||||
|
||||
NCURSES_LINK_STAGING_LIBS = \
|
||||
$(if $(BR2_STATIC_LIBS)$(BR2_SHARED_STATIC_LIBS),$(call NCURSES_LINK_LIBS_STATIC);) \
|
||||
$(if $(BR2_SHARED_LIBS)$(BR2_SHARED_STATIC_LIBS),$(call NCURSES_LINK_LIBS_SHARED))
|
||||
|
||||
NCURSES_LINK_STAGING_PC = $(call NCURSES_LINK_PC)
|
||||
|
||||
NCURSES_CONF_OPTS += --enable-ext-colors
|
||||
NCURSES_ABI_VERSION = 6
|
||||
NCURSES_TERMINFO_FILES += \
|
||||
p/putty-256color \
|
||||
x/xterm+256color \
|
||||
x/xterm-256color
|
||||
|
||||
NCURSES_POST_INSTALL_STAGING_HOOKS += NCURSES_LINK_STAGING_LIBS
|
||||
NCURSES_POST_INSTALL_STAGING_HOOKS += NCURSES_LINK_STAGING_PC
|
||||
|
||||
else # BR2_PACKAGE_NCURSES_WCHAR
|
||||
NCURSES_ABI_VERSION = 5
|
||||
endif # BR2_PACKAGE_NCURSES_WCHAR
|
||||
|
||||
ifneq ($(BR2_ENABLE_DEBUG),y)
|
||||
NCURSES_CONF_OPTS += --without-debug
|
||||
endif
|
||||
|
||||
# ncurses breaks with parallel build, but takes quite a while to
|
||||
# build single threaded. Work around it similar to how Gentoo does
|
||||
define NCURSES_BUILD_CMDS
|
||||
$(TARGET_MAKE_ENV) $(MAKE1) -C $(@D) DESTDIR=$(STAGING_DIR) sources
|
||||
rm -rf $(@D)/misc/pc-files
|
||||
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(STAGING_DIR)
|
||||
endef
|
||||
|
||||
ifeq ($(BR2_PACKAGE_NCURSES_TARGET_PROGS),y)
|
||||
define NCURSES_TARGET_SYMLINK_RESET
|
||||
ln -sf tset $(TARGET_DIR)/usr/bin/reset
|
||||
endef
|
||||
NCURSES_POST_INSTALL_TARGET_HOOKS += NCURSES_TARGET_SYMLINK_RESET
|
||||
endif
|
||||
|
||||
define NCURSES_TARGET_CLEANUP_TERMINFO
|
||||
$(RM) -rf $(TARGET_DIR)/usr/share/terminfo $(TARGET_DIR)/usr/share/tabset
|
||||
$(foreach t,$(NCURSES_TERMINFO_FILES), \
|
||||
$(INSTALL) -D -m 0644 $(STAGING_DIR)/usr/share/terminfo/$(t) \
|
||||
$(TARGET_DIR)/usr/share/terminfo/$(t)
|
||||
)
|
||||
endef
|
||||
NCURSES_POST_INSTALL_TARGET_HOOKS += NCURSES_TARGET_CLEANUP_TERMINFO
|
||||
|
||||
#
|
||||
# On systems with an older version of tic, the installation of ncurses hangs
|
||||
# forever. To resolve the problem, build a static version of tic on host
|
||||
# ourselves, and use that during installation.
|
||||
#
|
||||
define HOST_NCURSES_BUILD_CMDS
|
||||
$(HOST_MAKE_ENV) $(MAKE1) -C $(@D) sources
|
||||
$(HOST_MAKE_ENV) $(MAKE) -C $(@D)/progs tic
|
||||
endef
|
||||
|
||||
HOST_NCURSES_CONF_OPTS = \
|
||||
--with-shared \
|
||||
--without-gpm \
|
||||
--without-manpages \
|
||||
--without-cxx \
|
||||
--without-cxx-binding \
|
||||
--without-ada \
|
||||
--without-normal
|
||||
|
||||
$(eval $(autotools-package))
|
||||
$(eval $(host-autotools-package))
|
||||
Reference in New Issue
Block a user