diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2024-07-13 12:26:41 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2024-07-13 12:26:41 +0100 |
| commit | 482a48c0e1675b1e92663b8b5222bb7261aa7956 (patch) | |
| tree | b81e02db1810214fc690a762e3a9c687d0f0c5ab /sys-apps/usermode-utilities | |
| parent | 37bccfe5e76c5740c4ef5ba1179e9488d8404075 (diff) | |
gentoo auto-resync : 13:07:2024 - 12:26:41
Diffstat (limited to 'sys-apps/usermode-utilities')
3 files changed, 64 insertions, 0 deletions
diff --git a/sys-apps/usermode-utilities/Manifest b/sys-apps/usermode-utilities/Manifest index 36811fe6181c..209176fea612 100644 --- a/sys-apps/usermode-utilities/Manifest +++ b/sys-apps/usermode-utilities/Manifest @@ -2,7 +2,9 @@ AUX usermode-utilities-20070815-headers.patch 491 BLAKE2B 0c4e274101ada3c084cd65 AUX usermode-utilities-20070815-humfsify-owner.patch 460 BLAKE2B 5135621f69d9f923021059606c9faf1089ad7ee3273224a40ad570e233664dd781c633f7af61e41cacd2bdda298e23a79e04ec71a38875c95f9649a886d0b93e SHA512 f048d1fde80a5fae33a67c99aad5927f64343a1bec15cdab94bb5c8798b96192fccedda66a9aa8f14fb90de803cba031ddec4d9bc6eec236b8245aaa7b74115f AUX usermode-utilities-20070815-rollup.patch 4619 BLAKE2B d8701507d464fa10ebb99663dbf32c1d57040059bf7f43fcbcef82637d98d51ca55cd4fb28c7d7feb79c9b1597f4aa7ac01e7494e1db5549f75445ef9ba7854b SHA512 9cfc5a2fa98b7aff45c732629812ab691d3a56e5526f70d9ddb93dd666b9bf743296914f63043a94611e045915ed8046c87507a451deebc3d889d0827dc76439 AUX usermode-utilities-fix-memset.patch 1156 BLAKE2B 4349f038f768649c9ae1dcccb4aeb718a9866e6373910636359529acefd85e734374f41accd2453bb0312a134bc730e5e826123d052ed8fa81068db7ade911e7 SHA512 933eb6b78740fcc3d3f3e8f55624cce9a078ed7c70b74741cb27a324f9076e24f3eeff40b4b8cdfb56258a9007f1833b67fb1b7a7e61afa037f8c79d7c0d7380 +AUX usermode-utilities-gcc14-build-fix.patch 366 BLAKE2B 48b54179e894a9d031f6a41bbf2d64744f112194fcb1604e8953359b1379c3f7dc7801a9dca3392d3f974fc207ee543c6c9929c8b47f4acaf5eb532fbf369ff2 SHA512 67a8d632f1365cbe525148883e7bf0b543e6ee78507be687fa9ee746dfbd3c1f914bcf764084f538a091297c442b8690315138572ff891664dc7b00d7372bc37 DIST uml_utilities_20070815.tar.bz2 50159 BLAKE2B d11e7bc92892f2f5bc655bf580d66b1364d2c1f8e97e85ff39a6aeb85ed979c33c1d7c084b0a5e442df5622f7fa657677a322748e44c7ecf67f14d6b39a7536c SHA512 a246ca04bcba2282ceb976e69399f496cc85d14ee13c1e4704f943d7fcef032eda92e9e8c4341f6e8878c6353ed97c7f77b283e62e152987c792a7a6258f1d1a EBUILD usermode-utilities-20070815-r4.ebuild 1272 BLAKE2B 19c421c2680e7b953f6c7ea19ecf8c32f525b0f4038da8495937626812e93e9c4ae1ee3f6112dbb5ba6c0ac9d44e45e8ba409722387e176482793fef71ecd516 SHA512 d2c36f0308eba22a98ee6d122ad5333ee8737d1343a5fa1a0608d20ec4246eeb1c18c48b68edbb0f2773485e444d4b8d77ec2e89d726498fff197b03023169d5 EBUILD usermode-utilities-20070815-r5.ebuild 1338 BLAKE2B 4939aa382190d1fab163d86610c44a4f1250f141ccbd199ee99a8dde4f8d3edd9dc28acb36fd14d0e409f992d768f5da017d75dda35253c9dfb8d49e94e682b8 SHA512 879786560f729a44ab42f015135635ebeb1f1b5bce72768b46b814c24994f6a3103ba75a27451ccc2a0a6dde49b502dfa0cfcc0bc08b35a1ca8ba7f217c57c84 +EBUILD usermode-utilities-20070815-r6.ebuild 1385 BLAKE2B b2f04ba94960cd24edf5ca0d577e26f7e96bd1c4d911205181075e2ae9be3c1f89580a8788bea972d85c2b35b911842c03e0edc819d940df9228ef907bf34987 SHA512 7f0616471ad2dd8e1cbca3f5a1aaf89a7595e2f9253cad1000f2bd0586d2721cd0049f20a3acf84cb576738b07a0ac86827b2f00c4d71420fb1f723ce7e83157 MISC metadata.xml 341 BLAKE2B b7a6e0570e65cbc1ba6e97a752b15bae8e16a6e0edb98cb3bf96bec7b98d6fd827c01db69e629cd919cd8301932c3fc257fbf28d70eabb8d69e3c94d0fc7cb58 SHA512 47dfce7cd9fe15abf8399d8e87e3e3f6fbf5bf1763cc02d2272c116cea3bdfee1ff2838ea10e26d62645252df0ef958dca5426758a4e5f9469296dd06bc8789e diff --git a/sys-apps/usermode-utilities/files/usermode-utilities-gcc14-build-fix.patch b/sys-apps/usermode-utilities/files/usermode-utilities-gcc14-build-fix.patch new file mode 100644 index 000000000000..f2c06d031f96 --- /dev/null +++ b/sys-apps/usermode-utilities/files/usermode-utilities-gcc14-build-fix.patch @@ -0,0 +1,13 @@ +Bug: https://bugs.gentoo.org/933391 +--- a/umlfs/uml_mount.c ++++ b/umlfs/uml_mount.c +@@ -11,7 +11,8 @@ static int init_fuse(int argc, char **argv) + + if (fuse_parse_cmdline(&args, &mountpoint, NULL, NULL) == -1) + return -EINVAL; +- return fuse_mount(mountpoint, &args); ++ ++ return fuse_mount(mountpoint, (char *)&args); + } + + int main(int argc, char **argv) diff --git a/sys-apps/usermode-utilities/usermode-utilities-20070815-r6.ebuild b/sys-apps/usermode-utilities/usermode-utilities-20070815-r6.ebuild new file mode 100644 index 000000000000..33b2245e39e8 --- /dev/null +++ b/sys-apps/usermode-utilities/usermode-utilities-20070815-r6.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="Tools for use with Usermode Linux virtual machines" +HOMEPAGE="http://user-mode-linux.sourceforge.net/" +SRC_URI="http://user-mode-linux.sourceforge.net/uml_utilities_${PV}.tar.bz2" + +S="${WORKDIR}"/tools-${PV} + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="fuse" + +RDEPEND=" + fuse? ( sys-fs/fuse:0= ) + sys-libs/readline:0= +" +DEPEND="${RDEPEND}" + +PATCHES=( + # Merge previous patches with fix for bug #331099 + "${FILESDIR}"/${P}-rollup.patch + # Fix owner of humfsify; bug #364531 + "${FILESDIR}"/${P}-humfsify-owner.patch + "${FILESDIR}"/${P}-headers.patch #580816 + # Fix build /w clang-16, bug #898550 + "${FILESDIR}"/${PN}-fix-memset.patch + "${FILESDIR}"/${PN}-gcc14-build-fix.patch +) + +src_prepare() { + default + sed -i -e 's:-o \$(BIN):$(LDFLAGS) -o $(BIN):' "${S}"/*/Makefile || die "LDFLAGS sed failed" + sed -i -e 's:-o \$@:$(LDFLAGS) -o $@:' "${S}"/moo/Makefile || die "LDFLAGS sed (moo) failed" + if ! use fuse; then + einfo "Skipping build of umlmount to avoid sys-fs/fuse dependency." + sed -i -e 's/\<umlfs\>//' Makefile || die "sed to remove sys-fs/fuse dependency failed" + fi +} + +src_compile() { + tc-export AR CC + emake CFLAGS="${CFLAGS} ${CPPFLAGS} -DTUNTAP -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -g -Wall" all +} |