summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2024-04-05 15:27:13 +0100
committerSam James <sam@gentoo.org>2024-04-05 15:29:29 +0100
commitbc22d421c09f3d51af982677107f173ff6c10932 (patch)
tree0d3bcfbceea95b9acf85f45b8d86cb82fc890d7a /app-arch/7zip
parentapp-arch/7zip: add comment re doc tarball (diff)
downloadgentoo-bc22d421c09f3d51af982677107f173ff6c10932.tar.gz
gentoo-bc22d421c09f3d51af982677107f173ff6c10932.tar.bz2
gentoo-bc22d421c09f3d51af982677107f173ff6c10932.zip
app-arch/7zip: further style tweaks
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'app-arch/7zip')
-rw-r--r--app-arch/7zip/7zip-23.01.ebuild21
1 files changed, 14 insertions, 7 deletions
diff --git a/app-arch/7zip/7zip-23.01.ebuild b/app-arch/7zip/7zip-23.01.ebuild
index 7fc3ee2b671f..631aad045b4c 100644
--- a/app-arch/7zip/7zip-23.01.ebuild
+++ b/app-arch/7zip/7zip-23.01.ebuild
@@ -3,10 +3,10 @@
EAPI=8
-inherit edos2unix toolchain-funcs flag-o-matic
+inherit edos2unix flag-o-matic toolchain-funcs
NO_DOT_PV=$(ver_rs 1- '')
-DESCRIPTION="A free file archiver for extremely high compression"
+DESCRIPTION="Free file archiver for extremely high compression"
HOMEPAGE="https://www.7-zip.org/ https://sourceforge.net/projects/sevenzip/"
# linux-x64 tarball is used for docs
SRC_URI="
@@ -30,6 +30,10 @@ BDEPEND="
jwasm? ( dev-lang/jwasm )
"
+PATCHES=(
+ "${FILESDIR}/${P}-respect-build-env.patch"
+)
+
# TODO(NRK): also build and install the library
# TODO(NRK): make it so this package can be used as a drop-in replacement
# for app-arch/p7zip ??
@@ -60,18 +64,20 @@ src_prepare() {
# patch doesn't deal with CRLF even if file+patch match
# not even with --ignore-whitespace, --binary or --force
edos2unix ./7zip_gcc.mak ./var_gcc{,_x64}.mak ./var_clang{,_x64}.mak
- PATCHES+=( "${FILESDIR}/${P}-respect-build-env.patch" )
- sed -i -e 's/-Werror //g' ./7zip_gcc.mak || die "Error removing -Werror"
default
+
+ sed -i -e 's/-Werror //g' ./7zip_gcc.mak || die "Error removing -Werror"
}
src_compile() {
pushd "./Bundles/Alone2" || die "Unable to switch directory"
+
append-ldflags -Wl,-z,noexecstack
export G_CFLAGS=${CFLAGS}
export G_CXXFLAGS=${CXXFLAGS}
export G_LDFLAGS=${LDFLAGS}
+
local args=(
-f "../../${mfile}"
CC=$(tc-getCC)
@@ -83,13 +89,14 @@ src_compile() {
if ! use rar; then
# disables non-free rar code but allows listing and extracting
# non-compressed rar archives
- args+=(DISABLE_RAR_COMPRESS=1)
+ args+=( DISABLE_RAR_COMPRESS=1 )
fi
if use jwasm; then
- args+=(USE_JWASM=1)
+ args+=( USE_JWASM=1 )
elif use uasm; then
- args+=(MY_ASM=uasm)
+ args+=( MY_ASM=uasm )
fi
+
emake ${args[@]}
popd > /dev/null || die "Unable to switch directory"
}