plan9: drop special build and orphaned references

Would need 64-bit support. Ref: https://github.com/curl/curl/pull/20233#issuecomment-3732556015 Follow-up to 0159100f4f #20233 Closes #20243
2026-01-18 17:21:26 +01:00 · 2026-01-10 14:42:19 +01:00
parent 7433a6eb3f
commit bfacfb2355
24 changed files with 1 additions and 342 deletions
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -73,7 +73,6 @@ build:
              m4/**,\
              Makefile.*,\
              packages/**,\
-              plan9/**,\
              projects/**,\
              lib/libcurl.def,\
              tests/cmake/**\
--- a/.github/scripts/spacecheck.pl
+++ b/.github/scripts/spacecheck.pl
@@ -29,7 +29,6 @@ use warnings;
 my @tabs = (
    "^m4/zz40-xc-ovr.m4",
    "Makefile\\.(am|example)\$",
-    "/mkfile",
    "\\.sln\$",
    "^tests/data/data1706-stdout.txt",
    "^tests/data/test",
--- a/.github/workflows/checksrc.yml
+++ b/.github/workflows/checksrc.yml
@@ -15,7 +15,6 @@ name: 'Source'
      - '.circleci/**'
      - 'appveyor.*'
      - 'Dockerfile'
-      - 'plan9/**'
  pull_request:
    branches:
      - master
@@ -23,7 +22,6 @@ name: 'Source'
      - '.circleci/**'
      - 'appveyor.*'
      - 'Dockerfile'
-      - 'plan9/**'

 concurrency:
  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -14,7 +14,6 @@ name: 'CodeQL'
      - '.circleci/**'
      - 'appveyor.*'
      - 'packages/**'
-      - 'plan9/**'
      - 'projects/**'
      - 'tests/data/**'
  pull_request:
@@ -25,7 +24,6 @@ name: 'CodeQL'
      - '.circleci/**'
      - 'appveyor.*'
      - 'packages/**'
-      - 'plan9/**'
      - 'projects/**'
      - 'tests/data/**'
  schedule:
--- a/.github/workflows/curl-for-win.yml
+++ b/.github/workflows/curl-for-win.yml
@@ -15,7 +15,6 @@ name: 'curl-for-win'
      - 'appveyor.*'
      - 'Dockerfile'
      - 'packages/**'
-      - 'plan9/**'
      - 'projects/**'
  pull_request:
    branches:
@@ -26,7 +25,6 @@ name: 'curl-for-win'
      - 'appveyor.*'
      - 'Dockerfile'
      - 'packages/**'
-      - 'plan9/**'
      - 'projects/**'

 concurrency:
--- a/.github/workflows/fuzz.yml
+++ b/.github/workflows/fuzz.yml
@@ -17,7 +17,6 @@ name: 'Fuzzer'
      - 'CMake/**'
      - 'Dockerfile'
      - 'packages/**'
-      - 'plan9/**'
      - 'projects/**'
      - 'tests/data/**'
  pull_request:
@@ -31,7 +30,6 @@ name: 'Fuzzer'
      - 'CMake/**'
      - 'Dockerfile'
      - 'packages/**'
-      - 'plan9/**'
      - 'projects/**'
      - 'tests/data/**'

--- a/.github/workflows/http3-linux.yml
+++ b/.github/workflows/http3-linux.yml
@@ -15,7 +15,6 @@ name: 'Linux HTTP/3'
      - 'appveyor.*'
      - 'Dockerfile'
      - 'packages/**'
-      - 'plan9/**'
      - 'projects/**'
  pull_request:
    branches:
@@ -26,7 +25,6 @@ name: 'Linux HTTP/3'
      - 'appveyor.*'
      - 'Dockerfile'
      - 'packages/**'
-      - 'plan9/**'
      - 'projects/**'

 concurrency:
--- a/.github/workflows/linux-old.yml
+++ b/.github/workflows/linux-old.yml
@@ -29,7 +29,6 @@ name: 'Linux Old'
      - 'appveyor.*'
      - 'Dockerfile'
      - 'packages/**'
-      - 'plan9/**'
      - 'projects/**'
  pull_request:
    branches:
@@ -40,7 +39,6 @@ name: 'Linux Old'
      - 'appveyor.*'
      - 'Dockerfile'
      - 'packages/**'
-      - 'plan9/**'
      - 'projects/**'

 concurrency:
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -14,7 +14,6 @@ name: 'Linux'
      - 'appveyor.*'
      - 'Dockerfile'
      - 'packages/**'
-      - 'plan9/**'
      - 'projects/**'
  pull_request:
    branches:
@@ -24,7 +23,6 @@ name: 'Linux'
      - 'appveyor.*'
      - 'Dockerfile'
      - 'packages/**'
-      - 'plan9/**'
      - 'projects/**'

 concurrency:
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -15,7 +15,6 @@ name: 'macOS'
      - 'appveyor.*'
      - 'Dockerfile'
      - 'packages/**'
-      - 'plan9/**'
      - 'projects/**'
  pull_request:
    branches:
@@ -26,7 +25,6 @@ name: 'macOS'
      - 'appveyor.*'
      - 'Dockerfile'
      - 'packages/**'
-      - 'plan9/**'
      - 'projects/**'

 concurrency:
--- a/.github/workflows/non-native.yml
+++ b/.github/workflows/non-native.yml
@@ -15,7 +15,6 @@ name: 'non-native'
      - 'appveyor.*'
      - 'Dockerfile'
      - 'packages/**'
-      - 'plan9/**'
      - 'projects/**'
  pull_request:
    branches:
@@ -26,7 +25,6 @@ name: 'non-native'
      - 'appveyor.*'
      - 'Dockerfile'
      - 'packages/**'
-      - 'plan9/**'
      - 'projects/**'

 concurrency:
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -15,7 +15,6 @@ name: 'Windows'
      - 'appveyor.*'
      - 'Dockerfile'
      - 'packages/**'
-      - 'plan9/**'
      - 'projects/**'
  pull_request:
    branches:
@@ -26,7 +25,6 @@ name: 'Windows'
      - 'appveyor.*'
      - 'Dockerfile'
      - 'packages/**'
-      - 'plan9/**'
      - 'projects/**'

 concurrency:
--- a/Makefile.am
+++ b/Makefile.am
@@ -66,18 +66,8 @@ CMAKE_DIST =                                    \

 VC_DIST = projects/README.md projects/generate.bat

-PLAN9_DIST = plan9/include/mkfile \
- plan9/include/mkfile             \
- plan9/mkfile.proto               \
- plan9/mkfile                     \
- plan9/README                     \
- plan9/lib/mkfile.inc             \
- plan9/lib/mkfile                 \
- plan9/src/mkfile.inc             \
- plan9/src/mkfile
-
 EXTRA_DIST = CHANGES.md COPYING RELEASE-NOTES Dockerfile .editorconfig \
- $(CMAKE_DIST) $(VC_DIST) $(PLAN9_DIST)
+ $(CMAKE_DIST) $(VC_DIST)

 DISTCLEANFILES = buildinfo.txt

--- a/REUSE.toml
+++ b/REUSE.toml
@@ -26,7 +26,6 @@ path = [
  "packages/vms/curlmsg.sdl",
  "packages/vms/macro32_exactcase.patch",
  "packages/vms/readme",
-  "plan9/README",
  "projects/Windows/**",
  "README",
  "RELEASE-NOTES",
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -184,7 +184,6 @@ skip_commits:
    - '.github/**/*'
    - 'Dockerfile'
    - 'packages/**/*'
