Bump buidlroot version to 2018.02.6
This commit is contained in:
@@ -0,0 +1,35 @@
|
||||
From 2da5b72c704fed10f1b04b5432ac6b078d016fae Mon Sep 17 00:00:00 2001
|
||||
From: Baruch Siach <baruch@tkos.co.il>
|
||||
Date: Fri, 2 Mar 2018 08:25:36 +0200
|
||||
Subject: [PATCH] histedit: fix build with musl libc
|
||||
|
||||
musl libc defines the optreset BSD extension only in getopt.h. This
|
||||
fixes the following build failure:
|
||||
|
||||
histedit.c: In function 'histcmd':
|
||||
histedit.c:220:2: error: 'optreset' undeclared (first use in this function)
|
||||
optreset = 1; optind = 1; /* initialize getopt */
|
||||
^~~~~~~~
|
||||
|
||||
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
|
||||
---
|
||||
Upstream status: https://www.mail-archive.com/dash@vger.kernel.org/msg01389.html
|
||||
|
||||
src/histedit.c | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/src/histedit.c b/src/histedit.c
|
||||
index 94465d785cc9..f5c90aba873b 100644
|
||||
--- a/src/histedit.c
|
||||
+++ b/src/histedit.c
|
||||
@@ -39,6 +39,7 @@
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <unistd.h>
|
||||
+#include <getopt.h>
|
||||
/*
|
||||
* Editline and history functions (and glue).
|
||||
*/
|
||||
--
|
||||
2.16.1
|
||||
|
||||
@@ -3,7 +3,10 @@ config BR2_PACKAGE_DASH
|
||||
depends on BR2_USE_MMU # fork()
|
||||
depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
|
||||
help
|
||||
The Debian/Linux port of the NetBSD version of
|
||||
ash (the Almquist SHell).
|
||||
DASH is a POSIX-compliant implementation of /bin/sh that
|
||||
aims to be as small as possible. It does this without
|
||||
sacrificing speed where possible. In fact, it is
|
||||
significantly faster than bash (the GNU Bourne-Again SHell)
|
||||
for most tasks.
|
||||
|
||||
http://gondor.apana.org.au/~herbert/dash
|
||||
|
||||
@@ -1,3 +1,2 @@
|
||||
# From http://ftp.debian.org/debian/pool/main/d/dash/dash_0.5.8-1.dsc
|
||||
sha256 c6db3a237747b02d20382a761397563d813b306c020ae28ce25a1c3915fac60f dash_0.5.8.orig.tar.gz
|
||||
sha256 d751769cc1ef8b825a177e782f1cd3e35bde7c268107fa4febf8d235e12c64d9 dash_0.5.8-1.diff.gz
|
||||
# From http://gondor.apana.org.au/~herbert/dash/files/dash-0.5.9.1.tar.gz.sha256sum
|
||||
sha256 5ecd5bea72a93ed10eb15a1be9951dd51b52e5da1d4a7ae020efd9826b49e659 dash-0.5.9.1.tar.gz
|
||||
|
||||
@@ -4,13 +4,29 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
DASH_VERSION = 0.5.8
|
||||
DASH_SOURCE = dash_$(DASH_VERSION).orig.tar.gz
|
||||
DASH_SITE = http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/d/dash
|
||||
DASH_PATCH = dash_$(DASH_VERSION)-1.diff.gz
|
||||
DASH_LICENSE = BSD-3c, GPLv2+ (mksignames.c)
|
||||
DASH_VERSION = 0.5.9.1
|
||||
DASH_SITE = http://gondor.apana.org.au/~herbert/dash/files
|
||||
DASH_LICENSE = BSD-3-Clause, GPL-2.0+ (mksignames.c)
|
||||
DASH_LICENSE_FILES = COPYING
|
||||
|
||||
# dash does not build in parallel
|
||||
DASH_MAKE = $(MAKE1)
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBEDIT),y)
|
||||
DASH_DEPENDENCIES += libedit host-pkgconf
|
||||
DASH_CONF_OPTS += --with-libedit
|
||||
DASH_CONF_ENV += LIBS=`pkg-config --libs libedit`
|
||||
|
||||
# Enable line editing, Emacs style
|
||||
define DASH_INSTALL_PROFILE
|
||||
mkdir -p $(TARGET_DIR)/etc/profile.d
|
||||
echo 'set -E' > $(TARGET_DIR)/etc/profile.d/dash.sh
|
||||
endef
|
||||
DASH_POST_INSTALL_TARGET_HOOKS += DASH_INSTALL_PROFILE
|
||||
else
|
||||
DASH_CONF_OPTS += --without-libedit
|
||||
endif
|
||||
|
||||
define DASH_INSTALL_TARGET_CMDS
|
||||
$(INSTALL) -m 0755 $(@D)/src/dash $(TARGET_DIR)/bin/dash
|
||||
endef
|
||||
|
||||
Reference in New Issue
Block a user