From 996d1cba721b044876526a7f3c1d2ef1fcc90bb4 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 6 Jun 2023 09:39:06 +0100 Subject: gentoo auto-resync : 06:06:2023 - 09:39:05 --- sys-apps/Manifest.gz | Bin 49524 -> 49523 bytes sys-apps/dtc/Manifest | 6 ++- sys-apps/dtc/dtc-1.7.0.ebuild | 61 +++++++++++++++++++++ sys-apps/dtc/dtc-9999.ebuild | 72 ++++++++----------------- sys-apps/dtc/files/dtc-1.7.0-meson-macos.patch | 39 ++++++++++++++ sys-apps/dtc/files/dtc-1.7.0-meson-tests.patch | 27 ++++++++++ 6 files changed, 155 insertions(+), 50 deletions(-) create mode 100644 sys-apps/dtc/dtc-1.7.0.ebuild create mode 100644 sys-apps/dtc/files/dtc-1.7.0-meson-macos.patch create mode 100644 sys-apps/dtc/files/dtc-1.7.0-meson-tests.patch (limited to 'sys-apps') diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz index ea6c9e5a26ff..d59e18c3ce86 100644 Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ diff --git a/sys-apps/dtc/Manifest b/sys-apps/dtc/Manifest index 68218ec5df7a..3994e063817f 100644 --- a/sys-apps/dtc/Manifest +++ b/sys-apps/dtc/Manifest @@ -1,4 +1,8 @@ +AUX dtc-1.7.0-meson-macos.patch 1303 BLAKE2B 1b479891e150a990fb560aac8e74604ee97373ab7bb26f3171552bcad6c8c649e0c4a57630ab85bdcff1cf49c7318a3e154112be65e70a2fd078774d4ed17ed1 SHA512 ff70b6396410ad45dd49fb83cf2762ba081a8f221e9713934497b562b119951f0a50eb041680ba2318059537af54015047aacf03f38259005cfb86b0f002961f +AUX dtc-1.7.0-meson-tests.patch 1265 BLAKE2B f121b676e2f711e6be75ff4f2c7a077b7e9efd682cd29dea08135958e8c9f29ce9b4ff42c1bfc22d77927d749d44264647e47e49d260a7760151fa1dae93648b SHA512 4afb9bc6b2615ba58ae5d997807563ec8672a9253a9d5a15ea5ed476ab1cf80229de3ca0289f2b016c31d6bb9adc2ecae46d004425244cc699768159b8929761 DIST dtc-1.6.0.tar.xz 158584 BLAKE2B 47b15b5df7f5d87369d6daaad87f2989a80865f2fab19f89d050d390a9f8319bcd86a36e12f7cc8d62947bb4d1335769071d0e3ea0a6e16861aea163e78f4696 SHA512 15433b24f1d6b7ed1f8066d050bd1bcbf988731aa38147564e3dd04b5f69af8d69e03befdc621a768526c620425a9bdd24aad4f9ff135930d6a1eeb0625f7de3 +DIST dtc-1.7.0.tar.xz 165548 BLAKE2B de433a1034b7ef75559bf39f85695d0b275cfd17bf100c12b6186e226a65659053f9b5a053f20e64a5a0670ea3e728edd0e624c26287bd264594569408065bab SHA512 d3ba6902a9a2f2cdbaff55f12fca3cfe4a1ec5779074a38e3d8b88097c7abc981835957e8ce72971e10c131e05fde0b1b961768e888ff96d89e42c75edb53afb EBUILD dtc-1.6.0.ebuild 1492 BLAKE2B 957458c9146b49b9b2955a657ec63dbc152730b35012ff5ac6e9160fd4950af173878aa3922a3d73217f4e4fb29436443984b6fcddc94e71110e4d5c75e4149d SHA512 0161cd769f265b60e458e945e780181b91efeaf1c16f7f38149f6488bcf8167381d0fa820b8aebfd15fd1c5bd4be773a852621fd6ceae58c7e17ba9d92f98f45 -EBUILD dtc-9999.ebuild 1491 BLAKE2B 0e32c26a21d959dc9e8cc6682bd985e7ddd0a20cd7235cbdf730812eaba9084e6b126e3cde82892c4e28c40a9b9543fd52eda0537862c9b1f3fb54c8208dd619 SHA512 f284b5a19b9589f3c6c8aaaa305a5d10cfa753f0085e389d1a2539fc7badc71e9f6acfb090bc7884948640e65184a97db2c3ddaa605835de67352bf1f8878540 +EBUILD dtc-1.7.0.ebuild 1287 BLAKE2B 7d2c6b74ff73e622efbb4c7c8fdac1ac56024146faefeb36491ef139e09bc224d1b0f8ba2d6027267be137a554d1d9d56d847e082a3b969eb492882622641b07 SHA512 71653acdd0790fc9d9fc8218d2a7914a1ace2abfd0a23ff2b8e5dc5fd9eb86dcc46e537792f77fe15a0b13576daec2805a41c62deefd5c8b3cc61490ca165b5d +EBUILD dtc-9999.ebuild 1206 BLAKE2B d4ac187a42e2229e08d874caff22528f519c4a9b7aaf23a4d3b1c00e8f4d38f49265402a073873559278bf940b8988da704ed818c9ee24fa64a178ff6da162f8 SHA512 018cb68787651cd419b9962be649926cf1614f5d18d5e7edb0dda1556b8ddcf9a1ad5cf2ad668b8aabe36c6fe79329be36906f91d8216e151fb75402bdec6732 MISC metadata.xml 492 BLAKE2B dc331e157119b6db3bb419e04722511406295b39ee40bcae29dbbe3f8fa3737aa221c2d61b16b45b8361c1b6ffadd634ffa65377d33cc808d11a8128389bdfd0 SHA512 cf2441cf6ea1075cf633edf903a54a637cbaff2545ccd65290c1c1b3f5452ce3d74df5ce4ffe68ab15857eaea1ffeac7f3e80b42fb4dae3af1c3636e4b0766fb 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..117f6b36238e --- /dev/null +++ b/sys-apps/dtc/dtc-1.7.0.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit meson + +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://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 test yaml" +RESTRICT="!test? ( test )" + +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_prepare() { + default + + if ! use test ; then + sed -i -e "/subdir('tests')/d" meson.build || die + fi +} + +src_configure() { + local emesonargs=( + -Ddefault_library=$(usex static-libs both shared) + -Dpython=disabled + -Dtools=true + -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..ce10f9e3b775 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 -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/dtc/dtc.git" +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://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" @@ -18,65 +18,39 @@ HOMEPAGE="https://devicetree.org/ https://git.kernel.org/cgit/utils/dtc/dtc.git/ LICENSE="GPL-2" SLOT="0" -IUSE="static-libs yaml" +IUSE="static-libs test yaml" +RESTRICT="!test? ( test )" BDEPEND=" sys-devel/bison 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 + if ! use test ; then + sed -i -e "/subdir('tests')/d" meson.build || die + fi } -src_install() { - _emake DESTDIR="${D}" install +src_configure() { + local emesonargs=( + -Ddefault_library=$(usex static-libs both shared) + -Dpython=disabled + -Dtools=true + -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 +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 +Signed-off-by: David Gibson +--- 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 +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 +--- 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 -- cgit v1.2.3