CVS commit: pkgsrc/devel/objfw

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

Module Name:    pkgsrc
Committed By:   js
Date:           Wed Apr  1 23:19:24 UTC 2026

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

Log Message:
devel/objfw: Always use system compiler on Darwin

This removes the clang option for Darwin.


To generate a diff of this commit:
cvs rdiff -u -r1.63 -r1.64 pkgsrc/devel/objfw/Makefile
cvs rdiff -u -r1.6 -r1.7 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.63 pkgsrc/devel/objfw/Makefile:1.64
--- pkgsrc/devel/objfw/Makefile:1.63    Tue Feb 24 21:50:50 2026
+++ pkgsrc/devel/objfw/Makefile Wed Apr  1 23:19:24 2026
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.63 2026/02/24 21:50:50 js Exp $
+# $NetBSD: Makefile,v 1.64 2026/04/01 23:19:24 js Exp $
 
 DISTNAME=      objfw-1.5.1
+PKGREVISION=   1
 CATEGORIES=    devel
 MASTER_SITES=  https://objfw.nil.im/downloads/
 

Index: pkgsrc/devel/objfw/options.mk
diff -u pkgsrc/devel/objfw/options.mk:1.6 pkgsrc/devel/objfw/options.mk:1.7
--- pkgsrc/devel/objfw/options.mk:1.6   Sun Feb 22 20:40:55 2026
+++ pkgsrc/devel/objfw/options.mk       Wed Apr  1 23:19:24 2026
@@ -1,7 +1,8 @@
-# $NetBSD: options.mk,v 1.6 2026/02/22 20:40:55 js Exp $
+# $NetBSD: options.mk,v 1.7 2026/04/01 23:19:24 js Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.objfw
-.if ${MACHINE_ARCH} != "alpha" && \
+.if ${OPSYS} != "Darwin" && \
+       ${MACHINE_ARCH} != "alpha" && \
        ${MACHINE_ARCH} != "coldfire" && \
        ${MACHINE_ARCH} != "hppa" && \
        ${MACHINE_ARCH} != "ia64" && \
@@ -11,6 +12,8 @@ PKG_OPTIONS_VAR=              PKG_OPTIONS.objfw
        ${MACHINE_ARCH} != "sh3eb" && \
        ${MACHINE_ARCH} != "sh3el" && \
        ${MACHINE_ARCH} != "vax"
+# Always use the system compiler on Darwin, as that has the best ObjC support.
+# Clang is not available on the architectures listed above.
 PKG_SUPPORTED_OPTIONS=         clang
 PKG_SUGGESTED_OPTIONS+=                clang
 .endif
@@ -22,14 +25,13 @@ PKG_SUGGESTED_OPTIONS+=             openssl
 
 .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
+.  if ${OPSYS} != "Darwin"
 # Need to explicitly set GCC, as configure prefers Clang.
 CONFIGURE_ARGS+=       OBJC=gcc
+.  endif
 .endif
 
 .if !empty(PKG_OPTIONS:Mopenssl)