pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc
Module Name: pkgsrc
Committed By: wiz
Date: Mon Apr 21 15:57:34 UTC 2025
Modified Files:
pkgsrc/bootstrap: README bootstrap
pkgsrc/mk: bsd.prefs.mk
pkgsrc/mk/check: check-perms.mk
pkgsrc/mk/compiler: gcc.mk
pkgsrc/mk/configure: install-sh-override.mk
pkgsrc/mk/features: features-vars.mk
pkgsrc/mk/pkginstall: bsd.pkginstall.mk
pkgsrc/mk/pkgtasks: usergroup.mk
pkgsrc/mk/wrapper: bsd.wrapper.mk
Removed Files:
pkgsrc/bootstrap: README.Interix
pkgsrc/mk/tools: tools.Interix.mk
pkgsrc/mk/wrapper: cmd-sink-interix-gcc cmd-sink-interix-ld
pkgsrc/pkgtools/bootstrap-mk-files/files/mods: Interix.bsd.lib.mk
Interix.sys.mk
Log Message:
mk: remove Interix support
To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 pkgsrc/bootstrap/README
cvs rdiff -u -r1.18 -r0 pkgsrc/bootstrap/README.Interix
cvs rdiff -u -r1.334 -r1.335 pkgsrc/bootstrap/bootstrap
cvs rdiff -u -r1.458 -r1.459 pkgsrc/mk/bsd.prefs.mk
cvs rdiff -u -r1.24 -r1.25 pkgsrc/mk/check/check-perms.mk
cvs rdiff -u -r1.288 -r1.289 pkgsrc/mk/compiler/gcc.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/mk/configure/install-sh-override.mk
cvs rdiff -u -r1.28 -r1.29 pkgsrc/mk/features/features-vars.mk
cvs rdiff -u -r1.80 -r1.81 pkgsrc/mk/pkginstall/bsd.pkginstall.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/mk/pkgtasks/usergroup.mk
cvs rdiff -u -r1.24 -r0 pkgsrc/mk/tools/tools.Interix.mk
cvs rdiff -u -r1.105 -r1.106 pkgsrc/mk/wrapper/bsd.wrapper.mk
cvs rdiff -u -r1.5 -r0 pkgsrc/mk/wrapper/cmd-sink-interix-gcc
cvs rdiff -u -r1.3 -r0 pkgsrc/mk/wrapper/cmd-sink-interix-ld
cvs rdiff -u -r1.2 -r0 \
pkgsrc/pkgtools/bootstrap-mk-files/files/mods/Interix.bsd.lib.mk
cvs rdiff -u -r1.3 -r0 \
pkgsrc/pkgtools/bootstrap-mk-files/files/mods/Interix.sys.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/bootstrap/README
diff -u pkgsrc/bootstrap/README:1.44 pkgsrc/bootstrap/README:1.45
--- pkgsrc/bootstrap/README:1.44 Mon Mar 31 14:13:21 2025
+++ pkgsrc/bootstrap/README Mon Apr 21 15:57:33 2025
@@ -1,4 +1,4 @@
-$NetBSD: README,v 1.44 2025/03/31 14:13:21 wiz Exp $
+$NetBSD: README,v 1.45 2025/04/21 15:57:33 wiz Exp $
To try to get pkgsrc working on your system, please try the following
as root:
@@ -144,6 +144,5 @@ Platforms believed to have no users
* AIX (no cwrappers)
Haiku
- Interix
IRIX
* OSF1
Index: pkgsrc/bootstrap/bootstrap
diff -u pkgsrc/bootstrap/bootstrap:1.334 pkgsrc/bootstrap/bootstrap:1.335
--- pkgsrc/bootstrap/bootstrap:1.334 Sat Apr 12 08:46:05 2025
+++ pkgsrc/bootstrap/bootstrap Mon Apr 21 15:57:33 2025
@@ -1,6 +1,6 @@
#! /bin/sh
-# $NetBSD: bootstrap,v 1.334 2025/04/12 08:46:05 nia Exp $
+# $NetBSD: bootstrap,v 1.335 2025/04/21 15:57:33 wiz Exp $
#
# Copyright (c) 2001-2011 Alistair Crooks <agc%NetBSD.org@localhost>
# All rights reserved.
@@ -668,34 +668,6 @@ HPUX)
need_sed=yes
machine_arch=`uname -m | sed 's/^9000.*$/hppa/'`
;;
-Interix)
- is_root () {
- if id -G | grep -q 131616; then
- return 0
- fi
- return 1
- }
- mkdir_p () {
- mkdir -p "$@" # allows umask to take effect
- }
- default_install_mode=0775
- root_user=`id -un`
- root_group=+Administrators
- case `uname -r` in
- 3.* | 5.*)
- need_bsd_install=yes
- need_awk=yes
- need_sed=yes
- need_xargs=yes
- ;;
- esac
- # only used for unprivileged builds
- groupsprog="id -gn"
- # for bootstrap only; pkgsrc uses CPPFLAGS
- CC="gcc -D_ALL_SOURCE"; export CC
- ac_cv_header_poll_h=no; export ac_cv_header_poll_h
- ac_cv_func_poll=no; export ac_cv_func_poll
- ;;
IRIX*)
if [ -d "/usr/freeware/bin" ]; then
overpath="/usr/freeware/bin:$overpath"
Index: pkgsrc/mk/bsd.prefs.mk
diff -u pkgsrc/mk/bsd.prefs.mk:1.458 pkgsrc/mk/bsd.prefs.mk:1.459
--- pkgsrc/mk/bsd.prefs.mk:1.458 Mon Mar 31 14:13:21 2025
+++ pkgsrc/mk/bsd.prefs.mk Mon Apr 21 15:57:33 2025
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prefs.mk,v 1.458 2025/03/31 14:13:21 wiz Exp $
+# $NetBSD: bsd.prefs.mk,v 1.459 2025/04/21 15:57:33 wiz Exp $
#
# This file includes the mk.conf file, which contains the user settings.
#
@@ -214,22 +214,6 @@ NATIVE_LOWER_OPSYS?= haiku
NATIVE_LOWER_VENDOR?= pc
. endif
-.elif ${NATIVE_OPSYS} == "Interix"
-NATIVE_LOWER_OPSYS?= interix
-NATIVE_LOWER_VENDOR?= pc
-. if exists(/usr/lib/libc.so.5.2) || exists(/usr/lib/x86/libc.so.5.2)
-NATIVE_LOWER_OPSYS_VERSUFFIX= ${NATIVE_OS_VERSION:C/([0-9]*).*/\1/}
-. else
-NATIVE_LOWER_OPSYS_VERSUFFIX?= 3
-. if exists(/usr/lib/libc.so.3.5)
-NATIVE_OS_VERSION= 3.5
-. elif exists(/usr/lib/libc.so.3.1)
-NATIVE_OS_VERSION= 3.1
-. else
-NATIVE_OS_VERSION= 3.0
-. endif
-. endif
-
.elif !empty(NATIVE_OPSYS:MIRIX*)
NATIVE_LOWER_OPSYS?= irix
NATIVE_LOWER_OPSYS_VERSUFFIX?= ${NATIVE_OS_VERSION}
Index: pkgsrc/mk/check/check-perms.mk
diff -u pkgsrc/mk/check/check-perms.mk:1.24 pkgsrc/mk/check/check-perms.mk:1.25
--- pkgsrc/mk/check/check-perms.mk:1.24 Tue Jun 27 10:27:20 2023
+++ pkgsrc/mk/check/check-perms.mk Mon Apr 21 15:57:33 2025
@@ -1,4 +1,4 @@
-# $NetBSD: check-perms.mk,v 1.24 2023/06/27 10:27:20 riastradh Exp $
+# $NetBSD: check-perms.mk,v 1.25 2025/04/21 15:57:33 wiz Exp $
#
# This file checks that after installation of a package, all files and
# directories of that package have sensible permissions set.
@@ -43,11 +43,7 @@ CHECK_PERMS?= no
CHECK_PERMS_SKIP?= # none
CHECK_PERMS_AUTOFIX?= no
-# The checkperms command does not yet support Interix with the -c flag.
-# See PR 34968.
-.if !empty(MACHINE_PLATFORM:MInterix-*-*)
-_CHECK_PERMS_FLAGS=
-.elif !empty(CHECK_PERMS_AUTOFIX:M[Yy][Ee][Ss])
+.if !empty(CHECK_PERMS_AUTOFIX:M[Yy][Ee][Ss])
_CHECK_PERMS_FLAGS= -cff
.else
_CHECK_PERMS_FLAGS= -c
Index: pkgsrc/mk/compiler/gcc.mk
diff -u pkgsrc/mk/compiler/gcc.mk:1.288 pkgsrc/mk/compiler/gcc.mk:1.289
--- pkgsrc/mk/compiler/gcc.mk:1.288 Tue Feb 18 11:58:03 2025
+++ pkgsrc/mk/compiler/gcc.mk Mon Apr 21 15:57:33 2025
@@ -1,4 +1,4 @@
-# $NetBSD: gcc.mk,v 1.288 2025/02/18 11:58:03 wiz Exp $
+# $NetBSD: gcc.mk,v 1.289 2025/04/21 15:57:33 wiz Exp $
#
# This is the compiler definition for the GNU Compiler Collection.
#
@@ -1299,11 +1299,6 @@ _GCC_NEEDS_A_FORTRAN= yes
. include "../../mk/compiler/${PKGSRC_FORTRAN}.mk"
.endif
-.if ${OPSYS} == "Interix" && !empty(_GCCBINDIR:M/opt/gcc.*)
-COMPILER_INCLUDE_DIRS= ${_GCCBINDIR:H}/include ${_OPSYS_INCLUDE_DIRS}
-COMPILER_LIB_DIRS= ${_GCCBINDIR:H}/lib ${_OPSYS_LIB_DIRS}
-.endif
-
#.READONLY: GCC_REQD
_GCC_REQD_EFFECTIVE:= ${GCC_REQD}
Index: pkgsrc/mk/configure/install-sh-override.mk
diff -u pkgsrc/mk/configure/install-sh-override.mk:1.2 pkgsrc/mk/configure/install-sh-override.mk:1.3
--- pkgsrc/mk/configure/install-sh-override.mk:1.2 Thu Feb 7 21:36:13 2008
+++ pkgsrc/mk/configure/install-sh-override.mk Mon Apr 21 15:57:34 2025
@@ -1,11 +1,10 @@
-# $NetBSD: install-sh-override.mk,v 1.2 2008/02/07 21:36:13 rillig Exp $
+# $NetBSD: install-sh-override.mk,v 1.3 2025/04/21 15:57:34 wiz Exp $
######################################################################
### install-sh-override (PRIVATE)
######################################################################
### install-sh-override replace any existing install-sh under
-### ${WRKSRC} with the version from sysutils/install-sh, which works
-### on all pkgsrc platforms, in particular Interix.
+### ${WRKSRC} with the version from sysutils/install-sh
###
do-configure-pre-hook: install-sh-override
Index: pkgsrc/mk/features/features-vars.mk
diff -u pkgsrc/mk/features/features-vars.mk:1.28 pkgsrc/mk/features/features-vars.mk:1.29
--- pkgsrc/mk/features/features-vars.mk:1.28 Thu Nov 9 18:56:45 2023
+++ pkgsrc/mk/features/features-vars.mk Mon Apr 21 15:57:34 2025
@@ -1,4 +1,4 @@
-# $NetBSD: features-vars.mk,v 1.28 2023/11/09 18:56:45 nia Exp $
+# $NetBSD: features-vars.mk,v 1.29 2025/04/21 15:57:34 wiz Exp $
#
# The platforms that are supported by pkgsrc differ in the amount of
# functions they provide in the C library (libc). Functions that are
@@ -185,14 +185,6 @@ MISSING_FEATURES+= ${_feature_}
. endif
.endfor
-.for _feature_ in utimes
-. if !empty(USE_FEATURES:M${_feature_})
-. if ${OPSYS} == "Interix"
-MISSING_FEATURES+= ${_feature_}
-. endif
-. endif
-.endfor
-
.if !empty(USE_FEATURES:Mnbcompat)
MISSING_FEATURES+= nbcompat
.endif
Index: pkgsrc/mk/pkginstall/bsd.pkginstall.mk
diff -u pkgsrc/mk/pkginstall/bsd.pkginstall.mk:1.80 pkgsrc/mk/pkginstall/bsd.pkginstall.mk:1.81
--- pkgsrc/mk/pkginstall/bsd.pkginstall.mk:1.80 Tue May 14 20:28:32 2024
+++ pkgsrc/mk/pkginstall/bsd.pkginstall.mk Mon Apr 21 15:57:34 2025
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkginstall.mk,v 1.80 2024/05/14 20:28:32 bacon Exp $
+# $NetBSD: bsd.pkginstall.mk,v 1.81 2025/04/21 15:57:34 wiz Exp $
#
# This Makefile fragment is included by bsd.pkg.mk and implements the
# common INSTALL/DEINSTALL scripts framework. To use the pkginstall
@@ -219,20 +219,6 @@ PKG_USERS+= ${GAMES_USER}:${GAMES_GROUP}
_BUILD_DEFS+= GAMES_GROUP GAMES_USER GAMEDATAMODE GAMEDIRMODE GAMEMODE
.endif
-# Interix is very special in that users and groups cannot have the
-# same name. Interix.mk tries to work around this by overriding
-# some specific package defaults. If we get here and there's still a
-# conflict, add a breakage indicator to make sure the package won't
-# compile without changing something.
-#
-.if !empty(OPSYS:MInterix)
-. for user in ${PKG_USERS:C/\\\\//g:C/:.*//}
-. if !empty(PKG_GROUPS:M${user})
-PKG_FAIL_REASON+= "User and group '${user}' cannot have the same name on Interix"
-. endif
-. endfor
-.endif
-
.if !empty(PKG_USERS) || !empty(PKG_GROUPS)
DEPENDS+= ${_USER_DEPENDS}
.endif
Index: pkgsrc/mk/pkgtasks/usergroup.mk
diff -u pkgsrc/mk/pkgtasks/usergroup.mk:1.1 pkgsrc/mk/pkgtasks/usergroup.mk:1.2
--- pkgsrc/mk/pkgtasks/usergroup.mk:1.1 Thu Jun 1 02:06:04 2017
+++ pkgsrc/mk/pkgtasks/usergroup.mk Mon Apr 21 15:57:34 2025
@@ -1,4 +1,4 @@
-# $NetBSD: usergroup.mk,v 1.1 2017/06/01 02:06:04 jlam Exp $
+# $NetBSD: usergroup.mk,v 1.2 2025/04/21 15:57:34 wiz Exp $
#
# Copyright (c) 2017 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -141,14 +141,6 @@ PKG_USERS+= ${GAMES_USER}:${GAMES_GROUP}
_BUILD_DEFS+= GAMES_GROUP GAMES_USER GAMEDATAMODE GAMEDIRMODE GAMEMODE
.endif
-.if !defined(OPSYS) && !empty(OPSYS:MInterix)
-. for _user_ in ${PKG_USERS:C/\\\\//g:C/:.*//}
-. if !empty(PKG_GROUPS:M${_user_})
-PKG_FAIL_REASON+= "User and group '${_user_}' cannot be the same name on Interix".
-. endif
-. endfor
-.endif
-
# Trigger dependency on pkgtasks if needed.
_PKGTASKS_DATAVARS.groups= PKG_GROUPS
_PKGTASKS_DATAVARS.users= PKG_USERS
Index: pkgsrc/mk/wrapper/bsd.wrapper.mk
diff -u pkgsrc/mk/wrapper/bsd.wrapper.mk:1.105 pkgsrc/mk/wrapper/bsd.wrapper.mk:1.106
--- pkgsrc/mk/wrapper/bsd.wrapper.mk:1.105 Mon Apr 4 11:23:07 2022
+++ pkgsrc/mk/wrapper/bsd.wrapper.mk Mon Apr 21 15:57:34 2025
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.wrapper.mk,v 1.105 2022/04/04 11:23:07 riastradh Exp $
+# $NetBSD: bsd.wrapper.mk,v 1.106 2025/04/21 15:57:34 wiz Exp $
#
# Copyright (c) 2005 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -321,14 +321,7 @@ _WRAP_SKIP_TRANSFORM.IMAKE= yes
# XXX
# XXX This section is ${OPSYS}-specific and shouldn't be here.
# XXX
-.if ${OPSYS} == "Interix"
-_WRAP_EXTRA_ARGS.CC+= -D_ALL_SOURCE
-_WRAP_EXTRA_ARGS.CXX+= -D_ALL_SOURCE
-_WRAP_EXTRA_ARGS.CPP+= -D_ALL_SOURCE
-_WRAP_CMD_SINK.CC= ${WRAPPER_TMPDIR}/cmd-sink-interix-gcc
-_WRAP_CMD_SINK.CXX= ${_WRAP_CMD_SINK.CC}
-_WRAP_CMD_SINK.LD= ${WRAPPER_TMPDIR}/cmd-sink-interix-ld
-.elif ${OPSYS} == "Darwin"
+.if ${OPSYS} == "Darwin"
_WRAP_ARG_PP.CC= ${WRAPPER_TMPDIR}/arg-pp-darwin-gcc
_WRAP_ARG_PP.CXX= ${_WRAP_ARG_PP.CC}
_WRAP_ARG_PP.LD= ${_WRAP_ARG_PP.CC}
@@ -514,7 +507,6 @@ generate-wrappers: ${_target_}
cmd-sink-icc81-cc \
cmd-sink-irix-cc \
cmd-sink-irix-ld \
- cmd-sink-interix-gcc \
cmd-sink-ld \
cmd-sink-mkpie-gcc \
cmd-sink-mkpie-ld \
Home |
Main Index |
Thread Index |
Old Index