tech-pkg archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Build additions for m68ksf



Hi,

With the recent addition of mac68ksf (m68ksf), pkgsrc needs the following 
changes to support it.

The patch adds support for m68ksf where m68k was already added to releavent 
Makefiles.

Attached is the patch.


Am I ok to commit this?


Best regards,


Nat

PS: Please reply or CC me as I'm not subscribed to the list.
diff -r 3156e1d22a8a mk/bsd.prefs.mk
--- a/mk/bsd.prefs.mk	Mon Oct 13 03:21:20 2025 +0000
+++ b/mk/bsd.prefs.mk	Thu Oct 16 11:07:08 2025 +1100
@@ -149,6 +149,7 @@ GNU_ARCH.i386?=		i486
 GNU_ARCH.i586?=		i486
 GNU_ARCH.i686?=		i486
 GNU_ARCH.m68000?=	m68010
+GNU_ARCH.m68ksf?=	m68k
 GNU_ARCH.mips?=		mipsel
 GNU_ARCH.sh3eb?=	sh
 GNU_ARCH.sh3el?=	shle
@@ -649,6 +650,7 @@ TARGET_OBJECT_FMT?=	${OBJECT_FMT} # XXX
     ${NATIVE_MACHINE_GNU_ARCH} == "arm" || \
     ${NATIVE_MACHINE_ARCH} == "i386" || \
     ${NATIVE_MACHINE_ARCH} == "m68k" || \
+    ${NATIVE_MACHINE_ARCH} == "m68ksf" || \
     ${NATIVE_MACHINE_ARCH} == "m68000" || \
     ${NATIVE_MACHINE_GNU_ARCH} == "sh" || \
     ${NATIVE_MACHINE_GNU_ARCH} == "shle" || \
@@ -661,6 +663,7 @@ NATIVE_APPEND_ELF=	elf
     ${MACHINE_GNU_ARCH} == "arm" || \
     ${MACHINE_ARCH} == "i386" || \
     ${MACHINE_ARCH} == "m68k" || \
+    ${MACHINE_ARCH} == "m68ksf" || \
     ${MACHINE_ARCH} == "m68000" || \
     ${MACHINE_GNU_ARCH} == "sh" || \
     ${MACHINE_GNU_ARCH} == "shle" || \
@@ -674,6 +677,7 @@ APPEND_ELF=		elf
     ${TARGET_MACHINE_GNU_ARCH} == "arm" || \
     ${TARGET_MACHINE_ARCH} == "i386" || \
     ${TARGET_MACHINE_ARCH} == "m68k" || \
+    ${TARGET_MACHINE_ARCH} == "m68ksf" || \
     ${TARGET_MACHINE_ARCH} == "m68000" || \
     ${TARGET_MACHINE_GNU_ARCH} == "sh" || \
     ${TARGET_MACHINE_GNU_ARCH} == "shle" || \
@@ -688,7 +692,7 @@ NATIVE_APPEND_ABI=	-${NATIVE_MACHINE_ARC
 APPEND_ABI=		-${MACHINE_ARCH:C/eb//:C/v[4-7]//:S/earm/eabi/}
 .  endif
 .  if !empty(TARGET_MACHINE_ARCH:Mearm*)
-TARGET_APPEND_ABI=	-${TARGET_MACHINE_ARCH:C/eb//:C/v[4-7]//:S/earm/eabi/}
+TARGET_APPEND_ABI=	-${TARGET_MACHINE_ARCH:C/eb//:C/v[4-7]//:S/earm/eabi/:S/m68ksf/m68k/}
 .  endif
 .endif
 
@@ -1051,7 +1055,7 @@ RECURSIVE_MAKE=		${PKGSRC_SETENV} ${PKGS
 #
 # Keywords: BROKEN_ON_PLATFORM 32bit
 #
-LP32PLATFORMS=		*-*-earm* *-*-hppa *-*-i386 *-*-m68000 *-*-m68k \
+LP32PLATFORMS=		*-*-earm* *-*-hppa *-*-i386 *-*-m68000 *-*-m68ksf *-*-m68k \
 			*-*-mipseb *-*-mipsel *-*-powerpc *-*-riscv32 \
 			*-*-sparc *-*-vax
 
@@ -1069,7 +1073,7 @@ LP64PLATFORMS=		*-*-aarch64 *-*-aarch64e
 #
 # Keywords: BROKEN_ON_PLATFORM little-endian big-endian endian
 #
-_BIGENDIANCPUS=		coldfire hppa m68000 m68k mips64eb mipseb or1k \
+_BIGENDIANCPUS=		coldfire hppa m68000 m68ksf m68k mips64eb mipseb or1k \
 			powerpc powerpc64 sh3eb sparc sparc64
 _LITTLEENDIANCPUS=	alpha i386 ia64 mips64el mipsel powerpc64le riscv32 \
 			riscv64 sh3el vax x86_64
diff -r 3156e1d22a8a mk/gnu-config/config.guess
--- a/mk/gnu-config/config.guess	Mon Oct 13 03:21:20 2025 +0000
+++ b/mk/gnu-config/config.guess	Thu Oct 16 11:07:08 2025 +1100
@@ -230,7 +230,7 @@ case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME
 	    earm*)
 		os=netbsdelf
 		;;
-	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
+	    arm*|i386|m68ksf|m68k|ns32k|sh3*|sparc|vax)
 		set_cc_for_build
 		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
 			| grep -q __ELF__
diff -r 3156e1d22a8a mk/gnu-config/config.sub
--- a/mk/gnu-config/config.sub	Mon Oct 13 03:21:20 2025 +0000
+++ b/mk/gnu-config/config.sub	Thu Oct 16 11:07:08 2025 +1100
@@ -1204,7 +1204,7 @@ case $cpu-$vendor in
 			| lm32 \
 			| loongarch32 | loongarch64 | loongarchx32 \
 			| m32c | m32r | m32rle \
-			| m5200 | m68000 | m680[012346]0 | m68360 | m683?2 | m68k \
+			| m5200 | m68000 | m680[012346]0 | m68360 | m683?2 | m68ksf| m68k \
 			| m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x \
 			| m88110 | m88k | maxq | mb | mcore | mep | metag \
 			| microblaze | microblazeel \


Home | Main Index | Thread Index | Old Index