From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E84C9158088 for ; Sun, 28 Nov 2021 12:04:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A39632BC065; Sun, 28 Nov 2021 12:04:58 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 164D42BC029 for ; Sun, 28 Nov 2021 12:04:58 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 25285342DFC for ; Sun, 28 Nov 2021 12:04:57 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 33F881E4 for ; Sun, 28 Nov 2021 12:04:55 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1638101086.b984690b5120262b132d653809e92e54e4f237d6.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/umockdev/files/, dev-util/umockdev/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/umockdev/Manifest dev-util/umockdev/files/umockdev-0.12.1-preload-Declare-__xstat-prototypes-for-glibc-2.32.90.patch dev-util/umockdev/umockdev-0.12.1.ebuild X-VCS-Directories: dev-util/umockdev/files/ dev-util/umockdev/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: b984690b5120262b132d653809e92e54e4f237d6 X-VCS-Branch: master Date: Sun, 28 Nov 2021 12:04:55 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 27750c59-f2fe-4fbc-8bf7-0d776fad2f91 X-Archives-Hash: e2dd8beb86cb205d4255272896e84982 commit: b984690b5120262b132d653809e92e54e4f237d6 Author: Andreas Sturmlechner gentoo org> AuthorDate: Fri Nov 26 09:34:53 2021 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Nov 28 12:04:46 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b984690b dev-util/umockdev: Drop 0.12.1 Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-util/umockdev/Manifest | 1 - ...lare-__xstat-prototypes-for-glibc-2.32.90.patch | 42 ---------------- dev-util/umockdev/umockdev-0.12.1.ebuild | 57 ---------------------- 3 files changed, 100 deletions(-) diff --git a/dev-util/umockdev/Manifest b/dev-util/umockdev/Manifest index 0ce3fdf45d72..dc53898428da 100644 --- a/dev-util/umockdev/Manifest +++ b/dev-util/umockdev/Manifest @@ -1,3 +1,2 @@ -DIST umockdev-0.12.1.tar.xz 756920 BLAKE2B a8c1d9734f4c0a8e7f19405e011ce964efce6621b4886efead88e040bfe07d2f5a85f063977dfed1c8fb5a5bf4668024b6e687b688a9609cdba1db419518a8ac SHA512 a8995d09179c7d2d37d319f8e675fb15c3caa605c57b56cbb2e785088909d886e790864475feb82ab2b6eb2449038c636a06250d4f9eb8b28b38f0d80574824c DIST umockdev-0.16.1.tar.xz 478308 BLAKE2B 3d49ca1d9c9b7573ac63f5f7ecd81071041597732b507619c333379095434ac55eb26f16bdf5897b94bbeb5c307a34b703accd220cd6202482e172dd3a6d1983 SHA512 baeaf05cc6b8d8e2a5cae16b808db759a18a969cea0f2ceed5f6c2521edc0c4c07dc16265a4821051de51f4314fd39d63ebf2da124fcd3e103ec743dadfedaa8 DIST umockdev-0.16.2.tar.xz 478388 BLAKE2B 8fb2116ec7d48b238898052d959c596f4f91a65cf7b8292de8b8731e6fe50600282cb56093b8d6ca1afdc082a12c9af3c4a4f443283538ffb2aeae4c2b775596 SHA512 82020c068d5a158a762f865f4b25d1ee8596785a5b379c316c652004e1b1b9c533d4dad87818a490f89983a4c065f34e4ff5ca91360bac6d79b141dfa2139eea diff --git a/dev-util/umockdev/files/umockdev-0.12.1-preload-Declare-__xstat-prototypes-for-glibc-2.32.90.patch b/dev-util/umockdev/files/umockdev-0.12.1-preload-Declare-__xstat-prototypes-for-glibc-2.32.90.patch deleted file mode 100644 index 15f5ddbe99c0..000000000000 --- a/dev-util/umockdev/files/umockdev-0.12.1-preload-Declare-__xstat-prototypes-for-glibc-2.32.90.patch +++ /dev/null @@ -1,42 +0,0 @@ -From f1b416400479d861deffb4c5a40422dcdf190e85 Mon Sep 17 00:00:00 2001 -From: Martin Pitt -Date: Fri, 23 Oct 2020 14:58:50 +0200 -Subject: [PATCH] =?UTF-8?q?preload:=20Declare=20=5F=5Fxstat*()=20prototype?= - =?UTF-8?q?s=20for=20glibc=20=E2=89=A5=202.32.9000?= -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Recent glibc deprecated/dropped the `__xstat*()` family from the header -files, so the build started to fail on "no previous prototype". However, -umockdev still needs needs to keep the wrappers to run programs that got -built against an earlier glibc. - -Thus declare the prototype explicitly. It should still fail to build if -glibc defines it differently. - -Fixes #108 ---- - src/libumockdev-preload.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/src/libumockdev-preload.c b/src/libumockdev-preload.c -index 9328dc1..9bbec62 100644 ---- a/src/libumockdev-preload.c -+++ b/src/libumockdev-preload.c -@@ -1215,8 +1215,11 @@ int prefix ## stat ## suffix (const char *path, struct stat ## suffix *st) \ - - /* wrapper template for __xstat family; note that we abuse the sticky bit in - * the emulated /dev to indicate a block device (the sticky bit has no -- * real functionality for device nodes) */ -+ * real functionality for device nodes) -+ * This family got deprecated/dropped in glibc 2.32.9000, but we still need -+ * to keep it for a while for programs that were built against previous versions */ - #define WRAP_VERSTAT(prefix, suffix) \ -+int prefix ## stat ## suffix (int ver, const char *path, struct stat ## suffix *st); \ - int prefix ## stat ## suffix (int ver, const char *path, struct stat ## suffix *st) \ - { \ - const char *p; \ --- -2.31.1 - diff --git a/dev-util/umockdev/umockdev-0.12.1.ebuild b/dev-util/umockdev/umockdev-0.12.1.ebuild deleted file mode 100644 index e1f360c4d6e0..000000000000 --- a/dev-util/umockdev/umockdev-0.12.1.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python3_{7..9} ) - -inherit multilib-minimal python-any-r1 - -DESCRIPTION="Mock hardware devices for creating unit tests" -HOMEPAGE="https://github.com/martinpitt/umockdev/" -SRC_URI="https://github.com/martinpitt/umockdev/releases/download/${PV}/${P}.tar.xz" - -LICENSE="LGPL-2.1+" -SLOT="0" -KEYWORDS="amd64 ~arm64 ~ppc64 x86" -IUSE="+introspection static-libs test" -RESTRICT="!test? ( test )" - -RDEPEND=" - virtual/libudev:=[${MULTILIB_USEDEP}] - >=dev-libs/glib-2.32:2[${MULTILIB_USEDEP}] - introspection? ( >=dev-libs/gobject-introspection-1.32:= ) -" -DEPEND="${RDEPEND} - test? ( - ${PYTHON_DEPS} - ) - app-arch/xz-utils - dev-libs/libgudev[${MULTILIB_USEDEP}] - >=dev-util/gtk-doc-am-1.14 - virtual/pkgconfig -" - -# Tests seem to hang forever -# RESTRICT="test" - -PATCHES=( - "${FILESDIR}"/${P}-preload-Declare-__xstat-prototypes-for-glibc-2.32.90.patch -) - -pkg_setup() { - use test && python-any-r1_pkg_setup -} - -multilib_src_configure() { - local ECONF_SOURCE="${S}" - econf \ - --disable-gtk-doc \ - $(multilib_native_use_enable introspection) \ - $(use_enable static-libs static) \ - VALAC="$(type -P true)" -} - -multilib_src_install_all() { - einstalldocs - find "${D}" -name '*.la' -delete || die -}