public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/dtc/, sys-apps/dtc/files/
@ 2022-09-02 18:10 Andreas Sturmlechner
  0 siblings, 0 replies; 2+ messages in thread
From: Andreas Sturmlechner @ 2022-09-02 18:10 UTC (permalink / raw
  To: gentoo-commits

commit:     38c4e6130d616269ba70a8f1bef4e38fda68da3f
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 30 18:30:52 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Sep  2 18:08:03 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38c4e613

sys-apps/dtc: drop 1.5.0, 1.5.0-r2, EAPI-6--

Closes: https://bugs.gentoo.org/743977
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 sys-apps/dtc/Manifest                              |  1 -
 sys-apps/dtc/dtc-1.5.0-r2.ebuild                   | 87 ----------------------
 sys-apps/dtc/dtc-1.5.0.ebuild                      | 59 ---------------
 sys-apps/dtc/files/dtc-1.4.4-posix-shell.patch     | 48 ------------
 .../dtc-1.5.0-fdt_check_full-visibility.patch      | 12 ---
 sys-apps/dtc/files/dtc-1.5.0-gcc-10.patch          | 50 -------------
 6 files changed, 257 deletions(-)

diff --git a/sys-apps/dtc/Manifest b/sys-apps/dtc/Manifest
index ce7f0fee1d6b..993154b8a266 100644
--- a/sys-apps/dtc/Manifest
+++ b/sys-apps/dtc/Manifest
@@ -1,2 +1 @@
-DIST dtc-1.5.0.tar.xz 152936 BLAKE2B 4ad9cf8f8fd0ccde0c7b8b66c0039eb9b012ed26e51387c06c03fa7950ca194878bbb23b50be5b80c4d4e18140d6316092a9f0eea87e5d713856635dcfc1b0ec SHA512 fd1e692a1b7bf7987f921ad17d9be6719f7b3aa7915873b45fa86f4ecb1398a0a62cdf53c1fddf98a0f7fed9bf34a79f684018bd01a2b5e88746b50879bf7102
 DIST dtc-1.6.0.tar.xz 158584 BLAKE2B 47b15b5df7f5d87369d6daaad87f2989a80865f2fab19f89d050d390a9f8319bcd86a36e12f7cc8d62947bb4d1335769071d0e3ea0a6e16861aea163e78f4696 SHA512 15433b24f1d6b7ed1f8066d050bd1bcbf988731aa38147564e3dd04b5f69af8d69e03befdc621a768526c620425a9bdd24aad4f9ff135930d6a1eeb0625f7de3

diff --git a/sys-apps/dtc/dtc-1.5.0-r2.ebuild b/sys-apps/dtc/dtc-1.5.0-r2.ebuild
deleted file mode 100644
index 3394d77c0623..000000000000
--- a/sys-apps/dtc/dtc-1.5.0-r2.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit multilib toolchain-funcs
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/dtc/dtc.git"
-	inherit git-r3
-else
-	SRC_URI="https://www.kernel.org/pub/software/utils/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~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 yaml"
-
-BDEPEND="
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-"
-RDEPEND="yaml? ( dev-libs/libyaml )"
-DEPEND="${RDEPEND}"
-
-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
-	"${FILESDIR}"/${PN}-1.5.0-gcc-10.patch
-)
-
-_emake() {
-	# valgrind is used only in 'make checkm'
-	emake \
-		NO_PYTHON=1 \
-		NO_VALGRIND=1 \
-		NO_YAML=$(usex !yaml 1 0) \
-		\
-		AR="$(tc-getAR)" \
-		CC="$(tc-getCC)" \
-		PKG_CONFIG="$(tc-getPKG_CONFIG)" \
-		\
-		V=1 \
-		\
-		PREFIX="${EPREFIX}/usr" \
-		\
-		LIBDIR="\$(PREFIX)/$(get_libdir)" \
-		\
-		"$@"
-}
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e '/^CFLAGS =/s:=:+=:' \
-		-e '/^CPPFLAGS =/s:=:+=:' \
-		-e 's:-Werror::' \
-		-e 's:-g -Os::' \
-		Makefile || die
-
-	tc-export AR CC PKG_CONFIG
-}
-
-src_compile() {
-	_emake
-}
-
-src_test() {
-	_emake check
-}
-
-src_install() {
-	_emake DESTDIR="${D}" install
-
-	use static-libs || find "${ED}" -name '*.a' -delete
-}

