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 83B9E158086 for ; Wed, 24 Nov 2021 17:44:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6EFCD2BC001; Wed, 24 Nov 2021 17:44:22 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 44C10E084A for ; Wed, 24 Nov 2021 17:44:22 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3F903343395 for ; Wed, 24 Nov 2021 17:44:21 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A90DF1DC for ; Wed, 24 Nov 2021 17:44:19 +0000 (UTC) From: "Marek Szuba" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Marek Szuba" Message-ID: <1637775852.6c663abb66064ad670526a0765ea16e081ba0bcc.marecki@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/lockdev/files/, dev-libs/lockdev/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/lockdev/files/lockdev-1.0.3-add-autotools.patch dev-libs/lockdev/files/lockdev-1.0.3-major-minor.patch dev-libs/lockdev/lockdev-1.0.3.1.2-r4.ebuild X-VCS-Directories: dev-libs/lockdev/files/ dev-libs/lockdev/ X-VCS-Committer: marecki X-VCS-Committer-Name: Marek Szuba X-VCS-Revision: 6c663abb66064ad670526a0765ea16e081ba0bcc X-VCS-Branch: master Date: Wed, 24 Nov 2021 17:44:19 +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: 7d87ec5e-8f81-40b2-876b-4b2f5c6ffd54 X-Archives-Hash: 124a36b1939d48046193fc03aba254c3 commit: 6c663abb66064ad670526a0765ea16e081ba0bcc Author: Marek Szuba gentoo org> AuthorDate: Wed Nov 24 17:42:15 2021 +0000 Commit: Marek Szuba gentoo org> CommitDate: Wed Nov 24 17:44:12 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c663abb dev-libs/lockdev: do not hardcode glibc-specific major() and minor() Bug: https://bugs.gentoo.org/718062 Signed-off-by: Marek Szuba gentoo.org> .../files/lockdev-1.0.3-add-autotools.patch | 5 ++++- .../lockdev/files/lockdev-1.0.3-major-minor.patch | 24 ++++++++++++++++++++++ dev-libs/lockdev/lockdev-1.0.3.1.2-r4.ebuild | 1 + 3 files changed, 29 insertions(+), 1 deletion(-) diff --git a/dev-libs/lockdev/files/lockdev-1.0.3-add-autotools.patch b/dev-libs/lockdev/files/lockdev-1.0.3-add-autotools.patch index 4343528d9860..01551f56295d 100644 --- a/dev-libs/lockdev/files/lockdev-1.0.3-add-autotools.patch +++ b/dev-libs/lockdev/files/lockdev-1.0.3-add-autotools.patch @@ -30,7 +30,7 @@ Updated by Jonathan Callen 2009-09-11 + done --- a/configure.ac +++ b/configure.ac -@@ -0,0 +1,22 @@ +@@ -0,0 +1,25 @@ +AC_INIT([lockdev], [1.0.3], [BUG-REPORT-ADDRESS]) +AC_CONFIG_AUX_DIR([scripts]) +AM_INIT_AUTOMAKE @@ -51,5 +51,8 @@ Updated by Jonathan Callen 2009-09-11 +# Checks for programs. +AC_PROG_LN_S + ++AC_HEADER_MAJOR ++ ++AC_CONFIG_HEADERS([config.h]) +AC_CONFIG_FILES([Makefile]) +AC_OUTPUT diff --git a/dev-libs/lockdev/files/lockdev-1.0.3-major-minor.patch b/dev-libs/lockdev/files/lockdev-1.0.3-major-minor.patch new file mode 100644 index 000000000000..8a47137f8aee --- /dev/null +++ b/dev-libs/lockdev/files/lockdev-1.0.3-major-minor.patch @@ -0,0 +1,24 @@ +--- a/src/lockdev.c ++++ b/src/lockdev.c +@@ -123,13 +123,17 @@ + #include + #include + #include +-#if defined (__GNU_LIBRARY__) ++ ++#include "config.h" ++#if defined (MAJOR_IN_MKDEV) ++# include ++#elif defined (MAJOR_IN_SYSMACROS) + # include +-# define MAJOR(dev) gnu_dev_major (dev) +-# define MINOR(dev) gnu_dev_minor (dev) + #else +-# error "put here a define for MAJOR and MINOR" ++# error "include here the header file defining major() and minor()" + #endif ++#define MAJOR(dev) major (dev) ++#define MINOR(dev) minor (dev) + + #include "lockdev.h" + diff --git a/dev-libs/lockdev/lockdev-1.0.3.1.2-r4.ebuild b/dev-libs/lockdev/lockdev-1.0.3.1.2-r4.ebuild index c19c3c4a5609..49560227160a 100644 --- a/dev-libs/lockdev/lockdev-1.0.3.1.2-r4.ebuild +++ b/dev-libs/lockdev/lockdev-1.0.3.1.2-r4.ebuild @@ -30,6 +30,7 @@ PATCHES=( "${WORKDIR}/${DEB_P}.diff" "${FILESDIR}/${MY_P}-add-autotools.patch" "${FILESDIR}/${MY_P}-fix-perl.patch" + "${FILESDIR}/${MY_P}-major-minor.patch" ) PERL_S=./LockDev