Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 03 Aug 2026 15:10:22 +0000
From:      Robert Clausecker <fuz@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org
Subject:   git: 106e04baf823 - 2026Q3 - net-p2p/amule: fix build on 32-bit platforms properly
Message-ID:  <6a70af5e.3b74d.3f0e1d07@gitrepo.freebsd.org>

index | next in thread | raw e-mail

The branch 2026Q3 has been updated by fuz:

URL: https://cgit.FreeBSD.org/ports/commit/?id=106e04baf823ae7156d5c882629064df8cad9b38

commit 106e04baf823ae7156d5c882629064df8cad9b38
Author:     Robert Clausecker <fuz@FreeBSD.org>
AuthorDate: 2026-07-31 13:10:18 +0000
Commit:     Robert Clausecker <fuz@FreeBSD.org>
CommitDate: 2026-08-03 15:10:09 +0000

    net-p2p/amule: fix build on 32-bit platforms properly
    
    The port asks for libatomic on 32 bit platforms.  That's a gcc thing.
    We don't compile with gcc, so libatomic is not needed in any case.
    Patch out the check for libatomic to fix the build on all 32-bit
    platforms.
    
    Approved by:    portmgr (build fix blanket)
    MFH:            2026Q3
    
    (cherry picked from commit b700cbd3a83de54d284f95fb5f6db0b241c0b1da)
---
 net-p2p/amule/Makefile                   |  6 ------
 net-p2p/amule/files/patch-CMakeLists.txt | 11 +++++++++++
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/net-p2p/amule/Makefile b/net-p2p/amule/Makefile
index 2778a4847319..171bb3083b54 100644
--- a/net-p2p/amule/Makefile
+++ b/net-p2p/amule/Makefile
@@ -75,10 +75,4 @@ post-patch:
 		-e 's|VERSION "GIT"|VERSION "${DISTVERSION}"|g' \
 		${WRKSRC}/CMakeLists.txt
 
-.if ${ARCH} == i386
-LIB_DEPENDS+=	libatomic.so:lang/gcc${GCC_DEFAULT}
-CMAKE_ARGS+=	-DCMAKE_PREFIX_PATH=${LOCALBASE}/lib/gcc${GCC_DEFAULT}
-LDFLAGS+=	-L${LOCALBASE}/lib/gcc${GCC_DEFAULT}
-.endif
-
 .include <bsd.port.mk>
diff --git a/net-p2p/amule/files/patch-CMakeLists.txt b/net-p2p/amule/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..0bb32ac8311d
--- /dev/null
+++ b/net-p2p/amule/files/patch-CMakeLists.txt
@@ -0,0 +1,11 @@
+--- CMakeLists.txt.orig	2026-07-31 13:00:04 UTC
++++ CMakeLists.txt
+@@ -296,7 +296,7 @@ set (LIBATOMIC "")
+ # atomic references actually do need the library (see #643). Just
+ # require libatomic unconditionally on 32-bit builds.
+ set (LIBATOMIC "")
+-if (CMAKE_SIZEOF_VOID_P EQUAL 4)
++if (FALSE AND CMAKE_SIZEOF_VOID_P EQUAL 4)
+ 	# Accept either the unversioned `libatomic.so` (Debian / Fedora /
+ 	# Arch ship it via the -dev / -devel package) or the versioned-only
+ 	# `libatomic.so.1` (openSUSE ships only the latter -- there's no


home | help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6a70af5e.3b74d.3f0e1d07>