diff --git a/sys-apps/dtc/dtc-1.5.0.ebuild b/sys-apps/dtc/dtc-1.5.0.ebuild
deleted file mode 100644
index 1a41da72cf8f..000000000000
--- a/sys-apps/dtc/dtc-1.5.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit multilib toolchain-funcs
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/dtc/dtc.git"
-	inherit git-r3
-else
-	SRC_URI="https://www.kernel.org/pub/software/utils/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~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
-	virtual/pkgconfig
-"
-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
-	"${FILESDIR}"/${PN}-1.5.0-gcc-10.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 PKG_CONFIG
-	export V=1
-}
-
-src_install() {
-	default
-
-	use static-libs || find "${ED}" -name '*.a' -delete
-}

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
deleted file mode 100644
index b9b0175c0bd3..000000000000
--- a/sys-apps/dtc/files/dtc-1.4.4-posix-shell.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-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
-

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
deleted file mode 100644
index a5a3d7524c45..000000000000
--- a/sys-apps/dtc/files/dtc-1.5.0-fdt_check_full-visibility.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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;

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
deleted file mode 100644
index 80773bfaebbc..000000000000
--- a/sys-apps/dtc/files/dtc-1.5.0-gcc-10.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-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] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/dtc/, sys-apps/dtc/files/
@ 2023-06-06  3:20 Sam James
  0 siblings, 0 replies; 2+ messages in thread
From: Sam James @ 2023-06-06  3:20 UTC (permalink / raw
  To: gentoo-commits

commit:     fc3e6bec182a65e82d3bc2c66922fe13795e8b9d
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jun  6 03:19:08 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jun  6 03:19:45 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc3e6bec

sys-apps/dtc: add 1.7.0 (now with meson!)

This fixes the build on macOS as well, because we're using a proper build
system now (install_name was wrong before).

Reported-by: Konstantin Kliakhandler
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-apps/dtc/Manifest                          |  1 +
 sys-apps/dtc/dtc-1.7.0.ebuild                  | 51 +++++++++++++++++++
 sys-apps/dtc/dtc-9999.ebuild                   | 68 ++++++--------------------
 sys-apps/dtc/files/dtc-1.7.0-meson-macos.patch | 39 +++++++++++++++
 sys-apps/dtc/files/dtc-1.7.0-meson-tests.patch | 27 ++++++++++
 5 files changed, 134 insertions(+), 52 deletions(-)

diff --git a/sys-apps/dtc/Manifest b/sys-apps/dtc/Manifest
index 993154b8a266..48789513fcd2 100644
--- a/sys-apps/dtc/Manifest
+++ b/sys-apps/dtc/Manifest
@@ -1 +1,2 @@
 DIST dtc-1.6.0.tar.xz 158584 BLAKE2B 47b15b5df7f5d87369d6daaad87f2989a80865f2fab19f89d050d390a9f8319bcd86a36e12f7cc8d62947bb4d1335769071d0e3ea0a6e16861aea163e78f4696 SHA512 15433b24f1d6b7ed1f8066d050bd1bcbf988731aa38147564e3dd04b5f69af8d69e03befdc621a768526c620425a9bdd24aad4f9ff135930d6a1eeb0625f7de3
+DIST dtc-1.7.0.tar.xz 165548 BLAKE2B de433a1034b7ef75559bf39f85695d0b275cfd17bf100c12b6186e226a65659053f9b5a053f20e64a5a0670ea3e728edd0e624c26287bd264594569408065bab SHA512 d3ba6902a9a2f2cdbaff55f12fca3cfe4a1ec5779074a38e3d8b88097c7abc981835957e8ce72971e10c131e05fde0b1b961768e888ff96d89e42c75edb53afb

diff --git a/sys-apps/dtc/dtc-1.7.0.ebuild b/sys-apps/dtc/dtc-1.7.0.ebuild
new file mode 100644
index 000000000000..8efc03c0d12b
--- /dev/null
+++ b/sys-apps/dtc/dtc-1.7.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson toolchain-funcs
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/dtc/dtc.git"
+	inherit git-r3
+else
+	SRC_URI="https://www.kernel.org/pub/software/utils/${PN}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~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 yaml"
+
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+"
+RDEPEND="yaml? ( dev-libs/libyaml )"
+DEPEND="${RDEPEND}"
+
+DOCS=(
+	Documentation/dt-object-internal.txt
+	Documentation/dts-format.txt
+	Documentation/manual.txt
+)
+
+PATCHES=(
+	"${FILESDIR}"/${P}-meson-tests.patch
+	"${FILESDIR}"/${P}-meson-macos.patch
+)
+
+src_configure() {
+	local emesonargs=(
+		-Ddefault_library=$(usex static-libs both shared)
+		-Dpython=disabled
+		-Dvalgrind=disabled # only used for some tests
+		$(meson_feature yaml)
+	)
+
+	meson_src_configure
+}

diff --git a/sys-apps/dtc/dtc-9999.ebuild b/sys-apps/dtc/dtc-9999.ebuild
index 4f65bb653123..2f21c8739ec9 100644
--- a/sys-apps/dtc/dtc-9999.ebuild
+++ b/sys-apps/dtc/dtc-9999.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit toolchain-funcs
+inherit meson toolchain-funcs
 
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/dtc/dtc.git"
 	inherit git-r3
 else
 	SRC_URI="https://www.kernel.org/pub/software/utils/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 DESCRIPTION="Open Firmware device tree compiler"
@@ -25,58 +25,22 @@ BDEPEND="
 	sys-devel/flex
 	virtual/pkgconfig
 "
-RDEPEND="yaml? ( dev-libs/libyaml )"
+RDEPEND="yaml? ( >=dev-libs/libyaml-0.2.3 )"
 DEPEND="${RDEPEND}"
 
-DOCS="
+DOCS=(
 	Documentation/dt-object-internal.txt
 	Documentation/dts-format.txt
 	Documentation/manual.txt
-"
-
-_emake() {
-	# valgrind is used only in 'make checkm'
-	emake \
-		NO_PYTHON=1 \
-		NO_VALGRIND=1 \
-		NO_YAML=$(usex !yaml 1 0) \
-		\
-		AR="$(tc-getAR)" \
-		CC="$(tc-getCC)" \
-		PKG_CONFIG="$(tc-getPKG_CONFIG)" \
-		\
-		V=1 \
-		\
-		PREFIX="${EPREFIX}/usr" \
-		\
-		LIBDIR="\$(PREFIX)/$(get_libdir)" \
-		\
-		"$@"
-}
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e '/^CFLAGS =/s:=:+=:' \
-		-e '/^CPPFLAGS =/s:=:+=:' \
-		-e 's:-Werror::' \
-		-e 's:-g -Os::' \
-		Makefile || die
-
-	tc-export AR CC PKG_CONFIG
-}
-
-src_compile() {
-	_emake
-}
-
-src_test() {
-	_emake check
-}
+)
 
