From: Viktor Szakats Date: Sat, 10 Jan 2026 13:42:19 +0000 (+0100) Subject: plan9: drop special build and orphaned references X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bfacfb23557b0b148733202831d5ab9384152e29;p=thirdparty%2Fcurl.git 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 0159100f4f782432fa3d27998dbea7b827ffba2d #20233 Closes #20243 --- diff --git a/.github/labeler.yml b/.github/labeler.yml index a3ca5d38be..18e0f6c9ff 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -73,7 +73,6 @@ build: m4/**,\ Makefile.*,\ packages/**,\ - plan9/**,\ projects/**,\ lib/libcurl.def,\ tests/cmake/**\ diff --git a/.github/scripts/spacecheck.pl b/.github/scripts/spacecheck.pl index 28d4030ed7..0ff5234529 100755 --- 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", diff --git a/.github/workflows/checksrc.yml b/.github/workflows/checksrc.yml index e9dd584a0b..6e034b96d8 100644 --- 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 }} diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 79e7587b29..d5578387c9 100644 --- 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: diff --git a/.github/workflows/curl-for-win.yml b/.github/workflows/curl-for-win.yml index d32bfe7c33..c6396f3704 100644 --- 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: diff --git a/.github/workflows/fuzz.yml b/.github/workflows/fuzz.yml index eb4bd0dc88..be6c5f9e48 100644 --- 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/**' diff --git a/.github/workflows/http3-linux.yml b/.github/workflows/http3-linux.yml index c5e1cb85da..b9af47a8ea 100644 --- 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: diff --git a/.github/workflows/linux-old.yml b/.github/workflows/linux-old.yml index 75dd407b04..fad1ba3f45 100644 --- 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: diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 7f8d870ccf..7681bd29d7 100644 --- 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: diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 4be86850f1..75fe0c9a5b 100644 --- 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: diff --git a/.github/workflows/non-native.yml b/.github/workflows/non-native.yml index df06af6bfa..9a5defacc3 100644 --- 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: diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 721d5e54d9..62d8266869 100644 --- 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: diff --git a/Makefile.am b/Makefile.am index 5f6bb670e5..5434d5e4d3 100644 --- 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 diff --git a/REUSE.toml b/REUSE.toml index e341973ad3..e394b7d62c 100644 --- 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", diff --git a/appveyor.yml b/appveyor.yml index 91a425c7fa..5a35db43cb 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -184,7 +184,6 @@ skip_commits: - '.github/**/*' - 'Dockerfile' - 'packages/**/*' - - 'plan9/**/*' #artifacts: # - path: '**/curl.exe' diff --git a/lib/curl_setup.h b/lib/curl_setup.h index 66b46a0749..7698305a5b 100644 --- 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 */ /* ================================================================ */ diff --git a/plan9/README b/plan9/README deleted file mode 100644 index 3372e64f7b..0000000000 --- a/plan9/README +++ /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 index a0970e932a..0000000000 --- a/plan9/include/mkfile +++ /dev/null @@ -1,36 +0,0 @@ -#*************************************************************************** -# _ _ ____ _ -# Project ___| | | | _ \| | -# / __| | | | |_) | | -# | (__| |_| | _ <| |___ -# \___|\___/|_| \_\_____| -# -# Copyright (C) Daniel Stenberg, , 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 index 04b54a8378..0000000000 --- a/plan9/lib/mkfile +++ /dev/null @@ -1,41 +0,0 @@ -#*************************************************************************** -# _ _ ____ _ -# Project ___| | | | _ \| | -# / __| | | | |_) | | -# | (__| |_| | _ <| |___ -# \___|\___/|_| \_\_____| -# -# Copyright (C) Daniel Stenberg, , 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}\ - -, 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 index 2133a49702..0000000000 --- a/plan9/mkfile +++ /dev/null @@ -1,38 +0,0 @@ -#*************************************************************************** -# _ _ ____ _ -# Project ___| | | | _ \| | -# / __| | | | |_) | | -# | (__| |_| | _ <| |___ -# \___|\___/|_| \_\_____| -# -# Copyright (C) Daniel Stenberg, , 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 -# -########################################################################### - -, 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 -# -########################################################################### - -, 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 - -$target diff --git a/plan9/src/mkfile.inc b/plan9/src/mkfile.inc deleted file mode 100755 index 5c2cc128f7..0000000000 --- a/plan9/src/mkfile.inc +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/rc -#*************************************************************************** -# _ _ ____ _ -# Project ___| | | | _ \| | -# / __| | | | |_) | | -# | (__| |_| | _ <| |___ -# \___|\___/|_| \_\_____| -# -# Copyright (C) Daniel Stenberg, , 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