From nobody Tue May 06 18:53:44 2025 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZsSGd42kRz5vFvr; Tue, 06 May 2025 18:53:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZsSGd1Phxz3Tpp; Tue, 06 May 2025 18:53:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746557625; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=V23vGtS/CZJac2gG5bloNYMkLFaYZgoFwZbUu1Xkrkw=; b=h60ad5B0nXF4JJz62bdfLctIk3j41lp8VDNEbuioSE1FFDy/MHvP8YJeu4lucQi8OMPstD OdjzA0/NUlSCFNv9nh2oZ7+ePxG2UZ+ccu4loQCnrpZEWYEsn0S/VdGUKOP8KpcMsFsGj/ vfWbQTz/DK1ANsuxxJfZbWqMT2ugF4/+Hvrxi0AuaTH8eJ1aR0JgTuuuWi55zlLWPjLA48 rAmv/ZLBi5tM7y8dlETmXnaAWgETc1bmbq8CCFg0p/I4MpwENpXFl/eCnJ8Mrlc0Rg9CR3 4aoqj6B4x+wLs9qthSqLPWFxuKxfcjyd322oHVXG9f7URwYXj68pnhv+bekD+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746557625; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=V23vGtS/CZJac2gG5bloNYMkLFaYZgoFwZbUu1Xkrkw=; b=fyLwRDkQ2hUj7naGPabxbPShf/LIfjK2Ja3UHMrEMEPJxHft8g0ob85AIP5bk8bhVh16TN HUx+ns8P1m5LjzHwNRQYD/PL/DhlqhrxQrlUHcUZzeD+Kb7ovqMJGUHm55QgEKgnbozx77 lJxx/YOTa1g3Tf2TGSuAwP6lIytjpezJY8tH/dgrQ/ekgHAHApadQL4a2YPrr4mZQHvpYO 443+PZggSdcWWnYHjSgevR2UwWl0+ZgOKapeRZ9Vt/ypG9XYWvbsoRsrbNXyZhJJhdINWz IzlndsScz5kXsxHb/KlPF1zEmxWzbEJfOJ6GJFtjR3ZRsCR9RwNo71D0wmCohg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746557625; a=rsa-sha256; cv=none; b=BpmvRAP8IwHkfx+XWJ+pKXKAyCmUXX5jb1YL+YFQVehx1RS8uhTFve2nXLv7V1b7D5adiQ 08joL5gq6Vagq7ySFdzN81wEhCIXhqjR0qJBStxEXwiyesOWqSW89rqoEpYTQMTdt2eZnD EXkEGwRPqmIHp4TOnQGSLDK5WaWVC5COCuSEXrM9KRPy8Uqtm8kDfhKs6Y2iyOQmMn7Ul4 dcX7Hn8D1Zrkme5SGEwGzxr49uu49kmhLkdQ/cU+IrHFBxv38cJqRz51TtJ1GKCRTpr0CI PFH/DAtE8yPlfaLNkxBpdtCP15kkffIZzMJESStK1w+wPKrIj+P5m92WvpT0Iw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZsSGd0sWCz1BVF; Tue, 06 May 2025 18:53:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 546IriO0076926; Tue, 6 May 2025 18:53:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 546Irig5076923; Tue, 6 May 2025 18:53:44 GMT (envelope-from git) Date: Tue, 6 May 2025 18:53:44 GMT Message-Id: <202505061853.546Irig5076923@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Robert Clausecker Subject: git: a0cc88a42945 - main - emulators/uae: fix build on armv7 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a0cc88a429459e903687509682e9f6a48ab07938 Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=a0cc88a429459e903687509682e9f6a48ab07938 commit a0cc88a429459e903687509682e9f6a48ab07938 Author: Robert Clausecker AuthorDate: 2025-05-05 16:26:39 +0000 Commit: Robert Clausecker CommitDate: 2025-05-06 18:53:12 +0000 emulators/uae: fix build on armv7 Avoid USES=llvm:15 by manually disabling the offending warning cum error. Refactor REINPLACE_CMD into proper patches. Approved by: portmgr (build fix blanket) Discussed with: bofh MFH: 2025Q2 --- emulators/uae/Makefile | 14 ++++---------- emulators/uae/files/patch-src_Makefile.in | 21 +++++++++++++++++++++ emulators/uae/files/patch-src_include_bsdsocket.h | 11 +++++++++++ 3 files changed, 36 insertions(+), 10 deletions(-) diff --git a/emulators/uae/Makefile b/emulators/uae/Makefile index 3b6d42bb3b9f..ff1b40c63c64 100644 --- a/emulators/uae/Makefile +++ b/emulators/uae/Makefile @@ -1,6 +1,6 @@ PORTNAME= uae PORTVERSION= 0.8.29 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= emulators MASTER_SITES= LOCAL/grembo @@ -16,19 +16,13 @@ USES= gmake gnome pkgconfig tar:bzip2 GNU_CONFIGURE= yes USE_GNOME= gtk20 +CFLAGS+= -Wno-error=incompatible-function-pointer-types + OPTIONS_DEFINE= DOCS .include -.if ${OPSYS} == FreeBSD -USES+= llvm:max=15 -.endif - -post-patch: - @${REINPLACE_CMD} -e 's|build68kc|build68k|' \ - ${WRKSRC}/src/Makefile.in - @${REINPLACE_CMD} -e 's|struct socketbase {|extern &|' \ - ${WRKSRC}/src/include/bsdsocket.h +pre-patch: @${LN} -sf ../md-ppc/support.c ${WRKSRC}/src/md-ppc-gcc/support.c do-install: diff --git a/emulators/uae/files/patch-src_Makefile.in b/emulators/uae/files/patch-src_Makefile.in new file mode 100644 index 000000000000..9fce0c548a90 --- /dev/null +++ b/emulators/uae/files/patch-src_Makefile.in @@ -0,0 +1,21 @@ +--- src/Makefile.in.orig 2025-05-05 16:21:46 UTC ++++ src/Makefile.in +@@ -9,7 +9,8 @@ CFLAGS = @CFLAGS@ -D__inline__=@ac_cv_c_inline@ \ + LDFLAGS = @LDFLAGS@ + CFLAGS = @CFLAGS@ -D__inline__=@ac_cv_c_inline@ \ + -DSYSTEM_ROMDIR=\"$(datadir)/uae/roms\" \ +- -DSYSTEM_CFGDIR=\"$(datadir)/uae/configs\" ++ -DSYSTEM_CFGDIR=\"$(datadir)/uae/configs\" \ ++ -Wno-error=incompatible-function-pointer-types + X_CFLAGS = @X_CFLAGS@ @GTK_CFLAGS@ -DSHM_SUPPORT_LINKS=@SHM_SUPPORT_LINKS@ + TARGET = @TARGET@ + LIBRARIES = @LIBRARIES@ @LIBS@ @GTK_LIBS@ +@@ -112,7 +113,7 @@ tools/build68k: + tools/genblitter: + $(MAKE) -C tools genblitter + tools/build68k: +- $(MAKE) -C tools build68kc ++ $(MAKE) -C tools build68k + tools/gencpu: + $(MAKE) -C tools gencpu + diff --git a/emulators/uae/files/patch-src_include_bsdsocket.h b/emulators/uae/files/patch-src_include_bsdsocket.h new file mode 100644 index 000000000000..02e8c1fc284d --- /dev/null +++ b/emulators/uae/files/patch-src_include_bsdsocket.h @@ -0,0 +1,11 @@ +--- src/include/bsdsocket.h.orig 2025-05-05 16:22:22 UTC ++++ src/include/bsdsocket.h +@@ -29,7 +29,7 @@ extern void deinit_socket_layer (void); + #define MAXADDRLEN 256 + + /* allocated and maintained on a per-task basis */ +-struct socketbase { ++extern struct socketbase { + struct socketbase *next; + struct socketbase *nextsig; /* queue for tasks to signal */ +