Add fix from upstream for missing symbols.

(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key D2E96200)

4 files changed, 184 insertions, 1 deletions

diff --git a/sys-apps/dtc/ChangeLog b/sys-apps/dtc/ChangeLog
index 3105ec379357..fa5f2cc3f3f0 100644
--- a/sys-apps/dtc/ChangeLog
+++ b/sys-apps/dtc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/dtc
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dtc/ChangeLog,v 1.22 2015/05/01 06:08:05 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dtc/ChangeLog,v 1.23 2015/05/06 05:57:23 vapier Exp $
+
+*dtc-1.4.1-r1 (06 May 2015)
+
+  06 May 2015; Mike Frysinger <vapier@gentoo.org> +dtc-1.4.1-r1.ebuild,
+  +files/dtc-1.4.1-echo-n.patch, +files/dtc-1.4.1-missing-syms.patch:
+  Add fix from upstream for missing symbols.
 
   01 May 2015; Jeroen Roovers <jer@gentoo.org> dtc-1.4.1.ebuild:
   Stable for PPC64 (bug #535644).
diff --git a/sys-apps/dtc/dtc-1.4.1-r1.ebuild b/sys-apps/dtc/dtc-1.4.1-r1.ebuild
new file mode 100644
index 000000000000..59458b2c2142
--- /dev/null
+++ b/sys-apps/dtc/dtc-1.4.1-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dtc/dtc-1.4.1-r1.ebuild,v 1.1 2015/05/06 05:57:23 vapier Exp $
+
+EAPI="4"
+
+inherit multilib toolchain-funcs eutils
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/dtc/dtc.git"
+	inherit git-2
+else
+	SRC_URI="mirror://kernel/software/utils/${PN}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Open Firmware device tree compiler"
+HOMEPAGE="http://devicetree.org/Device_Tree_Compiler"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="static-libs"
+
+RDEPEND=""
+DEPEND="app-arch/xz-utils
+	sys-devel/flex
+	sys-devel/bison"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-missing-syms.patch
+	epatch "${FILESDIR}"/${P}-echo-n.patch
+	sed -i \
+		-e '/^CFLAGS =/s:=:+=:' \
+		-e '/^CPPFLAGS =/s:=:+=:' \
+		-e 's:-Werror::' \
+		-e 's:-g -Os::' \
+		-e "/^PREFIX =/s:=.*:= ${EPREFIX}/usr:" \
+		-e "/^LIBDIR =/s:=.*:= \$(PREFIX)/$(get_libdir):" \
+		Makefile || die
+	tc-export AR CC
+	export V=1
+}
+
+src_test() {
+	# Enable parallel tests.
+	emake check
+}
+
+src_install() {
+	default
+	use static-libs || find "${ED}" -name '*.a' -delete
+	dodoc Documentation/manual.txt
+}
diff --git a/sys-apps/dtc/files/dtc-1.4.1-echo-n.patch b/sys-apps/dtc/files/dtc-1.4.1-echo-n.patch
new file mode 100644
index 000000000000..cd45b952a49e
--- /dev/null
+++ b/sys-apps/dtc/files/dtc-1.4.1-echo-n.patch
@@ -0,0 +1,95 @@
+From ed3d76cd1c8f91f5e86424e899448d6221b0f76c Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@chromium.org>
+Date: Wed, 6 May 2015 01:53:39 -0400
+Subject: [PATCH] tests: convert `echo -n` to `printf`
+
+The -n option is not standard in POSIX, so convert to printf which should
+work the same in every shell.
+
+Signed-off-by: Mike Frysinger <vapier@chromium.org>
+---
+ tests/run_tests.sh | 20 ++++++++++----------
+ 1 file changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/tests/run_tests.sh b/tests/run_tests.sh
+index c870432..0dda54a 100755
+--- a/tests/run_tests.sh
++++ b/tests/run_tests.sh
+@@ -42,20 +42,20 @@ base_run_test() {
+ 
+ shorten_echo () {
+     limit=32
+-    echo -n "$1"
++    printf "$1"
+     shift
+     for x; do
+ 	if [ ${#x} -le $limit ]; then
+-	    echo -n " $x"
++	    printf " $x"
+ 	else
+ 	    short=$(echo "$x" | head -c$limit)
+-	    echo -n " \"$short\"...<${#x} bytes>"
++	    printf " \"$short\"...<${#x} bytes>"
+ 	fi
+     done
+ }
+ 
+ run_test () {
+-    echo -n "$@:	"
++    printf "$@:	"
+     if [ -n "$VALGRIND" -a -f $1.supp ]; then
+ 	VGSUPP="--suppressions=$1.supp"
+     fi
+@@ -63,7 +63,7 @@ run_test () {
+ }
+ 
+ run_sh_test () {
+-    echo -n "$@:	"
++    printf "$@:	"
+     base_run_test sh "$@"
+ }
+ 
+@@ -106,12 +106,12 @@ wrap_error () {
+ 
+ run_wrap_error_test () {
+     shorten_echo "$@"
+-    echo -n " {!= 0}:	"
++    printf " {!= 0}:	"
+     base_run_test wrap_error "$@"
+ }
+ 
+ run_dtc_test () {
+-    echo -n "dtc $@:	"
++    printf "dtc $@:	"
+     base_run_test wrap_test $VALGRIND $DTC "$@"
+ }
+ 
+@@ -126,7 +126,7 @@ asm_to_so_test () {
+ run_fdtget_test () {
+     expect="$1"
+     shift
+-    echo -n "fdtget-runtest.sh "$expect" $@:	"
++    printf "fdtget-runtest.sh "$expect" $@:	"
+     base_run_test sh fdtget-runtest.sh "$expect" "$@"
+ }
+ 
+@@ -134,14 +134,14 @@ run_fdtput_test () {
+     expect="$1"
+     shift
+     shorten_echo fdtput-runtest.sh "$expect" "$@"
+-    echo -n ":	"
++    printf ":	"
+     base_run_test sh fdtput-runtest.sh "$expect" "$@"
+ }
+ 
+ run_fdtdump_test() {
+     file="$1"
+     shorten_echo fdtdump-runtest.sh "$file"
+-    echo -n ":	"
++    printf ":	"
+     base_run_test sh fdtdump-runtest.sh "$file"
+ }
+ 
+-- 
+2.4.0
+
diff --git a/sys-apps/dtc/files/dtc-1.4.1-missing-syms.patch b/sys-apps/dtc/files/dtc-1.4.1-missing-syms.patch
new file mode 100644
index 000000000000..7057be7bd8ac
--- /dev/null
+++ b/sys-apps/dtc/files/dtc-1.4.1-missing-syms.patch
@@ -0,0 +1,30 @@
+From a4b093f7366fdb429ca1781144d3985fa50d0fbb Mon Sep 17 00:00:00 2001
+From: Julien Grall <julien.grall@linaro.org>
+Date: Tue, 17 Mar 2015 16:00:34 +0000
+Subject: [PATCH] libfdt: Add missing functions to shared library
+
+The commit 4e76ec7 "libfdt: Add fdt_next_subnode() to permit easy
+subnode iteration" adds new functions (fdt_{first,next}_subnode) but
+forgot to mark them as 'global' in the shared library.
+
+Signed-off-by: Julien Grall <julien.grall@linaro.org>
+---
+ libfdt/version.lds | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/libfdt/version.lds b/libfdt/version.lds
+index 80b322b..941208e 100644
+--- a/libfdt/version.lds
++++ b/libfdt/version.lds
+@@ -54,6 +54,8 @@ LIBFDT_1.2 {
+ 		fdt_get_property_by_offset;
+ 		fdt_getprop_by_offset;
+ 		fdt_next_property_offset;
++		fdt_first_subnode;
++		fdt_next_subnode;
+ 
+ 	local:
+ 		*;
+-- 
+2.4.0
+