CVS commit: pkgsrc/devel/objfw

["Jonathan Schleifer" <js%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   js
Date:           Fri Oct 24 20:05:04 UTC 2025

Modified Files:
        pkgsrc/devel/objfw: Makefile options.mk

Log Message:
devel/objfw: Make dependency on Clang optional


To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 pkgsrc/devel/objfw/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/objfw/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/objfw/Makefile
diff -u pkgsrc/devel/objfw/Makefile:1.53 pkgsrc/devel/objfw/Makefile:1.54
--- pkgsrc/devel/objfw/Makefile:1.53    Sun Oct  5 13:50:07 2025
+++ pkgsrc/devel/objfw/Makefile Fri Oct 24 20:05:04 2025
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.53 2025/10/05 13:50:07 js Exp $
+# $NetBSD: Makefile,v 1.54 2025/10/24 20:05:04 js Exp $
 
 DISTNAME=      objfw-1.4.2
+PKGREVISION=   1
 CATEGORIES=    devel
 MASTER_SITES=  https://objfw.nil.im/downloads/
 
@@ -17,25 +18,6 @@ CONFIGURE_ARGS+=     LDFLAGS=${LDFLAGS:M*:Q}
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${MACHINE_ARCH} == "alpha" || \
-       ${MACHINE_ARCH} == "coldfire" || \
-       ${MACHINE_ARCH} == "hppa" || \
-       ${MACHINE_ARCH} == "ia64" || \
-       ${MACHINE_ARCH} == "m68k" || \
-       ${MACHINE_ARCH} == "or1k" || \
-       ${MACHINE_ARCH} == "sh3eb" || \
-       ${MACHINE_ARCH} == "sh3el" || \
-       ${MACHINE_ARCH} == "vax"
-# Clang does not support these architectures, so build with GCC, with the
-# caveat that GCC doesn't support all features.
-.elif ${OPSYS} == "Darwin"
-# Darwin always has good Objective-C support with the system compiler.
-.else
-CONFIGURE_ARGS+=       OBJC=clang      # Clang has much better ObjC support
-TOOL_DEPENDS+=         clang>=3.2:../../lang/clang
-PKGSRC_COMPILER=       clang
-.endif
-
 PLIST_SRC=     PLIST
 PLIST_VARS+=   ddp ipx ofgctester sctp
 

Index: pkgsrc/devel/objfw/options.mk
diff -u pkgsrc/devel/objfw/options.mk:1.2 pkgsrc/devel/objfw/options.mk:1.3
--- pkgsrc/devel/objfw/options.mk:1.2   Sun Apr 14 17:05:03 2024
+++ pkgsrc/devel/objfw/options.mk       Fri Oct 24 20:05:04 2025
@@ -1,17 +1,42 @@
-# $NetBSD: options.mk,v 1.2 2024/04/14 17:05:03 js Exp $
+# $NetBSD: options.mk,v 1.3 2025/10/24 20:05:04 js Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.objfw
+.if ${MACHINE_ARCH} != "alpha" && \
+       ${MACHINE_ARCH} != "coldfire" && \
+       ${MACHINE_ARCH} != "hppa" && \
+       ${MACHINE_ARCH} != "ia64" && \
+       ${MACHINE_ARCH} != "m68k" && \
+       ${MACHINE_ARCH} != "m68ksf" && \
+       ${MACHINE_ARCH} != "or1k" && \
+       ${MACHINE_ARCH} != "sh3eb" && \
+       ${MACHINE_ARCH} != "sh3el" && \
+       ${MACHINE_ARCH} != "vax"
+PKG_SUPPORTED_OPTIONS=         clang
+PKG_SUGGESTED_OPTIONS+=                clang
+.endif
 PKG_OPTIONS_OPTIONAL_GROUPS=   tls
 PKG_OPTIONS_GROUP.tls=         openssl gnutls mbedtls
 .if ${OPSYS} == "Darwin"
 PKG_OPTIONS_GROUP.tls+=                securetransport
-PKG_SUGGESTED_OPTIONS=         securetransport
+PKG_SUGGESTED_OPTIONS+=                securetransport
 .else
-PKG_SUGGESTED_OPTIONS=         openssl
+PKG_SUGGESTED_OPTIONS+=                openssl
 .endif
 
 .include "../../mk/bsd.options.mk"
 
+.if !empty(PKG_OPTIONS:Mclang)
+CONFIGURE_ARGS+=       OBJC=clang
+.  if ${OPSYS} != "Darwin"
+# Darwin already has Clang as the default compiler.
+TOOL_DEPENDS+=         clang>=3.2:../../lang/clang
+PKGSRC_COMPILER=       clang
+.  endif
+.else
+# Need to explicitly set GCC, as configure prefers Clang.
+CONFIGURE_ARGS+=       OBJC=gcc
+.endif
+
 .if !empty(PKG_OPTIONS:Mopenssl)
 .  include "../../security/openssl/buildlink3.mk"
 CONFIGURE_ARGS+=       --with-tls=openssl