mirror of
https://github.com/flatcar/scripts.git
synced 2025-09-30 18:12:08 +02:00
sys-apps/diffutils: Sync with Gentoo
It's from Gentoo commit b735b055d4a7974ed211d87b8bd8769d55a7e9ba.
This commit is contained in:
Krzesimir Nowak
parent
f1a1d0180f
commit
63d7a4f410
@ -1,2 +1,2 @@
|
||||
DIST diffutils-3.7.tar.xz 1448828 BLAKE2B d9f115e0ec9b2499545a3bef4e469fb7786d4a95e0a1c8459c885c53e8b1dc797027979e42c53c2a7df4e1e224942bd9ce5214813977af2bcc67f0698ea0c647 SHA512 7b12cf8aea1b9844773748f72272d9c6a38adae9c3c3a8c62048f91fb56c60b76035fa5f51665dceaf2cfbf1d1f4a3efdcc24bf47a5a16ff4350543314b12c9c
|
||||
DIST diffutils-3.8.tar.xz 1585120 BLAKE2B 573abbfba55c62ba30d2084ca68860e9681cfe92648407f7fb04e1aaed2e4719e2fb5a29cf25bd125d762f4dfd52f85ee91f2ec19b099365bada7fe27a0394af SHA512 279441270987e70d5ecfaf84b6285a4866929c43ec877e50f154a788858d548a8a316f2fc26ad62f7348c8d289cb29a09d06dfadce1806e3d8b4ea88c8b1aa7c
|
||||
DIST diffutils-3.8.tar.xz.sig 833 BLAKE2B 439d331d9839d8b434b7192c52628bc9e8e1c11cada28170f85c9390abc3e5e9ea86aee696a4f9260552133053194680ff54b960ed539fabec85fdff54dee3a2 SHA512 0464ac89209411993800666b45ff90243d22fbda53bf1d71c6870d565b39cc8d9c54c141b9d297a181ce74ad8fb5313953f416bced179ff7728a52a3e9a4f5a5
|
||||
|
||||
@ -1,43 +0,0 @@
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit flag-o-matic
|
||||
|
||||
DESCRIPTION="Tools to make diffs and compare files"
|
||||
HOMEPAGE="https://www.gnu.org/software/diffutils/"
|
||||
SRC_URI="mirror://gnu/diffutils/${P}.tar.xz
|
||||
https://alpha.gnu.org/gnu/diffutils/${P}.tar.xz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
IUSE="nls static"
|
||||
|
||||
BDEPEND="nls? ( sys-devel/gettext )"
|
||||
|
||||
DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
|
||||
|
||||
src_configure() {
|
||||
use static && append-ldflags -static
|
||||
|
||||
# Disable automagic dependency over libsigsegv; see bug #312351.
|
||||
export ac_cv_libsigsegv=no
|
||||
|
||||
# required for >=glibc-2.26, bug #653914
|
||||
use elibc_glibc && export gl_cv_func_getopt_gnu=yes
|
||||
|
||||
local myeconfargs=(
|
||||
--with-packager="Gentoo"
|
||||
--with-packager-version="${PVR}"
|
||||
--with-packager-bug-reports="https://bugs.gentoo.org/"
|
||||
$(use_enable nls)
|
||||
)
|
||||
econf "${myeconfargs[@]}"
|
||||
}
|
||||
|
||||
src_test() {
|
||||
# explicitly allow parallel testing
|
||||
emake check
|
||||
}
|
||||
@ -1,21 +1,42 @@
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Copyright 1999-2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit flag-o-matic
|
||||
VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/diffutils.asc
|
||||
inherit flag-o-matic verify-sig
|
||||
|
||||
DESCRIPTION="Tools to make diffs and compare files"
|
||||
HOMEPAGE="https://www.gnu.org/software/diffutils/"
|
||||
SRC_URI="mirror://gnu/diffutils/${P}.tar.xz
|
||||
https://alpha.gnu.org/gnu/diffutils/${P}.tar.xz"
|
||||
https://alpha.gnu.org/gnu/diffutils/${P}.tar.xz
|
||||
verify-sig? (
|
||||
mirror://gnu/diffutils/${P}.tar.xz.sig
|
||||
https://alpha.gnu.org/gnu/diffutils/${P}.tar.xz.sig
|
||||
)"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
IUSE="nls static"
|
||||
|
||||
BDEPEND="nls? ( sys-devel/gettext )"
|
||||
BDEPEND="nls? ( sys-devel/gettext )
|
||||
verify-sig? ( sec-keys/openpgp-keys-diffutils )"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/ppc-musl.patch"
|
||||
"${FILESDIR}/loong-fix-build.patch"
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
# touch generated files after patching m4, to avoid activating maintainer
|
||||
# mode
|
||||
# remove when loong-fix-build.patch is no longer necessary
|
||||
touch ./aclocal.m4 lib/config.hin ./configure || die
|
||||
find . -name Makefile.in -exec touch {} + || die
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
use static && append-ldflags -static
|
||||
|
||||
30
sdk_container/src/third_party/portage-stable/sys-apps/diffutils/files/loong-fix-build.patch
vendored
Normal file
30
sdk_container/src/third_party/portage-stable/sys-apps/diffutils/files/loong-fix-build.patch
vendored
Normal file
@ -0,0 +1,30 @@
|
||||
[xen0n: this is https://github.com/sunhaiyong1978/CLFS-for-LoongArch/blob/1.0/patches/stack-direction-add-loongarch.patch with change to generated file added as well.]
|
||||
From: Sun Haiyong <youbest@sina.com>
|
||||
Date: Tue, 31 Aug 2021 11:11:52 +0800
|
||||
Subject: [PATCH] stack-direction: Add support for loongarch CPU
|
||||
|
||||
* m4/stack-direction.m4 (SV_STACK_DIRECTION): When the CPU is loongarch,
|
||||
set "sv_cv_stack_direction" to "-1" .
|
||||
--- a/m4/stack-direction.m4
|
||||
+++ b/m4/stack-direction.m4
|
||||
@@ -32,6 +32,7 @@ AC_DEFUN([SV_STACK_DIRECTION],
|
||||
i?86 | x86_64 | \
|
||||
i860 | \
|
||||
ia64 | \
|
||||
+ loongarch* | \
|
||||
m32r | \
|
||||
m68* | \
|
||||
m88k | \
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -34088,6 +34088,7 @@ else $as_nop
|
||||
i?86 | x86_64 | \
|
||||
i860 | \
|
||||
ia64 | \
|
||||
+ loongarch* | \
|
||||
m32r | \
|
||||
m68* | \
|
||||
m88k | \
|
||||
--
|
||||
2.17.2
|
||||
|
||||
19
sdk_container/src/third_party/portage-stable/sys-apps/diffutils/files/ppc-musl.patch
vendored
Normal file
19
sdk_container/src/third_party/portage-stable/sys-apps/diffutils/files/ppc-musl.patch
vendored
Normal file
@ -0,0 +1,19 @@
|
||||
Needed to fix build on ppc + musl. Should pop up in next gnulib sync in release (different patch).
|
||||
|
||||
https://www.openwall.com/lists/musl/2017/11/05/2
|
||||
https://github.com/void-linux/void-packages/blob/master/srcpkgs/grep/patches/ppc-musl.patch
|
||||
https://git.savannah.gnu.org/cgit/gnulib.git/commit/?id=2d830e4a792fcd9f614ed08a7f18584b8b21d23b
|
||||
--- a/lib/sigsegv.c
|
||||
+++ b/lib/sigsegv.c
|
||||
@@ -221,8 +221,10 @@ int libsigsegv_version = LIBSIGSEGV_VERSION;
|
||||
/* both should be equivalent */
|
||||
# if 0
|
||||
# define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.regs->gpr[1]
|
||||
-# else
|
||||
+# elif defined(__GLIBC__)
|
||||
# define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.uc_regs->gregs[1]
|
||||
+# else
|
||||
+# define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.gregs[1]
|
||||
# endif
|
||||
# endif
|
||||
|
||||
@ -5,4 +5,7 @@
|
||||
<email>base-system@gentoo.org</email>
|
||||
<name>Gentoo Base System</name>
|
||||
</maintainer>
|
||||
<upstream>
|
||||
<remote-id type="savannah">diffutils</remote-id>
|
||||
</upstream>
|
||||
</pkgmetadata>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user