summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app-arch/7-zip/7-zip-21.04_beta.ebuild (renamed from app-arch/7-zip/7-zip-21.03_beta-r1.ebuild)30
-rw-r--r--app-arch/7-zip/Manifest2
2 files changed, 26 insertions, 6 deletions
diff --git a/app-arch/7-zip/7-zip-21.03_beta-r1.ebuild b/app-arch/7-zip/7-zip-21.04_beta.ebuild
index 295b6de..ee18d6b 100644
--- a/app-arch/7-zip/7-zip-21.03_beta-r1.ebuild
+++ b/app-arch/7-zip/7-zip-21.04_beta.ebuild
@@ -15,10 +15,16 @@ SRC_URI="https://7-zip.org/a/7z${MY_PV}-src.7z"
LICENSE="LGPL-2.1+"
SLOT="0"
KEYWORDS="~amd64 ~x86"
+IUSE="+asm"
-DEPEND=""
-RDEPEND="${DEPEND}"
-BDEPEND="|| ( virtual/7z app-arch/libarchive app-arch/unar )"
+BDEPEND="
+ || ( virtual/7z app-arch/libarchive app-arch/unar )
+ asm? (
+ amd64? ( dev-lang/uasm )
+ arm64? ( dev-lang/uasm )
+ x86? ( dev-lang/uasm )
+ )
+"
S=${WORKDIR}/7z${MY_PV}-src
@@ -38,8 +44,22 @@ src_unpack() {
}
src_compile() {
- cd CPP/7zip/Bundles/Alone2
- make -f ../../cmpl_gcc.mak
+ cd CPP/7zip/Bundles/Alone2 || die
+ local myemakeargs=(
+ CC="$(tc-getCC) ${CFLAGS} ${LDFLAGS}"
+ CXX="$(tc-getCXX) ${CXXFLAGS} ${LDFLAGS}"
+ MY_ASM=uasm
+ CFLAGS_WARN_WALL="-Wall -Wextra"
+ )
+ if use amd64; then
+ myemakeargs+=(IS_X64=1 USE_ASM=1)
+ elif use arm64; then
+ myemakeargs+=(IS_ARM64=1 USE_ASM=1)
+ elif use x86; then
+ myemakeargs+=(IS_X86=1 USE_ASM=1)
+ fi
+ mkdir -p b/g || die
+ emake -f ../../cmpl_gcc.mak "${myemakeargs[@]}"
}
src_install() {
diff --git a/app-arch/7-zip/Manifest b/app-arch/7-zip/Manifest
index a855961..8f18d25 100644
--- a/app-arch/7-zip/Manifest
+++ b/app-arch/7-zip/Manifest
@@ -1 +1 @@
-DIST 7z2103-src.7z 1191375 BLAKE2B 002c20cbe0a47fbfce4c10f985972bf316d1e23c46e1047fbe98a9d4d27f1679d402cd6952c587fd6f78dd260896037896c328df9ae8a07865756c4693e93ad6 SHA512 6b2c00418333eb9a4f9d2ca23391dd644ed838b02832326a4c77065f762942d5daaa468f7330a8197b354a90aaf44f01d9412debb905f490351b54f63a3246df
+DIST 7z2104-src.7z 1210452 BLAKE2B 6863221c213f887e4ce82866e256316a4d5b11da0c8b1cced88c592230a8e9fde84cf9de255e9ec61f1fde376532b1e67faaf317761dd9da159550a255fcc5ea SHA512 83381c7c7d73abe067be18787c0e14dabb056c0bbddb2bf4ae5810bef501cdb398a8625dec742cfa6fcfcd27a164ea2303cbf25d1b2fe4fbc1932948a3ee0e8d