]> git.ipfire.org Git - thirdparty/curl.git/commitdiff
plan9: drop special build and orphaned references
authorViktor Szakats <commit@vsz.me>
Sat, 10 Jan 2026 13:42:19 +0000 (14:42 +0100)
committerViktor Szakats <commit@vsz.me>
Sat, 10 Jan 2026 22:03:17 +0000 (23:03 +0100)
Would need 64-bit support.

Ref: https://github.com/curl/curl/pull/20233#issuecomment-3732556015
Follow-up to 0159100f4f782432fa3d27998dbea7b827ffba2d #20233

Closes #20243

24 files changed:
.github/labeler.yml
.github/scripts/spacecheck.pl
.github/workflows/checksrc.yml
.github/workflows/codeql.yml
.github/workflows/curl-for-win.yml
.github/workflows/fuzz.yml
.github/workflows/http3-linux.yml
.github/workflows/linux-old.yml
.github/workflows/linux.yml
.github/workflows/macos.yml
.github/workflows/non-native.yml
.github/workflows/windows.yml
Makefile.am
REUSE.toml
appveyor.yml
lib/curl_setup.h
plan9/README [deleted file]
plan9/include/mkfile [deleted file]
plan9/lib/mkfile [deleted file]
plan9/lib/mkfile.inc [deleted file]
plan9/mkfile [deleted file]
plan9/mkfile.proto [deleted file]
plan9/src/mkfile [deleted file]
plan9/src/mkfile.inc [deleted file]

index a3ca5d38be8c6f6daa4c2fd3370b383cfdfdbb78..18e0f6c9ff2a0d8cd6673a431fd3ee0f14f70f7d 100644 (file)
@@ -73,7 +73,6 @@ build:
               m4/**,\
               Makefile.*,\
               packages/**,\
-              plan9/**,\
               projects/**,\
               lib/libcurl.def,\
               tests/cmake/**\
index 28d4030ed78b71ff9ed326c75ece857aa6925715..0ff52345291baabe0628455cbb7cf25b43ea43cd 100755 (executable)
@@ -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",
index e9dd584a0b18aa869809a27fddd8f902bc37e0a4..6e034b96d8cb1ac4236944ec06dcf59d6bcda279 100644 (file)
@@ -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 }}
index 79e7587b29b462ba62698f4c5c5d4bcc87c7f081..d5578387c98d317c894c0bc253a36c4355ab7cbf 100644 (file)
@@ -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:
index d32bfe7c3386b7b5373b01189a33112068f20e37..c6396f37045837b7c553bf6306de04733235319e 100644 (file)
@@ -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:
index eb4bd0dc887ba0caa778b4d490d733b73765138b..be6c5f9e48240f4fdc8c1ac46a1e90ed6e56cb40 100644 (file)
@@ -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/**'
 
index c5e1cb85da69bd9e9d083678a205eb60d03dac66..b9af47a8ea6533ad1c3b4f39ab0676d15394d1c9 100644 (file)
@@ -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:
index 75dd407b04910d55faa8bb287ad5e979a12784fe..fad1ba3f4551fb6d0152af0d639da2eda3a99106 100644 (file)
@@ -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:
index 7f8d870ccf916cb452c24071454c2cd57fd8e867..7681bd29d770ae51b135ed3d6e31c3e86e592eed 100644 (file)
@@ -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:
index 4be86850f1f6200b4c881dedbb9307bbdc28d355..75fe0c9a5b7d5419a8532e98717483df365af1ba 100644 (file)
@@ -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:
index df06af6bfa9f8c43ddc31072fee21f3cf570ab2d..9a5defacc3c6e3333120f5febb4cf8ca5fa6c4e4 100644 (file)
@@ -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:
index 721d5e54d92f7038f33c40185d6da69572a2b2b7..62d826686986039d8b03afe460856b884a515cec 100644 (file)
@@ -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:
index 5f6bb670e51c434827f00699dd0a76c3e0a33540..5434d5e4d34fd1057b8ce98eedccd74b0527a984 100644 (file)
@@ -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
 
index e341973ad3d3c338d1ade8264407dd2afa321db5..e394b7d62cf5ce4431dcacb9a2a8e229a2cbbf63 100644 (file)
@@ -26,7 +26,6 @@ path = [
   "packages/vms/curlmsg.sdl",
   "packages/vms/macro32_exactcase.patch",
   "packages/vms/readme",
-  "plan9/README",
   "projects/Windows/**",
   "README",
   "RELEASE-NOTES",
index 91a425c7faca18772304965c82e05bb43ecb8bb5..5a35db43cb970d0aaeda1d5c6d853e221d048c70 100644 (file)
@@ -184,7 +184,6 @@ skip_commits:
     - '.github/**/*'
     - 'Dockerfile'
     - 'packages/**/*'
-    - 'plan9/**/*'
 
 #artifacts:
 #  - path: '**/curl.exe'
index 66b46a0749c4bfea0902108d449533bd75f66672..7698305a5b02160948174095eee06c22981df3be 100644 (file)
 #  include "config-os400.h"
 #endif
 
-#ifdef __PLAN9__
-#  include "config-plan9.h"
-#endif
-
 #endif /* HAVE_CONFIG_H */
 
 /* ================================================================ */
diff --git a/plan9/README b/plan9/README
deleted file mode 100644 (file)
index 3372e64..0000000
+++ /dev/null
@@ -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
diff --git a/plan9/include/mkfile b/plan9/include/mkfile
deleted file mode 100644 (file)
index a0970e9..0000000
+++ /dev/null
@@ -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
diff --git a/plan9/lib/mkfile b/plan9/lib/mkfile
deleted file mode 100644 (file)
index 04b54a8..0000000
+++ /dev/null
@@ -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
diff --git a/plan9/lib/mkfile.inc b/plan9/lib/mkfile.inc
deleted file mode 100755 (executable)
index 5c2cc12..0000000
+++ /dev/null
@@ -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
diff --git a/plan9/mkfile b/plan9/mkfile
deleted file mode 100644 (file)
index 2133a49..0000000
+++ /dev/null
@@ -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
-       }
diff --git a/plan9/mkfile.proto b/plan9/mkfile.proto
deleted file mode 100644 (file)
index 4ad41a1..0000000
+++ /dev/null
@@ -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\
diff --git a/plan9/src/mkfile b/plan9/src/mkfile
deleted file mode 100644 (file)
index beb98cb..0000000
+++ /dev/null
@@ -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
diff --git a/plan9/src/mkfile.inc b/plan9/src/mkfile.inc
deleted file mode 100755 (executable)
index 5c2cc12..0000000
+++ /dev/null
@@ -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