summaryrefslogtreecommitdiff
path: root/sys-apps/most
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2021-12-05 02:47:11 +0000
committerV3n3RiX <venerix@koprulu.sector>2021-12-05 02:47:11 +0000
commit2771f79232c273bc2a57d23bf335dd81ccf6af28 (patch)
treec8af0fd04194aed03cf067d44e53c7edd3e9ab84 /sys-apps/most
parente9d044d4b9b71200a96adfa280848858c0f468c9 (diff)
gentoo resync : 05.12.2021
Diffstat (limited to 'sys-apps/most')
-rw-r--r--sys-apps/most/Manifest3
-rw-r--r--sys-apps/most/files/most-5.1.0-fix-parallel-build.patch21
-rw-r--r--sys-apps/most/most-5.1.0.ebuild3
3 files changed, 25 insertions, 2 deletions
diff --git a/sys-apps/most/Manifest b/sys-apps/most/Manifest
index d3acf480acfc..6faa5940ca5b 100644
--- a/sys-apps/most/Manifest
+++ b/sys-apps/most/Manifest
@@ -1,4 +1,5 @@
AUX most-5.0.0a-donot-hardcode-path.patch 969 BLAKE2B 1089149fc01a3081760f422b73d4a691e3078f13df1a7045cf0f94d6991c762e4004088e9a0b89a9b6b39ec70782f1b86edb13c714ef2b2b33bd6ccd9f18435d SHA512 6da3424b5e9763bd8f89998ffe019230cc8e9c7fc9722235cc13830d50647f590f6a934ae025a063fe8fc1e8bdd2b4fc067fbc1569c7a0ebfa220b868b999271
+AUX most-5.1.0-fix-parallel-build.patch 761 BLAKE2B b2aeb5019305138ee0ac816c07595afcf95c07f7d3f477ace41931fcb85706909813056f9291d5002e2e583fdd3baec34f09b153a9d736e0009d3d7f6f4cf524 SHA512 492ebbc35c4a94514c252541a644c45b4904ad402fa0c45da03f9acb529dfdf46576429b67352cfde9defd76b772aa12ecd449f461b3f995a4d00f9ed63692c5
DIST most-5.1.0.tar.gz 162172 BLAKE2B a3c0f3d85e7c4f4a014c174efb0d3d22b0fc2758e403ddccc74308399eeec616800e16db33554f0ca53fba674efba9dd93d51ed0c3f887b2c24fd3dd2335387c SHA512 cbc090283bbaafb8ffee9d6d1abc7b49cd58d54b742cf8dc86274351dee6398d1f24841bd1631ac40f861ad9e23569646133d3297317d9d514a7a38dd74533d2
-EBUILD most-5.1.0.ebuild 865 BLAKE2B 3685189fff6bfe88faf0535665e6cf106616ec63d205d106ee534c7da82dece2cb6103009112ee656cbf2c86d7d8805c01e02618db91df3a35940f0fb180f9a5 SHA512 f2c4bb745c7149bb72512df1361a7caec50f803c5e65efb21b9bd91dc63be00f2c57bd6737b0e59709e7a27802ad723d7195792e0e5dfc81bb4e56580b6c46e2
+EBUILD most-5.1.0.ebuild 917 BLAKE2B 14508a5b03c06d1fa4f94eb5b25710dfd6ebab34de570b360fc9cc3150fd1309d1d5ba39913ae1fce96af420fa416db6cda271ebcf2c29863a27555d7bd57c50 SHA512 87941a9e5a52f001519074a5e22146e453a253736bf0cf22939d4f6e6876df77e898951e8ed0ea22535bf98ad8e8c1dde4265027f99b22568831208a168cea6e
MISC metadata.xml 272 BLAKE2B a253052dbe7dfd2dea2cdc3692698a5a94d0e2414979a348d56448cee6329b7fe29a1f252146f9ff04c1ea3b270996631395ecea454ac901eb726dc0b4dd9f29 SHA512 247c1006dd352c3cc7ee07dee2f283394767bdc0f72f0438a6cc845ac53549c05b3741c64ffedb992f003759e67f24aaa7121561db97d1b095c11269115746dc
diff --git a/sys-apps/most/files/most-5.1.0-fix-parallel-build.patch b/sys-apps/most/files/most-5.1.0-fix-parallel-build.patch
new file mode 100644
index 000000000000..0b5e5b2da3f6
--- /dev/null
+++ b/sys-apps/most/files/most-5.1.0-fix-parallel-build.patch
@@ -0,0 +1,21 @@
+https://bugs.gentoo.org/795117
+
+Grabbed from NixOS (slyfox submitted this upstream):
+
+Upstream commit c9cfad50a ("src/Makefile.in: Avoid a race condition
+when performing a parallel build")
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -54,6 +54,12 @@ COMPILE_CMD = $(CC) -c $(ALL_CFLAGS) -DMOST_SYSTEM_INITFILE='"$(SYS_INITFILE)"'
+ all: $(EXEC)
+ $(EXEC): $(OBJDIR) $(CONFIG_H) slangversion $(OBJDIR)/$(EXEC)
+ @echo $(EXEC) created in $(OBJDIR)
++
++# C source files include autogenrated "config.h". Make sure
++# it's available before the compilation. Pessimistically assume
++# any source file can depend on "config.h".
++$(OBJS) $(OBJDIR)/chkslang.o: $(CONFIG_H)
++
+ $(OBJDIR)/$(EXEC): $(OBJS)
+ cd $(OBJDIR); $(CC) $(OFILES) -o $(EXEC) $(LDFLAGS) $(EXECLIBS)
+ #
diff --git a/sys-apps/most/most-5.1.0.ebuild b/sys-apps/most/most-5.1.0.ebuild
index 18b707ef38fb..991e0d5124af 100644
--- a/sys-apps/most/most-5.1.0.ebuild
+++ b/sys-apps/most/most-5.1.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.jedsoft.org/releases/${PN}/${P}.tar.gz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~mips ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~mips ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
IUSE=""
RDEPEND=">=sys-libs/slang-2.1.3"
@@ -18,6 +18,7 @@ DEPEND="${RDEPEND}"
PATCHES=(
"${FILESDIR}"/${PN}-5.0.0a-donot-hardcode-path.patch
+ "${FILESDIR}"/${P}-fix-parallel-build.patch
)
src_prepare() {