-    - 'plan9/**/*'

 #artifacts:
 #  - path: '**/curl.exe'
--- a/lib/curl_setup.h
+++ b/lib/curl_setup.h
@@ -154,10 +154,6 @@
 #  include "config-os400.h"
 #endif

-#ifdef __PLAN9__
-#  include "config-plan9.h"
-#endif
-
 #endif /* HAVE_CONFIG_H */

 /* ================================================================ */
--- a/plan9/README
+++ b/plan9/README
@@ -1,55 +0,0 @@
-Prerequirement
-==============
-This document describes how to compile, build and install curl and libcurl
-from sources using mk. To build it, you will require to install latest
-9legacy patches into Plan 9. Also Plan 9 still have no configuration option so
-both zlib and libopenssl are required too.
-
-The zlib that is available on Plan 9 can be downloaded from:
-
-  https://github.com/madler/zlib/pull/398
-
-LibreSSL Portable can be downloaded from:
-
-  https://github.com/libressl/portable/pull/510
-
-Instruction
-===========
-First, you should construct namespace as like described below:
-
-% bind -ac ../lib lib
-% bind -ac ../src src
-% bind -ac ../include include
-% bind -ac .. .
-
-Then you will see as shown below (excerpt):
-
-  curl.git/
-   |_plan9
-   | |_BUILD.PLAN9.txt
-   | |_CHANGES
-   | |_CMake
-   | |  :
-   | |_mkfile
-   | |_mkfile.proto
-   | |_include
-   | | |_Makefile.am
-   | | |  :
-   | | |_mkfile
-   | |_lib
-   | | |_CMakeLists.txt
-   | | |  :
-   | | |_mkfile
-   | | |_mkfile.inc
-   | |_src
-   | | |_CMakeLists.txt
-   | | |  :
-   | | |_mkfile
-   | | |_mkfile.inc
-   |_lib
-   |_src
-
-After constructing namespace, you can run mk on plan9 directory.
-
-% mk
-% mk install
--- a/plan9/include/mkfile
+++ b/plan9/include/mkfile
@@ -1,36 +0,0 @@
-#***************************************************************************
-#                                  _   _ ____  _
-#  Project                     ___| | | |  _ \| |
-#                             / __| | | | |_) | |
-#                            | (__| |_| |  _ <| |___
-#                             \___|\___/|_| \_\_____|
-#
-# Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al.
-#
-# This software is licensed as described in the file COPYING, which
-# you should have received as part of this distribution. The terms
-# are also available at https://curl.se/docs/copyright.html.
-#
-# You may opt to use, copy, modify, merge, publish, distribute and/or sell
-# copies of the Software, and permit persons to whom the Software is
-# furnished to do so, under the terms of the COPYING file.
-#
-# This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
-# KIND, either express or implied.
-#
-# SPDX-License-Identifier: curl
-#
-###########################################################################
-
-DIR=/sys/include/ape/curl
-HFILES=`{ls curl/*.h}
-
-all:V: $HFILES
-
-install:V: all
-	mkdir -p $DIR
-	cp curl/*.h $DIR/
-
-clean:V: $HFILES  # do nothing
-
-nuke:V: clean
--- a/plan9/lib/mkfile
+++ b/plan9/lib/mkfile
@@ -1,41 +0,0 @@
-#***************************************************************************
-#                                  _   _ ____  _
-#  Project                     ___| | | |  _ \| |
-#                             / __| | | | |_) | |
-#                            | (__| |_| |  _ <| |___
-#                             \___|\___/|_| \_\_____|
-#
-# Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al.
-#
-# This software is licensed as described in the file COPYING, which
-# you should have received as part of this distribution. The terms
-# are also available at https://curl.se/docs/copyright.html.
-#
-# You may opt to use, copy, modify, merge, publish, distribute and/or sell
-# copies of the Software, and permit persons to whom the Software is
-# furnished to do so, under the terms of the COPYING file.
-#
-# This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
-# KIND, either express or implied.
-#
-# SPDX-License-Identifier: curl
-#
-###########################################################################
-
-<../mkfile.proto
-<|mkfile.inc
-
-CFLAGS=$CFLAGS -I../include -I. -c
-
-OFILES=${CSOURCES:%.c=%.$O}
-HFILES=$HHEADERS
-LIB=/$objtype/lib/ape/libcurl.a
-
-CLEANFILES=\
-	${LIB_VAUTH_CFILES:%.c=%.$O}\
-	${LIB_VTLS_CFILES:%.c=%.$O}\
-
-</sys/src/cmd/mklib
-
-%.$O: %.c
-	$CC $CFLAGS -o $target $stem.c
--- a/plan9/lib/mkfile.inc
+++ b/plan9/lib/mkfile.inc
@@ -1,27 +0,0 @@
-#!/bin/rc
-#***************************************************************************
-#                                  _   _ ____  _
-#  Project                     ___| | | |  _ \| |
-#                             / __| | | | |_) | |
-#                            | (__| |_| |  _ <| |___
-#                             \___|\___/|_| \_\_____|
-#
-# Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al.
-#
-# This software is licensed as described in the file COPYING, which
-# you should have received as part of this distribution. The terms
-# are also available at https://curl.se/docs/copyright.html.
-#
-# You may opt to use, copy, modify, merge, publish, distribute and/or sell
-# copies of the Software, and permit persons to whom the Software is
-# furnished to do so, under the terms of the COPYING file.
-#
-# This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
-# KIND, either express or implied.
-#
-# SPDX-License-Identifier: curl
-#
-###########################################################################
-
-# rename $(VAR) -> $VAR
-sed 's/\$\(([A-Z_]+)\)/$\1/g' Makefile.inc
--- a/plan9/mkfile
+++ b/plan9/mkfile
@@ -1,38 +0,0 @@
-#***************************************************************************
-#                                  _   _ ____  _
-#  Project                     ___| | | |  _ \| |
-#                             / __| | | | |_) | |
-#                            | (__| |_| |  _ <| |___
-#                             \___|\___/|_| \_\_____|
-#
-# Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al.
-#
-# This software is licensed as described in the file COPYING, which
-# you should have received as part of this distribution. The terms
-# are also available at https://curl.se/docs/copyright.html.
-#
-# You may opt to use, copy, modify, merge, publish, distribute and/or sell
-# copies of the Software, and permit persons to whom the Software is
-# furnished to do so, under the terms of the COPYING file.
-#
-# This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
-# KIND, either express or implied.
-#
-# SPDX-License-Identifier: curl
-#
-###########################################################################
-
-</sys/src/ape/config
-
-DIRS=\
-	lib\
-	src\
-	include\
-
-default:V: all
-
-all install clean nuke:V:
-	for(i in $DIRS) @{
-		cd $i
-		mk $target
-	}
--- a/plan9/mkfile.proto
+++ b/plan9/mkfile.proto
@@ -1,32 +0,0 @@
-#***************************************************************************
-#                                  _   _ ____  _
-#  Project                     ___| | | |  _ \| |
-#                             / __| | | | |_) | |
-#                            | (__| |_| |  _ <| |___
-#                             \___|\___/|_| \_\_____|
-#
-# Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al.
-#
-# This software is licensed as described in the file COPYING, which
-# you should have received as part of this distribution. The terms
-# are also available at https://curl.se/docs/copyright.html.
-#
-# You may opt to use, copy, modify, merge, publish, distribute and/or sell
-# copies of the Software, and permit persons to whom the Software is
-# furnished to do so, under the terms of the COPYING file.
-#
-# This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
-# KIND, either express or implied.
-#
-# SPDX-License-Identifier: curl
-#
-###########################################################################
-
-</sys/src/ape/config
-
-CFLAGS=\
-	-D__PLAN9__\
-	-D_POSIX_SOURCE\
-	-D_BSD_EXTENSION\
-	-D_SUSV2_SOURCE\
-	-D_REENTRANT_SOURCE\
--- a/plan9/src/mkfile
+++ b/plan9/src/mkfile
@@ -1,47 +0,0 @@
-#***************************************************************************
-#                                  _   _ ____  _
-#  Project                     ___| | | |  _ \| |
-#                             / __| | | | |_) | |
-#                            | (__| |_| |  _ <| |___
-#                             \___|\___/|_| \_\_____|
-#
-# Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al.
-#
-# This software is licensed as described in the file COPYING, which
-# you should have received as part of this distribution. The terms
-# are also available at https://curl.se/docs/copyright.html.
-#
-# You may opt to use, copy, modify, merge, publish, distribute and/or sell
-# copies of the Software, and permit persons to whom the Software is
-# furnished to do so, under the terms of the COPYING file.
-#
-# This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
-# KIND, either express or implied.
-#
-# SPDX-License-Identifier: curl
-#
-###########################################################################
-
-<../mkfile.proto
-<|mkfile.inc
-
-CFLAGS=$CFLAGS -I../include -I../lib -c
-
-OFILES=${CURL_CFILES:%.c=%.$O}
-HFILES=$CURL_HFILES
-
-LIB=\
-	/$objtype/lib/ape/libcurl.a\
-	/$objtype/lib/ape/libssl.a\
-	/$objtype/lib/ape/libcrypto.a\
-	/$objtype/lib/ape/libz.a\
-
-BIN=/$objtype/bin
-TARG=curl
-
-CLEANFILES=tool_hugehelp.c
-
-</sys/src/cmd/mkone
-
-tool_hugehelp.c:
-	echo 'void hugehelp(void) {}' >$target
--- a/plan9/src/mkfile.inc
+++ b/plan9/src/mkfile.inc
@@ -1,27 +0,0 @@
-#!/bin/rc
-#***************************************************************************
-#                                  _   _ ____  _
-#  Project                     ___| | | |  _ \| |
-#                             / __| | | | |_) | |
-#                            | (__| |_| |  _ <| |___
-#                             \___|\___/|_| \_\_____|
-#
-# Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al.
-#
-# This software is licensed as described in the file COPYING, which
-# you should have received as part of this distribution. The terms
-# are also available at https://curl.se/docs/copyright.html.
-#
-# You may opt to use, copy, modify, merge, publish, distribute and/or sell
-# copies of the Software, and permit persons to whom the Software is
-# furnished to do so, under the terms of the COPYING file.
-#
-# This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
-# KIND, either express or implied.
-#
-# SPDX-License-Identifier: curl
-#
-###########################################################################
-
-# rename $(VAR) -> $VAR
-sed 's/\$\(([A-Z_]+)\)/$\1/g' Makefile.inc