summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNirbheek Chauhan <nirbheek@centricular.com>2016-10-07 23:12:59 +0530
committerNirbheek Chauhan <nirbheek@centricular.com>2016-10-13 03:40:56 +0530
commit94182f84b5ad6c715a70bb90fa6e4b4d488aa3dc (patch)
treef0b01596e2fdef72c10deb8cc2096dd8531c9347
parenta166a4adfb19074204f5da1abaf0a68b8b4070f7 (diff)
osx: Don't build GNU tar in build-tools
We don't even use tar for unpacking, and it seems BSD tar is enough for everything else.
-rw-r--r--cerbero/bootstrap/build_tools.py1
-rw-r--r--recipes/build-tools/tar-fix-configure.patch114
-rw-r--r--recipes/build-tools/tar.recipe13
3 files changed, 0 insertions, 128 deletions
diff --git a/cerbero/bootstrap/build_tools.py b/cerbero/bootstrap/build_tools.py
index 246ee6b8..4d343741 100644
--- a/cerbero/bootstrap/build_tools.py
+++ b/cerbero/bootstrap/build_tools.py
@@ -49,7 +49,6 @@ class BuildTools (BootstrapperBase):
self.BUILD_TOOLS.append('gperf')
if self.config.platform == Platform.DARWIN:
self.BUILD_TOOLS.append('gperf')
- self.BUILD_TOOLS.insert(0, 'tar')
self.BUILD_TOOLS.insert(0, 'xz')
if self.config.platform == Platform.LINUX:
if self.config.distro_version == DistroVersion.UBUNTU_LUCID or \
diff --git a/recipes/build-tools/tar-fix-configure.patch b/recipes/build-tools/tar-fix-configure.patch
deleted file mode 100644
index 46f409e1..00000000
--- a/recipes/build-tools/tar-fix-configure.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-From 7d1d3d38cb66b02c062de77847e3c0ecd842366c Mon Sep 17 00:00:00 2001
-From: Pavel Raiskup <address@hidden>
-Date: Mon, 4 Aug 2014 13:19:49 +0200
-Subject: [PATCH] xattrs: fix bug in configure
-
-Be careful to define HAVE_XATTRS when not all needed xattr-related
-functions are properly defined either in libc or libattr.
-
-Reported independently by Denis Excoffier and Dominyk Tille.
-
-* acinclude.m4 (TAR_HEADERS_ATTR_XATTR_H): Check for each xattr
-function separately. Don't AC_CHECK_LIB (LIBS is filled by
-AC_SEARCH_LIBS when necessary).
-* lib/xattr-at.c: Do not build when HAVE_XATTRS is not defined.
-* src/Makefile.am: The LDADD -lattr was redundant.
----
- acinclude.m4 | 42 ++++++++++++++----------------------------
- lib/xattr-at.c | 7 +++++++
- src/Makefile.am | 4 ----
- 3 files changed, 21 insertions(+), 32 deletions(-)
-
-diff --git a/acinclude.m4 b/acinclude.m4
-index 3b28b3b..db0bbc7 100644
---- a/acinclude.m4
-+++ b/acinclude.m4
-@@ -40,37 +40,23 @@ AC_DEFUN([TAR_HEADERS_ATTR_XATTR_H],
- # First check for <sys/xattr.h>
- AC_CHECK_HEADERS([sys/xattr.h])
- AM_CONDITIONAL([TAR_COND_XATTR_H],[test "$ac_cv_header_sys_xattr_h" = yes])
-- AM_CONDITIONAL([TAR_LIB_ATTR],[false])
-- if test "$ac_cv_header_sys_xattr_h" = yes; then
-- AC_CHECK_FUNCS(getxattr fgetxattr lgetxattr \
-- setxattr fsetxattr lsetxattr \
-- listxattr flistxattr llistxattr,
-- # only when functions are present
-- AC_DEFINE([HAVE_SYS_XATTR_H], [1],
-- [define to 1 if we have <sys/xattr.h> header])
-- if test "$with_xattrs" != no; then
-- AC_DEFINE([HAVE_XATTRS],,[Define when we have working linux xattrs.])
-- fi
-- )
-- fi
--
-- # If <sys/xattr.h> is not found, then check for <attr/xattr.h>
- if test "$ac_cv_header_sys_xattr_h" != yes; then
- AC_CHECK_HEADERS([attr/xattr.h])
- AM_CONDITIONAL([TAR_COND_XATTR_H],[test "$ac_cv_header_attr_xattr_h" = yes])
-- AC_CHECK_LIB([attr],[fgetxattr])
-- AM_CONDITIONAL([TAR_LIB_ATTR],[test "$ac_cv_lib_attr_fgetxattr" = 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
-- )
-+ fi
-+
-+ if test "$with_xattrs" != no; then
-+ for i in getxattr fgetxattr lgetxattr \
-+ setxattr fsetxattr lsetxattr \
-+ listxattr flistxattr llistxattr
-+ do
-+ AC_SEARCH_LIBS($i, attr)
-+ eval found=\$ac_cv_search_$i
-+ test "$found" = "no" && break
-+ done
-+
-+ if test "$found" != no; then
-+ AC_DEFINE([HAVE_XATTRS],,[Define when we have working linux xattrs.])
- fi
- fi
- ])
-diff --git a/lib/xattr-at.c b/lib/xattr-at.c
-index 443ccae..009bde5 100644
---- a/lib/xattr-at.c
-+++ b/lib/xattr-at.c
-@@ -18,6 +18,11 @@
-
- #include <config.h>
-
-+/* Temporarily don't build. We are unable to build on (probably not only)
-+ darwin due to lack of l*xattr callbacks (XATTR_NOFOLLOW is alternative) and
-+ different function definitions. */
-+#ifdef HAVE_XATTRS
-+
- #include "xattr-at.h"
- #include "openat.h"
-
-@@ -108,3 +113,5 @@
- #undef AT_FUNC_RESULT
- #undef AT_FUNC_POST_FILE_PARAM_DECLS
- #undef AT_FUNC_POST_FILE_ARGS
-+
-+#endif
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 82b2d46..42daaef 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -52,7 +52,3 @@ AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS)
- LDADD = ../lib/libtar.a ../gnu/libgnu.a $(LIBINTL) $(LIBICONV)
-
- tar_LDADD = $(LIBS) $(LDADD) $(LIB_CLOCK_GETTIME) $(LIB_EACCESS) $(LIB_SELINUX)
--
--if TAR_LIB_ATTR
--tar_LDADD += -lattr
--endif
---
-1.9.3
-
diff --git a/recipes/build-tools/tar.recipe b/recipes/build-tools/tar.recipe
deleted file mode 100644
index b4c171e3..00000000
--- a/recipes/build-tools/tar.recipe
+++ /dev/null
@@ -1,13 +0,0 @@
-# -*- Mode: Python -*- vi:si:et:sw=4:sts=4:ts=4:syntax=python
-
-
-class Recipe(recipe.Recipe):
- name = 'tar'
- version = '1.28'
- licenses = [License.GPLv3]
- stype = SourceType.TARBALL
- url = 'http://ftp.gnu.org/gnu/tar/tar-1.28.tar.bz2'
- patches = ['tar-fix-configure.patch']
- deps = ['automake']
- autoreconf = True
- files_bins = ['tar']