diff options
Diffstat (limited to 'app-arch')
| -rw-r--r-- | app-arch/xar/Manifest | 1 | ||||
| -rw-r--r-- | app-arch/xar/files/xar-1.8.0.0.452-linux.patch | 72 | ||||
| -rw-r--r-- | app-arch/xar/xar-1.8.0.0.452.ebuild (renamed from app-arch/xar/xar-1.8-r3.ebuild) | 44 |
3 files changed, 101 insertions, 16 deletions
diff --git a/app-arch/xar/Manifest b/app-arch/xar/Manifest index ca6f1ec9cfae..73ada38ef97f 100644 --- a/app-arch/xar/Manifest +++ b/app-arch/xar/Manifest @@ -1,2 +1,3 @@ DIST xar-400.tar.gz 213319 BLAKE2B 55b8695313a1a5ae778b62791f716af00edba7e7b01500eac4b951e04cf7b18e84e0d508ac5471996796e5ab59e4628a4f85a63a5929b372555e28b222c77ab1 SHA512 c54850d5443c776f18d788bf7d026b3b08274ee71321d1615238c9fa2d20cc0b21f3f298364b0d0eecd98ce2a6efc8d5039cabd5a21c2419c430d90db004d159 DIST xar-417.1.tar.gz 219350 BLAKE2B 2ca073e52b8d7a12c3d33fb65ccaf0984b912f42e4e9dc52bcaec7af41bafcc530cd055da16646113fb24ee046122425a66351f88279ef79a0f0b2b04ae51f9a SHA512 4c3c61f5289d0b2e380cbde772b383da369ca8ad046f5d779e02f59300288c90c5e31d105a2c01ac17dc719b8b46b55d8d36a8b3b20360f315766fce92dec762 +DIST xar-452.tar.gz 220690 BLAKE2B 9728c73734a4bcb31e6e72d3d1a6735d5c78e384e15415641c4f40068f2da9498e9808cc36df6eaf7d3addf8be6d9eb90bdfa2900321e4dbe482156075bcdcd7 SHA512 d6ae9e5687020d20ec12579178f84c852fd485c52cff0ad23b7b31d2eabbde8c7fc85ab33e82eb81a5ddb59df4c26b756894be85061195cd191ab32be1f56b10 diff --git a/app-arch/xar/files/xar-1.8.0.0.452-linux.patch b/app-arch/xar/files/xar-1.8.0.0.452-linux.patch new file mode 100644 index 000000000000..8cbe48acc447 --- /dev/null +++ b/app-arch/xar/files/xar-1.8.0.0.452-linux.patch @@ -0,0 +1,72 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -199,7 +199,16 @@ + + AC_CHECK_MEMBERS([struct statfs.f_fstypename],,,[#include <sys/types.h> + #include <sys/param.h> +-#include <sys/mount.h>]) ++#include <sys/mount.h> ++#include <sys/vfs.h>]) ++AC_CHECK_MEMBERS([struct statfs.f_iosize],,,[#include <sys/types.h> ++#include <sys/param.h> ++#include <sys/mount.h> ++#include <sys/vfs.h>]) ++AC_CHECK_MEMBERS([struct statfs.f_bsize],,,[#include <sys/types.h> ++#include <sys/param.h> ++#include <sys/mount.h> ++#include <sys/vfs.h>]) + AC_CHECK_MEMBERS([struct statvfs.f_fstypename],,,[#include <sys/statvfs.h>]) + AC_CHECK_MEMBERS([struct stat.st_flags]) + +--- a/lib/util.c ++++ b/lib/util.c +@@ -40,6 +40,7 @@ + #include <sys/types.h> + #include <sys/mount.h> + #include <sys/param.h> ++#include <sys/vfs.h> + #include <arpa/inet.h> + #include <string.h> + #include <unistd.h> +@@ -467,6 +467,14 @@ + return tmp; + } + ++#ifndef HAVE_STRUCT_STATFS_F_IOSIZE ++# ifdef HAVE_STRUCT_STATFS_F_BSIZE ++# define f_iosize f_bsize ++# else ++# error need a field to get optimal transfer block size ++# endif ++#endif ++ + size_t xar_optimal_io_size_at_path(const char *path) + { + // Start at 1MiB +@@ -491,6 +491,7 @@ + fs_iosize = optimal_rsize; + } + ++#ifdef MNT_LOCAL + // If we're a remote filesystem, never let us go below the optimal size above of 1MiB + // NFS is horrible and lies that the optimal size is 512 bytes. + // Whereas SMB in my testing returns 7MiBs (far more practicle) +@@ -503,6 +504,7 @@ + } + } + else ++#endif + { + optimal_rsize = fs_iosize; + } +--- a/include/config.h.in ++++ b/include/config.h.in +@@ -15,6 +15,8 @@ + #undef HAVE_STRUCT_STAT_ST_FLAGS + #undef HAVE_STRUCT_STATVFS_F_FSTYPENAME + #undef HAVE_STRUCT_STATFS_F_FSTYPENAME ++#undef HAVE_STRUCT_STATFS_F_IOSIZE ++#undef HAVE_STRUCT_STATFS_F_BSIZE + #undef HAVE_SYS_ACL_H + #undef HAVE_LIBUTIL_H + #undef HAVE_LIBPTHREAD diff --git a/app-arch/xar/xar-1.8-r3.ebuild b/app-arch/xar/xar-1.8.0.0.452.ebuild index c7375f6ef613..4324f627e65a 100644 --- a/app-arch/xar/xar-1.8-r3.ebuild +++ b/app-arch/xar/xar-1.8.0.0.452.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -inherit flag-o-matic toolchain-funcs multilib-minimal multilib +EAPI=7 +inherit autotools flag-o-matic toolchain-funcs multilib-minimal multilib -APPLE_PV=417.1 +APPLE_PV=$(ver_cut 5) # 452: macOS 11.0.1 and up DESCRIPTION="An easily extensible archive format" HOMEPAGE="https://opensource.apple.com/source/xar/" SRC_URI="https://opensource.apple.com/tarballs/xar/xar-${APPLE_PV}.tar.gz" @@ -12,27 +12,24 @@ SRC_URI="https://opensource.apple.com/tarballs/xar/xar-${APPLE_PV}.tar.gz" LICENSE="BSD-2" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="kernel_Darwin" -RDEPEND=" - !kernel_Darwin? ( - !kernel_SunOS? ( virtual/acl ) - dev-libs/openssl:0=[${MULTILIB_USEDEP}] - ) +DEPEND=" + elibc_musl? ( sys-libs/fts-standalone ) + kernel_linux? ( virtual/acl ) + dev-libs/openssl:0=[${MULTILIB_USEDEP}] app-arch/bzip2[${MULTILIB_USEDEP}] sys-libs/zlib[${MULTILIB_USEDEP}] dev-libs/libxml2[${MULTILIB_USEDEP}] " -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" +RDEPEND="${DEPEND}" +BDEPEND="virtual/pkgconfig" PATCHES=( "${FILESDIR}"/${PN}-1.6.1-ext2.patch "${FILESDIR}"/${PN}-1.8-safe_dirname.patch "${FILESDIR}"/${PN}-1.8-arm-ppc.patch "${FILESDIR}"/${PN}-1.8-openssl-1.1.patch + "${FILESDIR}"/${PN}-1.8.0.0.452-linux.patch ) S=${WORKDIR}/${PN}-${APPLE_PV}/${PN} @@ -53,13 +50,28 @@ src_prepare() { # ebuild env, causing the install phase to re-compile xar.o and link # the executable echo ".PRECIOUS: @objroot@src/%.o" >> Makefile.inc.in || die + + # drop Darwin specific reliance on CommonCrypto Framework, for it + # depends on what version of Darwin we're on, and it is much simpler + # to just use openessl instead, which we maintain and control + cd "${S}" || die + sed -i -e 's/__APPLE__/__NO_APPLE__/' \ + include/archive.h \ + lib/hash.c \ + || die + + # fix branding somewhat + sed -i -e "/XAR_VERSION/s|%s|%s (Gentoo ${PVR})|" src/xar.c || die + + eautoreconf } multilib_src_configure() { - use kernel_Darwin || append-libs $($(tc-getPKG_CONFIG) --libs openssl) + append-libs $($(tc-getPKG_CONFIG) --libs openssl) + use elibc_musl && append-libs $($(tc-getPKG_CONFIG) --libs fts-standalone) + append-cflags -Wno-unused-result # allow to see real problems ECONF_SOURCE=${S} \ - econf \ - --disable-static + econf --disable-static # botched check, fix it up if use kernel_SunOS ; then sed -i -e '/HAVE_SYS_ACL_H/s:^\(.*\)$:/* \1 */:' include/config.h || die |