diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2014-08-12 12:17:03 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2014-08-12 12:17:03 +0000 |
| commit | d90bed16c1dac2da32fcb77acd400208881ee1f5 (patch) | |
| tree | 61c24876d5bd18813e55b6d0d7320a7d9df29f95 /app-arch | |
| parent | require autoconf-2.69 now that it is stable for a while #507374 (diff) | |
| download | gentoo-2-d90bed16c1dac2da32fcb77acd400208881ee1f5.tar.gz gentoo-2-d90bed16c1dac2da32fcb77acd400208881ee1f5.tar.bz2 gentoo-2-d90bed16c1dac2da32fcb77acd400208881ee1f5.zip | |
Do not patch m4 files to avoid regenerating autotools #516166 by Rodrigo Severo.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Diffstat (limited to 'app-arch')
| -rw-r--r-- | app-arch/tar/ChangeLog | 7 | ||||
| -rw-r--r-- | app-arch/tar/files/tar-1.27.1-xattr_build_fix.patch | 43 |
2 files changed, 6 insertions, 44 deletions
diff --git a/app-arch/tar/ChangeLog b/app-arch/tar/ChangeLog index 410e985ab748..ec18a0bfeffa 100644 --- a/app-arch/tar/ChangeLog +++ b/app-arch/tar/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-arch/tar # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/tar/ChangeLog,v 1.208 2014/08/03 14:22:07 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/tar/ChangeLog,v 1.209 2014/08/12 12:17:03 vapier Exp $ + + 12 Aug 2014; Mike Frysinger <vapier@gentoo.org> + files/tar-1.27.1-xattr_build_fix.patch: + Do not patch m4 files to avoid regenerating autotools #516166 by Rodrigo + Severo. 03 Aug 2014; Lars Wendler <polynomial-c@gentoo.org> tar-1.28.ebuild: Prefer shipped man page over external one (bug #518932). diff --git a/app-arch/tar/files/tar-1.27.1-xattr_build_fix.patch b/app-arch/tar/files/tar-1.27.1-xattr_build_fix.patch index b3e39f30b17e..14cf90a5f4cc 100644 --- a/app-arch/tar/files/tar-1.27.1-xattr_build_fix.patch +++ b/app-arch/tar/files/tar-1.27.1-xattr_build_fix.patch @@ -1,49 +1,6 @@ http://lists.gnu.org/archive/html/bug-tar/2013-12/msg00023.html https://bugs.gentoo.org/489170 ---- tar-1.27.1/acinclude.m4 2013-03-14 21:18:09.000000000 +0100 -+++ tar-1.27.1/acinclude.m4 2013-03-14 21:18:09.000000000 +0100 -@@ -37,18 +37,27 @@ - [], [with_xattrs=maybe] - ) - -- AC_CHECK_HEADERS([attr/xattr.h]) -- AM_CONDITIONAL([TAR_COND_XATTR_H],[test "$ac_cv_header_attr_xattr_h" = yes]) -- if test "$ac_cv_header_attr_xattr_h" = yes; then -- AC_CHECK_FUNCS(getxattr fgetxattr lgetxattr \ -- setxattr fsetxattr lsetxattr \ -- listxattr flistxattr llistxattr, -- # only when functions are present -- AC_DEFINE([HAVE_ATTR_XATTR_H], [1], -- [define to 1 if we have <attr/xattr.h> header]) -- if test "$with_xattrs" != no; then -- AC_DEFINE([HAVE_XATTRS],,[Define when we have working linux xattrs.]) -- fi -- ) -+ AC_CHECK_HEADERS([sys/xattr.h attr/xattr.h]) -+ AM_CONDITIONAL([TAR_COND_XATTR_H], -+ [test "$ac_cv_header_sys_xattr_h" = yes -o "$ac_cv_header_attr_xattr_h" = yes]) -+ -+ if test "$with_xattrs" != no; then -+ # If <sys/xattr.h> doesn't exist and <attr/xattr.h> does, -+ # then link against libattr.so and not libc -+ if test "$ac_cv_header_sys_xattr_h" = no -a "$ac_cv_header_attr_xattr_h" = yes; then -+ AC_CHECK_LIB([attr],[fgetxattr]) -+ fi -+ have_functions=yes -+ for xattr_func in getxattr fgetxattr lgetxattr \ -+ setxattr fsetxattr lsetxattr \ -+ listxattr flistxattr llistxattr; do \ -+ AC_SEARCH_LIBS([$xattr_func], [attr],, [have_functions=no]) -+ test $have_functions = no && break -+ done -+ if test $have_functions = yes; then -+ AC_DEFINE([HAVE_XATTRS],[1],[Define when we have working linux xattrs.]) -+ else -+ test "$with_xattrs" = yes && AC_MSG_ERROR([xattr support requested but not found.]) -+ fi - fi - ]) --- tar-1.27.1/configure 2013-11-17 17:18:39.000000000 +0100 +++ tar-1.27.1/configure 2013-11-17 17:18:39.000000000 +0100 @@ -33619,19 +33619,20 @@ |