-src_install() {
-	_emake DESTDIR="${D}" install
+src_configure() {
+	local emesonargs=(
+		-Ddefault_library=$(usex static-libs both shared)
+		-Dpython=disabled
+		-Dvalgrind=disabled # only used for some tests
+		$(meson_feature yaml)
+	)
 
-	use static-libs || find "${ED}" -name '*.a' -delete
+	meson_src_configure
 }

diff --git a/sys-apps/dtc/files/dtc-1.7.0-meson-macos.patch b/sys-apps/dtc/files/dtc-1.7.0-meson-macos.patch
new file mode 100644
index 000000000000..473cd9a29e1a
--- /dev/null
+++ b/sys-apps/dtc/files/dtc-1.7.0-meson-macos.patch
@@ -0,0 +1,39 @@
+https://git.kernel.org/pub/scm/utils/dtc/dtc.git/commit/?id=71a8b8ef0adf01af4c78c739e04533a35c1dc89c
+
+From 71a8b8ef0adf01af4c78c739e04533a35c1dc89c Mon Sep 17 00:00:00 2001
+From: Otavio Salvador <otavio@ossystems.com.br>
+Date: Wed, 31 May 2023 11:41:42 -0300
+Subject: libfdt: meson: Fix linking on macOS linker
+
+-undefined error is the equivalent of --no-undefined for the macOS
+linker, but -undefined would also be understood as a valid argument for
+GNU ld so we use the supported linker variant.
+
+Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
+Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
+--- a/libfdt/meson.build
++++ b/libfdt/meson.build
+@@ -16,10 +16,20 @@ sources = files(
+   'fdt_wip.c',
+ )
+ 
++link_args = []
++if cc.has_link_argument('-Wl,--no-undefined')
++    link_args += '-Wl,--no-undefined'
++else
++    # -undefined error is the equivalent of --no-undefined for the macOS linker,
++    # but -undefined would also be understood as a valid argument for GNU ld!
++    link_args += cc.get_supported_link_arguments('-Wl,-undefined,error')
++endif
++
++link_args += version_script
+ libfdt = library(
+   'fdt', sources,
+   version: '1.6.0',
+-  link_args: ['-Wl,--no-undefined', version_script],
++  link_args: link_args,
+   link_depends: 'version.lds',
+   install: true,
+ )
+-- 
+cgit

diff --git a/sys-apps/dtc/files/dtc-1.7.0-meson-tests.patch b/sys-apps/dtc/files/dtc-1.7.0-meson-tests.patch
new file mode 100644
index 000000000000..0bc2d71aea1c
--- /dev/null
+++ b/sys-apps/dtc/files/dtc-1.7.0-meson-tests.patch
@@ -0,0 +1,27 @@
+https://git.kernel.org/pub/scm/utils/dtc/dtc.git/patch/?id=32174a66efa4ad19fc6a2a6422e4af2ae4f055cb
+
+From 32174a66efa4ad19fc6a2a6422e4af2ae4f055cb Mon Sep 17 00:00:00 2001
+From: David Gibson <david@gibson.dropbear.id.au>
+Date: Tue, 28 Feb 2023 10:33:58 +1100
+Subject: meson: Fix cell overflow tests when running from meson
+
+Because meson always builds out-of-tree we need to reference things in the
+original source tree via $SRCDIR from run_tests.sh.  We forgot a couple of
+cases for the cell overflow tests.  Fix them.
+
+Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
+--- a/tests/run_tests.sh
++++ b/tests/run_tests.sh
+@@ -519,8 +519,8 @@ libfdt_tests () {
+     check_tests "$SRCDIR/phandle-args-overflow.dts" clocks_property
+ 
+     ## https://github.com/dgibson/dtc/issues/74
+-    run_dtc_test -I dts -O dtb -o cell-overflow-results.test.dtb cell-overflow-results.dts
+-    run_dtc_test -I dts -O dtb -o cell-overflow.test.dtb cell-overflow.dts
++    run_dtc_test -I dts -O dtb -o cell-overflow-results.test.dtb "$SRCDIR/cell-overflow-results.dts"
++    run_dtc_test -I dts -O dtb -o cell-overflow.test.dtb "$SRCDIR/cell-overflow.dts"
+     run_test dtbs_equal_ordered cell-overflow.test.dtb cell-overflow-results.test.dtb
+ 
+     # check full tests
+-- 
+cgit


^ permalink raw reply related	[flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-06-06  3:20 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-09-02 18:10 [gentoo-commits] repo/gentoo:master commit in: sys-apps/dtc/, sys-apps/dtc/files/ Andreas Sturmlechner
  -- strict thread matches above, loose matches on Subject: below --
2023-06-06  3:20 Sam James

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox