* [gentoo-commits] repo/gentoo:master commit in: sys-apps/dtc/files/, sys-apps/dtc/
@ 2018-01-10 5:50 Mike Frysinger
0 siblings, 0 replies; 5+ messages in thread
From: Mike Frysinger @ 2018-01-10 5:50 UTC (permalink / raw
To: gentoo-commits
commit: 0b6c782b7853ff796d16200301ced0b34e16c594
Author: Mike Frysinger <vapier <AT> chromium <DOT> org>
AuthorDate: Wed Jan 10 05:48:35 2018 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Wed Jan 10 05:48:42 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b6c782b
sys-apps/dtc: change dtdiff to use /bin/sh
.../dtc/{dtc-9999.ebuild => dtc-1.4.4-r1.ebuild} | 8 +++-
sys-apps/dtc/dtc-9999.ebuild | 8 +++-
sys-apps/dtc/files/dtc-1.4.4-posix-shell.patch | 48 ++++++++++++++++++++++
3 files changed, 62 insertions(+), 2 deletions(-)
diff --git a/sys-apps/dtc/dtc-9999.ebuild b/sys-apps/dtc/dtc-1.4.4-r1.ebuild
similarity index 85%
copy from sys-apps/dtc/dtc-9999.ebuild
copy to sys-apps/dtc/dtc-1.4.4-r1.ebuild
index 1dc3915445f..7521eebe76e 100644
--- a/sys-apps/dtc/dtc-9999.ebuild
+++ b/sys-apps/dtc/dtc-1.4.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -24,9 +24,15 @@ DEPEND="
sys-devel/flex
"
DOCS="
+ Documentation/dt-object-internal.txt
+ Documentation/dts-format.txt
Documentation/manual.txt
"
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.4.4-posix-shell.patch
+)
+
src_prepare() {
default
diff --git a/sys-apps/dtc/dtc-9999.ebuild b/sys-apps/dtc/dtc-9999.ebuild
index 1dc3915445f..7521eebe76e 100644
--- a/sys-apps/dtc/dtc-9999.ebuild
+++ b/sys-apps/dtc/dtc-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -24,9 +24,15 @@ DEPEND="
sys-devel/flex
"
DOCS="
+ Documentation/dt-object-internal.txt
+ Documentation/dts-format.txt
Documentation/manual.txt
"
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.4.4-posix-shell.patch
+)
+
src_prepare() {
default
diff --git a/sys-apps/dtc/files/dtc-1.4.4-posix-shell.patch b/sys-apps/dtc/files/dtc-1.4.4-posix-shell.patch
new file mode 100644
index 00000000000..b9b0175c0bd
--- /dev/null
+++ b/sys-apps/dtc/files/dtc-1.4.4-posix-shell.patch
@@ -0,0 +1,48 @@
+From 4d9522764985462741c7bb4af1ab231b9251476b Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@chromium.org>
+Date: Wed, 10 Jan 2018 00:41:43 -0500
+Subject: [PATCH] dtdiff: change to POSIX shell
+
+This changes from the bash-specific process substitution feature to
+reading with pipes. It relies on /dev/fd or /proc/self/fd existing.
+
+URL: https://crbug.com/756559
+Signed-off-by: Mike Frysinger <vapier@chromium.org>
+---
+ dtdiff | 19 +++++++++++++------
+ 1 file changed, 13 insertions(+), 6 deletions(-)
+
+diff --git a/dtdiff b/dtdiff
+index 5fa772b0ab62..4d1b71756c2f 100644
+--- a/dtdiff
++++ b/dtdiff
+@@ -1,8 +1,4 @@
+-#! /bin/bash
+-
+-# This script uses the bash <(...) extension.
+-# If you want to change this to work with a generic /bin/sh, make sure
+-# you fix that.
++#! /bin/sh
+
+
+ DTC=dtc
+@@ -35,4 +31,15 @@ if [ $# != 2 ]; then
+ exit 1
+ fi
+
+-diff -u <(source_and_sort "$1") <(source_and_sort "$2")
++for dir in /dev/fd /proc/self/fd; do
++ if [ -d "${dir}" ]; then
++ break
++ fi
++done
++
++source_and_sort "$1" | (
++ # Duplicate current stdin from the first file to fd 3 so we can change fd 0
++ # to the second file.
++ exec 3<&0
++ source_and_sort "$2" | diff -u "${dir}/3" "${dir}/0"
++)
+--
+2.15.1
+
^ permalink raw reply related [flat|nested] 5+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/dtc/files/, sys-apps/dtc/
@ 2024-06-02 16:05 Craig Andrews
0 siblings, 0 replies; 5+ messages in thread
From: Craig Andrews @ 2024-06-02 16:05 UTC (permalink / raw
To: gentoo-commits
commit: 10e61f9331cc7671068445fb19e69d669b7570f0
Author: Craig Andrews <candrews <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 2 16:01:43 2024 +0000
Commit: Craig Andrews <candrews <AT> gentoo <DOT> org>
CommitDate: Sun Jun 2 16:05:02 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10e61f93
sys-apps/dtc: enable py3.12
Use patch frol Deban to fix tests
See: https://github.com/dgibson/dtc/issues/123
Closes: https://bugs.gentoo.org/929808
Signed-off-by: Craig Andrews <candrews <AT> gentoo.org>
sys-apps/dtc/dtc-1.7.0.ebuild | 3 +-
sys-apps/dtc/dtc-9999.ebuild | 2 +-
sys-apps/dtc/files/fix-tests-for-Python3.12.patch | 43 +++++++++++++++++++++++
3 files changed, 46 insertions(+), 2 deletions(-)
diff --git a/sys-apps/dtc/dtc-1.7.0.ebuild b/sys-apps/dtc/dtc-1.7.0.ebuild
index f674774c831b..bcb50ad71a85 100644
--- a/sys-apps/dtc/dtc-1.7.0.ebuild
+++ b/sys-apps/dtc/dtc-1.7.0.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
inherit meson python-single-r1
if [[ ${PV} == 9999 ]] ; then
@@ -44,6 +44,7 @@ DOCS=(
PATCHES=(
"${FILESDIR}"/${P}-meson-tests.patch
"${FILESDIR}"/${P}-meson-macos.patch
+ "${FILESDIR}"/fix-tests-for-Python3.12.patch
)
pkg_setup() {
diff --git a/sys-apps/dtc/dtc-9999.ebuild b/sys-apps/dtc/dtc-9999.ebuild
index dd2aadfad28a..ad87023887a3 100644
--- a/sys-apps/dtc/dtc-9999.ebuild
+++ b/sys-apps/dtc/dtc-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
inherit meson python-single-r1
if [[ ${PV} == 9999 ]] ; then
diff --git a/sys-apps/dtc/files/fix-tests-for-Python3.12.patch b/sys-apps/dtc/files/fix-tests-for-Python3.12.patch
new file mode 100644
index 000000000000..7a08648f3835
--- /dev/null
+++ b/sys-apps/dtc/files/fix-tests-for-Python3.12.patch
@@ -0,0 +1,43 @@
+Description: Python3.12 causes breakage for get_mem_rsv in pylibfdt.
+
+ Author: Héctor Orón Martínez <zumbi@debian.org>
+
+---
+
+Bug: https://github.com/dgibson/dtc/issues/123
+Bug-Debian: https://bugs.debian.org/1061318
+Bug-Ubuntu: https://launchpad.net/bugs/2051399
+Last-Update: 2024-01-30
+
+--- device-tree-compiler-1.7.0.orig/tests/pylibfdt_tests.py
++++ device-tree-compiler-1.7.0/tests/pylibfdt_tests.py
+@@ -418,9 +418,14 @@ class PyLibfdtBasicTests(unittest.TestCa
+ def testReserveMap(self):
+ """Test that we can access the memory reserve map"""
+ self.assertEqual(2, self.fdt.num_mem_rsv())
+- self.assertEqual([ 0xdeadbeef00000000, 0x100000],
+- self.fdt.get_mem_rsv(0))
+- self.assertEqual([123456789, 0o10000], self.fdt.get_mem_rsv(1))
++ if sys.version_info.major >= 3 and sys.version_info.minor >= 12:
++ self.assertEqual([0, 0xdeadbeef00000000, 0x100000],
++ self.fdt.get_mem_rsv(0))
++ self.assertEqual([0, 123456789, 0o10000], self.fdt.get_mem_rsv(1))
++ else:
++ self.assertEqual([0xdeadbeef00000000, 0x100000],
++ self.fdt.get_mem_rsv(0))
++ self.assertEqual([123456789, 0o10000], self.fdt.get_mem_rsv(1))
+
+ def testEmpty(self):
+ """Test that we can create an empty tree"""
+@@ -615,7 +620,10 @@ class PyLibfdtSwTests(unittest.TestCase)
+
+ fdt = sw.as_fdt()
+ self.assertEqual(2, fdt.num_mem_rsv())
+- self.assertEqual([TEST_ADDR_1, TEST_SIZE_1], fdt.get_mem_rsv(0))
++ if sys.version_info.major >= 3 and sys.version_info.minor >= 12:
++ self.assertEqual([0, TEST_ADDR_1, TEST_SIZE_1], fdt.get_mem_rsv(0))
++ else:
++ self.assertEqual([TEST_ADDR_1, TEST_SIZE_1], fdt.get_mem_rsv(0))
+
+ # Make sure we can add a few more things
+ with sw.add_node('another'):
^ permalink raw reply related [flat|nested] 5+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/dtc/files/, sys-apps/dtc/
@ 2020-03-07 9:39 Sergei Trofimovich
0 siblings, 0 replies; 5+ messages in thread
From: Sergei Trofimovich @ 2020-03-07 9:39 UTC (permalink / raw
To: gentoo-commits
commit: b8401f22eb250e5c0d5c120d4f66e35ea89cf821
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 7 09:34:15 2020 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Mar 7 09:39:06 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8401f22
sys-apps/dtc: tweak for gcc-10, bug #706660
Pull in upstream patch 0e9225eb0dfec5
"Remove redundant YYLOC global declaration".
Reported-by: Toralf Förster
Closes: https://bugs.gentoo.org/706660
Package-Manager: Portage-2.3.92, Repoman-2.3.20
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
sys-apps/dtc/dtc-1.5.0.ebuild | 3 +-
sys-apps/dtc/files/dtc-1.5.0-gcc-10.patch | 50 +++++++++++++++++++++++++++++++
2 files changed, 52 insertions(+), 1 deletion(-)
diff --git a/sys-apps/dtc/dtc-1.5.0.ebuild b/sys-apps/dtc/dtc-1.5.0.ebuild
index d0d47ebca8e..cbe4052e612 100644
--- a/sys-apps/dtc/dtc-1.5.0.ebuild
+++ b/sys-apps/dtc/dtc-1.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -32,6 +32,7 @@ DOCS="
PATCHES=(
"${FILESDIR}"/${PN}-1.4.4-posix-shell.patch
"${FILESDIR}"/${PN}-1.5.0-fdt_check_full-visibility.patch
+ "${FILESDIR}"/${PN}-1.5.0-gcc-10.patch
)
src_prepare() {
diff --git a/sys-apps/dtc/files/dtc-1.5.0-gcc-10.patch b/sys-apps/dtc/files/dtc-1.5.0-gcc-10.patch
new file mode 100644
index 00000000000..80773bfaebb
--- /dev/null
+++ b/sys-apps/dtc/files/dtc-1.5.0-gcc-10.patch
@@ -0,0 +1,50 @@
+https://bugs.gentoo.org/706660
+https://git.kernel.org/pub/scm/utils/dtc/dtc.git/patch/?id=0e9225eb0dfec51def612b928d2f1836b092bc7e
+
+From 0e9225eb0dfec51def612b928d2f1836b092bc7e Mon Sep 17 00:00:00 2001
+From: Dirk Mueller <dmueller@suse.com>
+Date: Tue, 14 Jan 2020 18:53:41 +0100
+Subject: Remove redundant YYLOC global declaration
+
+gcc 10 will default to -fno-common, which causes this error at link
+time:
+
+ (.text+0x0): multiple definition of `yylloc'; dtc-lexer.lex.o (symbol from plugin):(.text+0x0): first defined here
+
+This is because both dtc-lexer as well as dtc-parser define the same
+global symbol yyloc. Before with -fcommon those were merged into one
+defintion. The proper solution would be to to mark this as "extern",
+however that leads to:
+
+ dtc-lexer.l:26:16: error: redundant redeclaration of 'yylloc' [-Werror=redundant-decls]
+ 26 | extern YYLTYPE yylloc;
+ | ^~~~~~
+In file included from dtc-lexer.l:24:
+dtc-parser.tab.h:127:16: note: previous declaration of 'yylloc' was here
+ 127 | extern YYLTYPE yylloc;
+ | ^~~~~~
+cc1: all warnings being treated as errors
+
+which means the declaration is completely redundant and can just be
+dropped.
+
+Signed-off-by: Dirk Mueller <dmueller@suse.com>
+Message-Id: <20200114175341.2994-1-dmueller@suse.com>
+Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
+---
+ dtc-lexer.l | 1 -
+ 1 file changed, 1 deletion(-)
+
+--- a/dtc-lexer.l
++++ b/dtc-lexer.l
+@@ -23,7 +23,6 @@ LINECOMMENT "//".*\n
+ #include "srcpos.h"
+ #include "dtc-parser.tab.h"
+
+-YYLTYPE yylloc;
+ extern bool treesource_error;
+
+ /* CAUTION: this will stop working if we ever use yyless() or yyunput() */
+--
+cgit 1.2-0.3.lf.el7
+
^ permalink raw reply related [flat|nested] 5+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/dtc/files/, sys-apps/dtc/
@ 2019-04-29 6:48 Matthias Maier
0 siblings, 0 replies; 5+ messages in thread
From: Matthias Maier @ 2019-04-29 6:48 UTC (permalink / raw
To: gentoo-commits
commit: f7cd78db8427b0ae7b696a5b33b0554c01f562a4
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 29 04:09:36 2019 +0000
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Mon Apr 29 06:48:44 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7cd78db
sys-apps/dtc: version bump to 1.5.0
Package-Manager: Portage-2.3.64, Repoman-2.3.12
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>
sys-apps/dtc/Manifest | 1 +
sys-apps/dtc/dtc-1.5.0.ebuild | 57 ++++++++++++++++++++++
.../dtc-1.5.0-fdt_check_full-visibility.patch | 12 +++++
3 files changed, 70 insertions(+)
diff --git a/sys-apps/dtc/Manifest b/sys-apps/dtc/Manifest
index da4e8c2c8d1..c36ac531326 100644
--- a/sys-apps/dtc/Manifest
+++ b/sys-apps/dtc/Manifest
@@ -3,3 +3,4 @@ DIST dtc-1.4.2.tar.xz 112480 BLAKE2B 922e4924bd9672b7b5a28fbe6a02a685bcb87909356
DIST dtc-1.4.3.tar.xz 122732 BLAKE2B 94fe96dc846937ff8e405c4be36a32f0f320bdc6c608e95845227b6e9ab3e4c02643dd1169fd0c8c64777fa2ead8dd1cf0fc1cd2173450c23af124645f2c8b10 SHA512 ce9f39cef11f3e7048e8491f01844071bf54911ec36a0d2f2e1ed6c736b7e1a67be83cd2527895a686882d895142db020bf5131a282e0d68d1f4d32dc772db42
DIST dtc-1.4.4.tar.xz 122748 BLAKE2B efef8ae46033bb2012aabc414ca4af78a44b1d2534be23c58004d970245a219d7d0d86c1c44cfb834f07410240dc5b8c8f926654cf73d018e5e1d625045f4d2f SHA512 20689f7b0489fa945c4df4e27084dfd46fd5512a8dff9b28d60e0cd0e9e79bbd9944e4d70a1aba86a026481b35bb5441ed6b63d306a4a8f7581517f7359fa9bf
DIST dtc-1.4.6.tar.xz 137868 BLAKE2B a2c7e5bf1afa70f827ed5b7dadc2dba58d7b67ebf3334386ff782c46688a9ffdc9c969523225de2c32fbcaa5db0ebaf157bbf8a0be182b13cfbcafdd981b04d9 SHA512 b52862159cbf9e6e8e1ecb5844e16c81a0b9c4df255366f8a48b15cb7e080754c142da7432de2542485fce70bb2a4fa76df6d1f93cbf0118e8dbe677153b9da8
+DIST dtc-1.5.0.tar.xz 152936 BLAKE2B 4ad9cf8f8fd0ccde0c7b8b66c0039eb9b012ed26e51387c06c03fa7950ca194878bbb23b50be5b80c4d4e18140d6316092a9f0eea87e5d713856635dcfc1b0ec SHA512 fd1e692a1b7bf7987f921ad17d9be6719f7b3aa7915873b45fa86f4ecb1398a0a62cdf53c1fddf98a0f7fed9bf34a79f684018bd01a2b5e88746b50879bf7102
diff --git a/sys-apps/dtc/dtc-1.5.0.ebuild b/sys-apps/dtc/dtc-1.5.0.ebuild
new file mode 100644
index 00000000000..077ffad552b
--- /dev/null
+++ b/sys-apps/dtc/dtc-1.5.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit multilib toolchain-funcs eutils
+
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/dtc/dtc.git"
+ inherit git-r3
+else
+ SRC_URI="mirror://kernel/software/utils/${PN}/${P}.tar.xz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+fi
+
+DESCRIPTION="Open Firmware device tree compiler"
+HOMEPAGE="https://devicetree.org/ https://git.kernel.org/cgit/utils/dtc/dtc.git/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="static-libs"
+
+DEPEND="
+ sys-devel/bison
+ sys-devel/flex
+"
+DOCS="
+ Documentation/dt-object-internal.txt
+ Documentation/dts-format.txt
+ Documentation/manual.txt
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.4.4-posix-shell.patch
+ "${FILESDIR}"/${PN}-1.5.0-fdt_check_full-visibility.patch
+)
+
+src_prepare() {
+ default
+
+ 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_install() {
+ default
+
+ use static-libs || find "${ED}" -name '*.a' -delete
+}
diff --git a/sys-apps/dtc/files/dtc-1.5.0-fdt_check_full-visibility.patch b/sys-apps/dtc/files/dtc-1.5.0-fdt_check_full-visibility.patch
new file mode 100644
index 00000000000..a5a3d7524c4
--- /dev/null
+++ b/sys-apps/dtc/files/dtc-1.5.0-fdt_check_full-visibility.patch
@@ -0,0 +1,12 @@
+diff --git a/libfdt/version.lds b/libfdt/version.lds
+index 9f5d708..6b0f6d8 100644
+--- a/libfdt/version.lds
++++ b/libfdt/version.lds
+@@ -1,6 +1,7 @@
+ LIBFDT_1.2 {
+ global:
+ fdt_next_node;
++ fdt_check_full;
+ fdt_check_header;
+ fdt_move;
+ fdt_string;
^ permalink raw reply related [flat|nested] 5+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/dtc/files/, sys-apps/dtc/
@ 2016-01-04 22:26 Mike Frysinger
0 siblings, 0 replies; 5+ messages in thread
From: Mike Frysinger @ 2016-01-04 22:26 UTC (permalink / raw
To: gentoo-commits
commit: 0ea4b4f1eb9f40f926eceaa025cedf07021d0e8b
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 4 21:17:52 2016 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Mon Jan 4 22:25:36 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ea4b4f1
sys-apps/dtc: drop old versions
sys-apps/dtc/Manifest | 2 -
sys-apps/dtc/dtc-1.3.0-r1.ebuild | 52 -------------
sys-apps/dtc/dtc-1.3.0.ebuild | 46 -----------
sys-apps/dtc/dtc-1.4.0.ebuild | 52 -------------
sys-apps/dtc/files/dtc-1.3.0-fdtdump.patch | 118 -----------------------------
5 files changed, 270 deletions(-)
diff --git a/sys-apps/dtc/Manifest b/sys-apps/dtc/Manifest
index 7fc19d2..0803f93 100644
--- a/sys-apps/dtc/Manifest
+++ b/sys-apps/dtc/Manifest
@@ -1,3 +1 @@
DIST dtc-1.4.1.tar.xz 107920 SHA256 77992ad8eac7b68f553d0ba58e5b51604ac803d126196c99e3ae38aaae28bb94 SHA512 63df730e65f62b8c9648cfee5461809188f4198cbf98de25fbe5cb7f2f43c405266abb740501740f59847dc6faf0588bcbc734d08ae5430b05c2601e070d6d05 WHIRLPOOL 93e9ed26024e4650bb2de6323ea639a3e52622aa3891a9f9404959b600d2c1cbc633d18e30d3629ac54ae662e8c58a7d0ca7910a9b323cd8dd4ff6e43a3fdf67
-DIST dtc-v1.3.0.tgz 108540 SHA256 4da48956d812e221f68d1d538cd58ca8ed7412af4ab9ef42a702db9173c372fe SHA512 4506eb4c3eaccabbf6773a3b0cbf3b174560e5004cf8af9f88448ad1371d1c57d793f078b2bd99b63714df538e74d6dfe16f112bc8283d412b1026f5f5c8220e WHIRLPOOL 4e87da05024d94998999a5e0090f91e4af4a66937dc6d5deec9bf7dd320fd9e732d30ccb6195dd0ce924c0f3c817d6af4731761e08dbc0e365e85ad8719e7935
-DIST dtc-v1.4.0.tar.xz 105160 SHA256 6df33a5da65fd43e0bc265a6c99104ca2962a97cf2d78171ed10d68e546ce198 SHA512 d0021c27e3614776db72c3d84cf05b98b1c49e14991ce12db6a90e9ac7d8aa248064f071c7a3b5bc9a20e9b22f070187778faa49bb3a5d0916afdfd9a929b743 WHIRLPOOL 366dd030aeaf042a7b60c7f900befaac124799d2db02c272d513615e08b208de26ab678c2dc48187f52f19bc2d5bcdf9b5694521298122706726e11ddaaa2afe
diff --git a/sys-apps/dtc/dtc-1.3.0-r1.ebuild b/sys-apps/dtc/dtc-1.3.0-r1.ebuild
deleted file mode 100644
index 02bacac..0000000
--- a/sys-apps/dtc/dtc-1.3.0-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-MY_P="${PN}-v${PV}"
-
-inherit multilib toolchain-funcs eutils
-if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="git://git.jdl.com/software/dtc.git"
- inherit git-2
-else
- SRC_URI="http://www.jdl.com/software/${MY_P}.tgz"
- KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-fi
-
-DESCRIPTION="Open Firmware device-trees compiler"
-HOMEPAGE="http://git.jdl.com/gitweb/?p=dtc.git"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="static-libs"
-
-RDEPEND=""
-DEPEND="sys-devel/flex
- sys-devel/bison"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-fdtdump.patch #372895
- sed -i \
- -e '/^CFLAGS =/s:=:+=:' \
- -e '/^CPPFLAGS =/s:=:+=:' \
- -e 's:-Werror::' \
- -e 's:-g -Os::' \
- -e '/^PREFIX =/s:=.*:= /usr:' \
- -e "/^LIBDIR =/s:=.*:= /usr/$(get_libdir):" \
- Makefile || die
- tc-export AR CC
- export V=1
-}
-
-src_test() {
- emake check
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- use static-libs || find "${ED}" -name '*.a' -delete
- dodoc Documentation/manual.txt
-}
diff --git a/sys-apps/dtc/dtc-1.3.0.ebuild b/sys-apps/dtc/dtc-1.3.0.ebuild
deleted file mode 100644
index 3ea96bc..0000000
--- a/sys-apps/dtc/dtc-1.3.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-inherit toolchain-funcs
-
-MY_P="${PN}-v${PV}"
-
-DESCRIPTION="Open Firmware device-trees compiler"
-HOMEPAGE="http://www.t2-project.org/packages/dtc.html"
-SRC_URI="http://www.jdl.com/software/${MY_P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="sys-devel/flex
- sys-devel/bison"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- sed -i -e "s:CFLAGS =:CFLAGS +=:" \
- -e "s:CPPFLAGS =:CPPFLAGS +=:" \
- -e "s:-Werror::" \
- -e "s:-g -Os::" \
- Makefile || die
-}
-
-src_compile() {
- tc-export AR CC
- emake PREFIX="/usr" LIBDIR="/usr/$(get_libdir)"
-}
-
-src_test() {
- emake check
-}
-
-src_install() {
- emake DESTDIR="${D}" PREFIX="/usr" LIBDIR="/usr/$(get_libdir)" \
- install
- dodoc Documentation/manual.txt
-}
diff --git a/sys-apps/dtc/dtc-1.4.0.ebuild b/sys-apps/dtc/dtc-1.4.0.ebuild
deleted file mode 100644
index af5971f..0000000
--- a/sys-apps/dtc/dtc-1.4.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-MY_P="${PN}-v${PV}"
-
-inherit multilib toolchain-funcs
-if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="git://git.jdl.com/software/dtc.git"
- inherit git-2
-else
- SRC_URI="http://www.jdl.com/software/${MY_P}.tar.xz"
- KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
-fi
-
-DESCRIPTION="Open Firmware device-trees compiler"
-HOMEPAGE="http://git.jdl.com/gitweb/?p=dtc.git"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="static-libs"
-
-RDEPEND=""
-DEPEND="app-arch/xz-utils
- sys-devel/flex
- sys-devel/bison"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- sed -i \
- -e '/^CFLAGS =/s:=:+=:' \
- -e '/^CPPFLAGS =/s:=:+=:' \
- -e 's:-Werror::' \
- -e 's:-g -Os::' \
- -e '/^PREFIX =/s:=.*:= /usr:' \
- -e "/^LIBDIR =/s:=.*:= \$(PREFIX)/$(get_libdir):" \
- Makefile || die
- tc-export AR CC
- export V=1
-}
-
-src_test() {
- emake check
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- use static-libs || find "${ED}" -name '*.a' -delete
- dodoc Documentation/manual.txt
-}
diff --git a/sys-apps/dtc/files/dtc-1.3.0-fdtdump.patch b/sys-apps/dtc/files/dtc-1.3.0-fdtdump.patch
deleted file mode 100644
index 0bb1c8c..0000000
--- a/sys-apps/dtc/files/dtc-1.3.0-fdtdump.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-https://bugs.gentoo.org/372895
-
-From 8f459c5d72673e1a3a119ac58a7eee56236fca73 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Tue, 25 Oct 2011 17:29:24 -0400
-Subject: [PATCH] fdtdump: rename from ftdump
-
-The freetype package already installs a binary named "ftdump", so the dtc
-package conflicts with that. So rename the newer dtc tool to "fdtdump".
-This even makes a bit more sense:
- ftdump: [F]lat device [T]ree [dump]
- fdtdump: [F]lat [D]evice [T]ree [dump]
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
-Acked-by: David Gibson <david@gibson.dropbear.id.au>
----
- .gitignore | 2 +-
- Documentation/manual.txt | 10 +++++-----
- Makefile | 6 +++---
- Makefile.utils | 6 +++---
- ftdump.c => fdtdump.c | 2 +-
- 5 files changed, 13 insertions(+), 13 deletions(-)
- rename ftdump.c => fdtdump.c (97%)
-
-diff --git a/Documentation/manual.txt b/Documentation/manual.txt
-index f8a8a7b..14508f3 100644
---- a/Documentation/manual.txt
-+++ b/Documentation/manual.txt
-@@ -21,7 +21,7 @@ III - libfdt
-
- IV - Utility Tools
- 1) convert-dtsv0 -- Conversion to Version 1
-- 1) ftdump
-+ 1) fdtdump
-
-
- I - "dtc", the device tree compiler
-@@ -643,10 +643,10 @@ a new file with a "v1" appended the filename.
- Comments, empty lines, etc. are preserved.
-
-
--2) ftdump -- Flat Tree dumping utility
-+2) fdtdump -- Flat Device Tree dumping utility
-
--The ftdump program prints a readable version of a flat device tree file.
-+The fdtdump program prints a readable version of a flat device tree file.
-
--The syntax of the ftdump command line is:
-+The syntax of the fdtdump command line is:
-
-- ftdump <DTB-file-name>
-+ fdtdump <DTB-file-name>
-diff --git a/Makefile b/Makefile
-index b32409b..4582f5d 100644
---- a/Makefile
-+++ b/Makefile
-@@ -109,7 +109,7 @@ include Makefile.utils
-
- BIN += convert-dtsv0
- BIN += dtc
--BIN += ftdump
-+BIN += fdtdump
-
- SCRIPTS = dtdiff
-
-@@ -119,7 +119,7 @@ all: $(BIN) libfdt
- ifneq ($(DEPTARGETS),)
- -include $(DTC_OBJS:%.o=%.d)
- -include $(CONVERT_OBJS:%.o=%.d)
---include $(FTDUMP_OBJS:%.o=%.d)
-+-include $(FDTDUMP_OBJS:%.o=%.d)
- endif
-
-
-@@ -178,7 +178,7 @@ convert-dtsv0: $(CONVERT_OBJS)
- @$(VECHO) LD $@
- $(LINK.c) -o $@ $^
-
--ftdump: $(FTDUMP_OBJS)
-+fdtdump: $(FDTDUMP_OBJS)
-
-
- #
-diff --git a/Makefile.utils b/Makefile.utils
-index 0ed9297..fae5b00 100644
---- a/Makefile.ftdump
-+++ b/Makefile.ftdump
-@@ -4,8 +4,8 @@
- # into other systems of Makefiles.
- #
-
--FTDUMP_SRCS = \
-- ftdump.c
-+FDTDUMP_SRCS = \
-+ fdtdump.c
-
--FTDUMP_GEN_SRCS =
-+FDTDUMP_GEN_SRCS =
-
--FTDUMP_OBJS = $(FTDUMP_SRCS:%.c=%.o) $(FTDUMP_GEN_SRCS:%.c=%.o)
-+FDTDUMP_OBJS = $(FDTDUMP_SRCS:%.c=%.o) $(FDTDUMP_GEN_SRCS:%.c=%.o)
-diff --git a/ftdump.c b/fdtdump.c
-similarity index 97%
-rename from ftdump.c
-rename to fdtdump.c
-index cc55fe2..207a46d 100644
---- a/ftdump.c
-+++ b/fdtdump.c
-@@ -1,5 +1,5 @@
- /*
-- * ftdump.c - Contributed by Pantelis Antoniou <pantelis.antoniou AT gmail.com>
-+ * fdtdump.c - Contributed by Pantelis Antoniou <pantelis.antoniou AT gmail.com>
- */
-
- #include <stdint.h>
---
-1.7.12.4
-
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-06-02 16:05 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-01-10 5:50 [gentoo-commits] repo/gentoo:master commit in: sys-apps/dtc/files/, sys-apps/dtc/ Mike Frysinger
-- strict thread matches above, loose matches on Subject: below --
2024-06-02 16:05 Craig Andrews
2020-03-07 9:39 Sergei Trofimovich
2019-04-29 6:48 Matthias Maier
2016-01-04 22:26 Mike Frysinger
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox