public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-lang/uasm/
@ 2024-04-05 14:26 Sam James
  0 siblings, 0 replies; 2+ messages in thread
From: Sam James @ 2024-04-05 14:26 UTC (permalink / raw
  To: gentoo-commits

commit:     af7fd91ea1a0519e653a28112bf7fba4dbbb9188
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Apr  5 14:05:39 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Apr  5 14:25:17 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af7fd91e

dev-lang/uasm: style tweaks

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-lang/uasm/uasm-2.56.2.ebuild | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/dev-lang/uasm/uasm-2.56.2.ebuild b/dev-lang/uasm/uasm-2.56.2.ebuild
index 1a4c8c42f2cd..480f0d98ae38 100644
--- a/dev-lang/uasm/uasm-2.56.2.ebuild
+++ b/dev-lang/uasm/uasm-2.56.2.ebuild
@@ -8,12 +8,11 @@ inherit toolchain-funcs flag-o-matic
 DESCRIPTION="UASM is a free MASM-compatible assembler"
 HOMEPAGE="https://www.terraspace.co.uk/uasm.html"
 SRC_URI="https://github.com/Terraspace/UASM/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="Watcom-1.0"
+S="${WORKDIR}/UASM-${PV}"
 
+LICENSE="Watcom-1.0"
 SLOT="0"
 KEYWORDS="~amd64"
-
-S="${WORKDIR}/UASM-${PV}"
 PATCHES=(
 	"${FILESDIR}/build-fix.patch"
 )
@@ -25,9 +24,13 @@ src_prepare() {
 }
 
 src_compile() {
-	append-cflags -fcommon  # Bug: https://github.com/Terraspace/UASM/issues/143
-	emake -f gccLinux64.mak CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+	# Bug: https://github.com/Terraspace/UASM/issues/143
+	append-cflags -fcommon
+
+	emake -f gccLinux64.mak \
+		CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}"
 }
 
 src_install() {


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-lang/uasm/
@ 2024-04-05 14:26 Sam James
  0 siblings, 0 replies; 2+ messages in thread
From: Sam James @ 2024-04-05 14:26 UTC (permalink / raw
  To: gentoo-commits

commit:     d6bda075604e8667c875a52702ff5c3e7961d69b
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Apr  5 14:09:06 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Apr  5 14:25:18 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6bda075

dev-lang/uasm: workaround modern C issues for now

Yuck, but I'm importing this from ::guru and it feels wrong to do that and
then disable functionality in 7zip.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-lang/uasm/uasm-2.56.2.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dev-lang/uasm/uasm-2.56.2.ebuild b/dev-lang/uasm/uasm-2.56.2.ebuild
index 480f0d98ae38..8210588c135e 100644
--- a/dev-lang/uasm/uasm-2.56.2.ebuild
+++ b/dev-lang/uasm/uasm-2.56.2.ebuild
@@ -26,6 +26,8 @@ src_prepare() {
 src_compile() {
 	# Bug: https://github.com/Terraspace/UASM/issues/143
 	append-cflags -fcommon
+	# https://github.com/Terraspace/UASM/issues/197
+	append-cflags -Wno-error=incompatible-pointer-types
 
 	emake -f gccLinux64.mak \
 		CC="$(tc-getCC)" \


^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2024-04-05 14:26 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-04-05 14:26 [gentoo-commits] repo/gentoo:master commit in: dev-lang/uasm/ Sam James
  -- strict thread matches above, loose matches on Subject: below --
2024-04-05 14:26 Sam James

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox