sys-apps/attr: add attr/xattr.h include shim #648864

This will let us upgrade attr while other packages get around to
fixing their source.

Bug: https://bugs.gentoo.org/648864
This commit is contained in:
Mike Frysinger
2018-06-18 22:50:24 -04:00
parent d137c82c35
commit 90944e2f1f
4 changed files with 20 additions and 11 deletions
-6
View File
@@ -531,12 +531,6 @@ sys-libs/uclibc
# mpv >= 0.28.0 requires currently masked ffmpeg >= 4.0.
>=media-video/mpv-0.28.0
# Richard Freeman <rich0@gentoo.org> (09 Jan 2018)
# Bug 644048 - temp QA mask until it can get sorted out
# Lars Wendler <polynomial-c@gentoo.org> (26 Feb 2018)
# See also tracker bug: https://bugs.gentoo.org/648864
~sys-apps/attr-2.4.48
# Lars Wendler <polynomial-c@gentoo.org> (10 Jan 2018)
# Mask followup bugfixes for =sys-apps/attr-2.4.48 as well until proper
# testing has been conducted.
@@ -1,7 +1,7 @@
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
EAPI="6"
inherit libtool ltprune toolchain-funcs multilib-minimal
@@ -39,7 +39,8 @@ multilib_src_configure() {
local myeconfargs=(
--bindir="${EPREFIX}"/bin
--enable-shared $(use_enable static-libs static)
--enable-shared
$(use_enable static-libs static)
$(use_enable nls)
--libexecdir="${EPREFIX}"/usr/$(get_libdir)
$(use_enable debug)
@@ -53,6 +54,10 @@ multilib_src_install() {
if multilib_is_native_abi; then
# we install attr into /bin, so we need the shared lib with it
gen_usr_ldscript -a attr
# Add a wrapper until people upgrade.
insinto /usr/include/attr
newins "${FILESDIR}"/xattr-shim.h xattr.h
fi
}
@@ -1,13 +1,17 @@
From 406eab7aa09da9df787a964d3c152c0bda6e23c4 Mon Sep 17 00:00:00 2001
From: Troy Dawson <tdawson@redhat.com>
Date: Mon, 24 Jul 2017 14:42:06 +0200
Subject: [PATCH attr] test: escape left brace in a regex in test/run
... to fix test-suite failure with perl-5.26.0
Bug: https://bugzilla.redhat.com/1473853
Upstream: http://lists.nongnu.org/archive/html/acl-devel/2017-07/msg00001.html
---
test/run | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/test/run b/test/run
index 4b1f8d0..07e916c 100755
index 4b1f8d0d6134..07e916c41947 100755
--- a/test/run
+++ b/test/run
@@ -106,7 +106,7 @@ for (;;) {
@@ -20,4 +24,4 @@ index 4b1f8d0..07e916c 100755
if (defined $line) {
if ($line =~ s/^\s*< ?//) {
--
2.13.0
2.16.1
+6
View File
@@ -0,0 +1,6 @@
/* Small shim until we update all packages. */
#ifndef __XATTR_H__
#define __XATTR_H__
#include <sys/xattr.h>
#warning "Please change your <attr/xattr.h> includes to <sys/xattr.h>"
#endif