diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2023-09-10 16:36:07 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2023-09-10 16:36:07 +0100 |
| commit | d0041c590ed45bbfeae458ea926e36bc64e41dd7 (patch) | |
| tree | 9f8a3bcf226736635a558a6d70fcd46b60f90a17 /app-shells/fzf | |
| parent | 5067796b074450a155155c782ef4885c885cfb2b (diff) | |
gentoo auto-resync : 10:09:2023 - 16:36:07
Diffstat (limited to 'app-shells/fzf')
| -rw-r--r-- | app-shells/fzf/Manifest | 3 | ||||
| -rw-r--r-- | app-shells/fzf/files/fzf-0.42.0-armv8l-bitness.patch | 24 | ||||
| -rw-r--r-- | app-shells/fzf/fzf-0.42.0-r1.ebuild (renamed from app-shells/fzf/fzf-0.42.0.ebuild) | 6 |
3 files changed, 31 insertions, 2 deletions
diff --git a/app-shells/fzf/Manifest b/app-shells/fzf/Manifest index b000ffe0eb85..efb189ab14db 100644 --- a/app-shells/fzf/Manifest +++ b/app-shells/fzf/Manifest @@ -1,4 +1,5 @@ +AUX fzf-0.42.0-armv8l-bitness.patch 808 BLAKE2B b5e80e3f2c15e23f8347fb6c2684d7974f532505d212a07ad12e533d57b08714e52d8069eaec6de84ec3a80a2229a50e1794a464f6f69324378383680c0eb35f SHA512 7af543581666c88c09296fb65ba64ed035d73eec09c1b8ab92b134d5fe9a2572ef31dac7421fa4c27915ed265f7559b9d35f8605fd267dd2f269b1dd976401e2 DIST fzf-0.42.0-deps.tar.xz 16860372 BLAKE2B e2ba9a7deca036587e0f4ff40eabb849f834ca5429261ea365efa87b83eb4c8b62e4c24e27a35d29941c09cf7165fa6f408769132d9583527278fc7029e473c5 SHA512 43b09726e5c5d7d987e6bb905f077dfd2e355b7bbb65eb13f86dc1c586711c1331396ae3c8437990a6facab72aad0ba4aff99fe3f2b293554bbb6942799440d8 DIST fzf-0.42.0.tar.gz 239469 BLAKE2B cdeb40d08345edaecc20082e5c9d487791260ae18dc824e585f522fdcb004dc645a9a59f8d26c01ffaaffffcee6ea9b7030b5e3a79d22098b3fad55e7ff2f9e7 SHA512 9587b8c9d37abcf1ae85b12d5cf3a1179f57241e3932db6801dee9bb952f83621b780d713c1793ccb4c5c36921b9078e156fe989b3e13664201ed729ea03d414 -EBUILD fzf-0.42.0.ebuild 1982 BLAKE2B 33281814ae65706a1b7b398fecf8cf1548d25460e598a7fe2ad6b9bc39fc393ebd9e0f29a012c5c8b77809434e0d15294a0f2dce191c165d9bb18a574895d832 SHA512 d4d7fd0f77f2ff0cde61c291b376c3ce8a5a40c8f717b1008c04d2c028d0f038e44cb35765ddae964f34f31b451455bef72ac952ee5a7257c0984c77734f246f +EBUILD fzf-0.42.0-r1.ebuild 2049 BLAKE2B 3155efecc3fd0c671fd14afa9925e45b0a5d0cb958ca0fb45672a9a4a45e17bd3ba3babac8c911f324371437f3ca7d4bb8d33cd3cb2d7a969b6dbaa332db1b03 SHA512 1204ef113334ad3aaad7faaa4ea8e52c76c7a8693bc5c5a20f70a57aa5330a4100d407e0aae4ff522b390cad356a63e4f9285c44168a0fb8d4ad4e36953c38b7 MISC metadata.xml 469 BLAKE2B 3d6dcce756d040b715bbf17f33faea2c0ddd810857cb38289f59cab134a5b049d21db71c9c3844497643e1728ecd09a924a51ba273f736712543307f2b806d1a SHA512 21f3fef809b276da7f7ad33dbafefc2ebfa86b9ce9aa0dea664724c399a6743923a8a1825cffbd06d885181dc7b305d351e7ab77bd133abb98f601a84783f52f diff --git a/app-shells/fzf/files/fzf-0.42.0-armv8l-bitness.patch b/app-shells/fzf/files/fzf-0.42.0-armv8l-bitness.patch new file mode 100644 index 000000000000..c8ec579f3ed4 --- /dev/null +++ b/app-shells/fzf/files/fzf-0.42.0-armv8l-bitness.patch @@ -0,0 +1,24 @@ +https://github.com/junegunn/fzf/pull/3434 + +From 884d896893cb031e4532bd32403ced2020972806 Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Sun, 10 Sep 2023 14:54:49 +0100 +Subject: [PATCH] Makefile: build 32-bit binary on armv8l + +armv8l is always 32-bit and should implement the armv7 ISA, so +just use the same filename as for armv7. + +Signed-off-by: Sam James <sam@gentoo.org> +--- a/Makefile ++++ b/Makefile +@@ -57,7 +57,9 @@ else ifeq ($(UNAME_M),armv6l) + else ifeq ($(UNAME_M),armv7l) + BINARY := $(BINARYARM7) + else ifeq ($(UNAME_M),armv8l) +- BINARY := $(BINARYARM8) ++ # armv8l is always 32-bit and should implement the armv7 ISA, so ++ # just use the same filename as for armv7. ++ BINARY := $(BINARYARM7) + else ifeq ($(UNAME_M),arm64) + BINARY := $(BINARYARM8) + else ifeq ($(UNAME_M),aarch64) diff --git a/app-shells/fzf/fzf-0.42.0.ebuild b/app-shells/fzf/fzf-0.42.0-r1.ebuild index 098b99937497..4477d3f3bc71 100644 --- a/app-shells/fzf/fzf-0.42.0.ebuild +++ b/app-shells/fzf/fzf-0.42.0-r1.ebuild @@ -19,7 +19,11 @@ SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-deps.tar LICENSE="MIT BSD-with-disclosure" SLOT="0" -KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86" +KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86" + +PATCHES=( + "${FILESDIR}"/${PN}-0.42.0-armv8l-bitness.patch +) src_prepare() { default |