From 7159b97f19d61d4544dfcaf1b10d85f4e0ebb01f Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sat, 17 Jan 2026 17:06:44 +0900 Subject: Remove support for HPUX, which is discontinued and does not provide a c++17 complaint compiler. Signed-off-by: Michele Calgaro --- configure.in.in | 5 -- kdevdesigner/designer/orderindicator.cpp | 2 +- kdevdesigner/designer/pixmapchooser.cpp | 2 +- kdevdesigner/designer/propertyeditor.cpp | 2 +- kdevdesigner/designer/sizehandle.cpp | 2 +- kdevdesigner/designer/styledbutton.cpp | 2 +- kdevdesigner/designer/widgetfactory.cpp | 2 +- kdevdesigner/designer/workspace.cpp | 2 +- .../cpp/app_templates/cppsdlhello/acinclude.m4 | 1 - languages/cpp/debugger/stty.cpp | 5 -- languages/ruby/debugger/stty.cpp | 5 -- lib/antlr/README | 1 - lib/antlr/antlr/CharScanner.h | 2 +- .../common/gnome/macros/gnome-fileutils.m4 | 2 +- .../common/gnome/macros/gnome-print-check.m4 | 1 - parts/appwizard/common/incadmin/config.guess | 88 +--------------------- parts/appwizard/common/incadmin/config.sub | 12 +-- parts/appwizard/common/incadmin/depcomp | 6 +- parts/appwizard/common/incadmin/ltmain.sh | 6 -- 19 files changed, 14 insertions(+), 134 deletions(-) diff --git a/configure.in.in b/configure.in.in index 58e8ad45..57aba53e 100644 --- a/configure.in.in +++ b/configure.in.in @@ -116,11 +116,6 @@ AC_CHECK_PROG(GZIP_COMMAND, gzip, gzip) AC_DEFINE_UNQUOTED(MAKE_COMMAND, "$gmake_prog", [GNU make command]) CXXFLAGS="$CXXFLAGS $KDE_DEFAULT_CXXFLAGS" -case $host_os in -hpux11*) - CPPFLAGS="$CPPFLAGS -D_PROTOTYPES" - ;; -esac dnl AC_CHECK_FILE([$tqt_includes/qassistantclient.h], [],[AC_MSG_ERROR([The qassistantclient.h header from Qt3 is needed to build tdevelop, on some systems this header is in a separate package called qt3-apps-dev])]) diff --git a/kdevdesigner/designer/orderindicator.cpp b/kdevdesigner/designer/orderindicator.cpp index 445e835f..7ee371bd 100644 --- a/kdevdesigner/designer/orderindicator.cpp +++ b/kdevdesigner/designer/orderindicator.cpp @@ -24,7 +24,7 @@ ** **********************************************************************/ -#include // HP-UX compiler need this here +#include #include "orderindicator.h" #include "formwindow.h" diff --git a/kdevdesigner/designer/pixmapchooser.cpp b/kdevdesigner/designer/pixmapchooser.cpp index 79cb0cab..2d837a63 100644 --- a/kdevdesigner/designer/pixmapchooser.cpp +++ b/kdevdesigner/designer/pixmapchooser.cpp @@ -24,7 +24,7 @@ ** **********************************************************************/ -#include // HP-UX compiler needs this here +#include #include #include diff --git a/kdevdesigner/designer/propertyeditor.cpp b/kdevdesigner/designer/propertyeditor.cpp index 41d21a02..bfa136bb 100644 --- a/kdevdesigner/designer/propertyeditor.cpp +++ b/kdevdesigner/designer/propertyeditor.cpp @@ -24,7 +24,7 @@ ** **********************************************************************/ -#include // HP-UX compiler needs this here +#include #include "propertyeditor.h" #include "formwindow.h" diff --git a/kdevdesigner/designer/sizehandle.cpp b/kdevdesigner/designer/sizehandle.cpp index a0e971bc..7e5c616a 100644 --- a/kdevdesigner/designer/sizehandle.cpp +++ b/kdevdesigner/designer/sizehandle.cpp @@ -24,7 +24,7 @@ ** **********************************************************************/ -#include // HP-UX compiler needs this here +#include #include "sizehandle.h" #include "formwindow.h" diff --git a/kdevdesigner/designer/styledbutton.cpp b/kdevdesigner/designer/styledbutton.cpp index 2976be3b..d047d69e 100644 --- a/kdevdesigner/designer/styledbutton.cpp +++ b/kdevdesigner/designer/styledbutton.cpp @@ -24,7 +24,7 @@ ** **********************************************************************/ -#include // HP-UX compiler needs this here +#include #include "styledbutton.h" #include "formwindow.h" #include "pixmapchooser.h" diff --git a/kdevdesigner/designer/widgetfactory.cpp b/kdevdesigner/designer/widgetfactory.cpp index 595cae71..f726778d 100644 --- a/kdevdesigner/designer/widgetfactory.cpp +++ b/kdevdesigner/designer/widgetfactory.cpp @@ -24,7 +24,7 @@ ** **********************************************************************/ -#include // HP-UX compiler need this here +#include #include "widgetfactory.h" #include #include "metadatabase.h" diff --git a/kdevdesigner/designer/workspace.cpp b/kdevdesigner/designer/workspace.cpp index df14b51e..31f7a2a0 100644 --- a/kdevdesigner/designer/workspace.cpp +++ b/kdevdesigner/designer/workspace.cpp @@ -24,7 +24,7 @@ ** **********************************************************************/ -#include // HP-UX compiler needs this here +#include #include "workspace.h" #include "formwindow.h" #include "mainwindow.h" diff --git a/languages/cpp/app_templates/cppsdlhello/acinclude.m4 b/languages/cpp/app_templates/cppsdlhello/acinclude.m4 index 9681a33a..843cdd3b 100644 --- a/languages/cpp/app_templates/cppsdlhello/acinclude.m4 +++ b/languages/cpp/app_templates/cppsdlhello/acinclude.m4 @@ -89,7 +89,6 @@ int main (int argc, char *argv[]) */ { FILE *fp = fopen("conf.sdlmmtest", "a"); if ( fp ) fclose(fp); } - /* HP/UX 9 (%@#!) writes to sscanf strings */ tmp_version = my_strdup("$min_sdlmm_version"); if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { printf("%s, bad version string\n", "$min_sdlmm_version"); diff --git a/languages/cpp/debugger/stty.cpp b/languages/cpp/debugger/stty.cpp index 2e39ce5f..e806b31b 100644 --- a/languages/cpp/debugger/stty.cpp +++ b/languages/cpp/debugger/stty.cpp @@ -49,11 +49,6 @@ #include #include -#if defined (_HPUX_SOURCE) -#define _TERMIOS_INCLUDED -#include -#endif - #include #include #include diff --git a/languages/ruby/debugger/stty.cpp b/languages/ruby/debugger/stty.cpp index 2e52096d..f2650666 100644 --- a/languages/ruby/debugger/stty.cpp +++ b/languages/ruby/debugger/stty.cpp @@ -48,11 +48,6 @@ #include #include -#if defined (_HPUX_SOURCE) -#define _TERMIOS_INCLUDED -#include -#endif - #include #include #include diff --git a/lib/antlr/README b/lib/antlr/README index 1f6d902d..2fbb1645 100644 --- a/lib/antlr/README +++ b/lib/antlr/README @@ -36,7 +36,6 @@ egcs-1.1.2 Solaris 2.6,7 2.7.1a2 egcs-1.1.2 Linux 2.2, Solaris 2.6 2.7.1a2 gcc-2.95.2 Linux 2.2, Solaris 2.6,7 2.7.1a2 gcc-2.96 (20000527) Solaris 2.6 2.7.1a2 -aCC A.01.21 HP-UX 10.20 2.7.0 no! Visual C++ 6.0 PC 2.7.1a2 (warnings) Intel C++ 4.0 NT 4.0 2.7.0 Borland 5.0 NT 4.0 2.7.0 diff --git a/lib/antlr/antlr/CharScanner.h b/lib/antlr/antlr/CharScanner.h index 4a0816a8..eacb2ec1 100644 --- a/lib/antlr/antlr/CharScanner.h +++ b/lib/antlr/antlr/CharScanner.h @@ -435,7 +435,7 @@ public: /// Override this method to get more specific case handling virtual int toLower(int c) const { - // test on EOF_CHAR for buggy (?) STLPort tolower (or HPUX tolower?) + // test on EOF_CHAR for buggy STLPort tolower // also VC++ 6.0 does this. (see fix 422 (is reverted by this fix) // this one is more structural. Maybe make this configurable. return (c == EOF_CHAR ? EOF_CHAR : tolower(c)); diff --git a/parts/appwizard/common/gnome/macros/gnome-fileutils.m4 b/parts/appwizard/common/gnome/macros/gnome-fileutils.m4 index 86eaca65..03025f2e 100644 --- a/parts/appwizard/common/gnome/macros/gnome-fileutils.m4 +++ b/parts/appwizard/common/gnome/macros/gnome-fileutils.m4 @@ -74,7 +74,7 @@ if test $ac_cv_func_getmntent = yes; then # Determine whether it's the one-argument variant or the two-argument one. if test -z "$list_mounted_fs"; then -# 4.3BSD, SunOS, HP-UX, Dynix, Irix +# 4.3BSD, SunOS, Dynix, Irix AC_MSG_CHECKING([for one-argument getmntent function]) AC_CACHE_VAL(fu_cv_sys_mounted_getmntent1, [test $ac_cv_header_mntent_h = yes \ diff --git a/parts/appwizard/common/gnome/macros/gnome-print-check.m4 b/parts/appwizard/common/gnome/macros/gnome-print-check.m4 index 7d98281d..eb89ff56 100644 --- a/parts/appwizard/common/gnome/macros/gnome-print-check.m4 +++ b/parts/appwizard/common/gnome/macros/gnome-print-check.m4 @@ -87,7 +87,6 @@ int main () system ("touch conf.gnome_printtest"); - /* HP/UX 9 (%@#!) writes to sscanf strings */ tmp_version = my_strdup("$min_gnome_print_version"); if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { printf("%s, bad version string\n", "$min_gnome_print_version"); diff --git a/parts/appwizard/common/incadmin/config.guess b/parts/appwizard/common/incadmin/config.guess index 201d615b..9680eded 100755 --- a/parts/appwizard/common/incadmin/config.guess +++ b/parts/appwizard/common/incadmin/config.guess @@ -510,92 +510,6 @@ EOF hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) echo m68k-hp-bsd4.4 exit ;; - 9000/[34678]??:HP-UX:*:*) - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` - case "${UNAME_MACHINE}" in - 9000/31? ) HP_ARCH=m68000 ;; - 9000/[34]?? ) HP_ARCH=m68k ;; - 9000/[678][0-9][0-9]) - if [ -x /usr/bin/getconf ]; then - sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` - sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` - case "${sc_cpu_version}" in - 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 - 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 - 532) # CPU_PA_RISC2_0 - case "${sc_kernel_bits}" in - 32) HP_ARCH="hppa2.0n" ;; - 64) HP_ARCH="hppa2.0w" ;; - '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 - esac ;; - esac - fi - if [ "${HP_ARCH}" = "" ]; then - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - - #define _HPUX_SOURCE - #include - #include - - int main () - { - #if defined(_SC_KERNEL_BITS) - long bits = sysconf(_SC_KERNEL_BITS); - #endif - long cpu = sysconf (_SC_CPU_VERSION); - - switch (cpu) - { - case CPU_PA_RISC1_0: puts ("hppa1.0"); break; - case CPU_PA_RISC1_1: puts ("hppa1.1"); break; - case CPU_PA_RISC2_0: - #if defined(_SC_KERNEL_BITS) - switch (bits) - { - case 64: puts ("hppa2.0w"); break; - case 32: puts ("hppa2.0n"); break; - default: puts ("hppa2.0"); break; - } break; - #else /* !defined(_SC_KERNEL_BITS) */ - puts ("hppa2.0"); break; - #endif - default: puts ("hppa1.0"); break; - } - exit (0); - } -EOF - (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` - test -z "$HP_ARCH" && HP_ARCH=hppa - fi ;; - esac - if [ ${HP_ARCH} = "hppa2.0w" ] - then - eval $set_cc_for_build - - # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating - # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler - # generating 64-bit code. GNU and HP use different nomenclature: - # - # $ CC_FOR_BUILD=cc ./config.guess - # => hppa2.0w-hp-hpux11.23 - # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess - # => hppa64-hp-hpux11.23 - - if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | - grep -q __LP64__ - then - HP_ARCH="hppa2.0w" - else - HP_ARCH="hppa64" - fi - fi - echo ${HP_ARCH}-hp-hpux${HPUX_REV} - exit ;; - ia64:HP-UX:*:*) - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` - echo ia64-hp-hpux${HPUX_REV} - exit ;; 3050*:HI-UX:*:*) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c @@ -1254,7 +1168,7 @@ main () printf ("arm-acorn-riscix\n"); exit (0); #endif -#if defined (hp300) && !defined (hpux) +#if defined (hp300) printf ("m68k-hp-bsd\n"); exit (0); #endif diff --git a/parts/appwizard/common/incadmin/config.sub b/parts/appwizard/common/incadmin/config.sub index a44fd184..16fa14ea 100755 --- a/parts/appwizard/common/incadmin/config.sub +++ b/parts/appwizard/common/incadmin/config.sub @@ -650,10 +650,6 @@ case $basic_machine in basic_machine=m68k-hp os=-bsd ;; - hp300hpux) - basic_machine=m68k-hp - os=-hpux - ;; hp3k9[0-9][0-9] | hp9[0-9][0-9]) basic_machine=hppa1.0-hp ;; @@ -1303,7 +1299,7 @@ case $os in # -sysv* is not here because it comes later, after sysvr4. -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ - | -hpux* | -unos* | -luna* | -auroraux* | -solaris* \ + | -unos* | -luna* | -auroraux* | -solaris* \ | -sym* | -kopensolaris* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ | -aos* | -aros* \ @@ -1558,9 +1554,6 @@ case $basic_machine in *-oki) os=-proelf ;; - *-hp) - os=-hpux - ;; *-hitachi) os=-hiux ;; @@ -1654,9 +1647,6 @@ case $basic_machine in -beos*) vendor=be ;; - -hpux*) - vendor=hp - ;; -mpeix*) vendor=hp ;; diff --git a/parts/appwizard/common/incadmin/depcomp b/parts/appwizard/common/incadmin/depcomp index 9db17ebc..6155285c 100755 --- a/parts/appwizard/common/incadmin/depcomp +++ b/parts/appwizard/common/incadmin/depcomp @@ -104,7 +104,7 @@ gcc) ## Some versions of gcc put a space before the `:'. On the theory ## that the space means something, we add a space to the output as ## well. -## Some versions of the HPUX 10.20 sed can't process this invocation +## Some old versions of sed can't process this invocation ## correctly. Breaking it into two sed invocations is a workaround. sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" @@ -263,7 +263,7 @@ dashmstdout) cat < "$tmpdepfile" > "$depfile" tr ' ' ' ' < "$tmpdepfile" | \ -## Some versions of the HPUX 10.20 sed can't process this invocation +## Some old versions of sed can't process this invocation ## correctly. Breaking it into two sed invocations is a workaround. sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" @@ -307,7 +307,7 @@ makedepend) cat < "$tmpdepfile" > "$depfile" tail +3 "$tmpdepfile" | tr ' ' ' ' | \ -## Some versions of the HPUX 10.20 sed can't process this invocation +## Some old versions of sed can't process this invocation ## correctly. Breaking it into two sed invocations is a workaround. sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" "$tmpdepfile".bak diff --git a/parts/appwizard/common/incadmin/ltmain.sh b/parts/appwizard/common/incadmin/ltmain.sh index 7de1caf8..fb4e75a4 100644 --- a/parts/appwizard/common/incadmin/ltmain.sh +++ b/parts/appwizard/common/incadmin/ltmain.sh @@ -2481,8 +2481,6 @@ static const void *lt_preloaded_setup() { # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1. *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;; - *-*-hpux*) - pic_flag_for_symtable=" $pic_flag" ;; *) if test "X$my_pic_p" != Xno; then pic_flag_for_symtable=" $pic_flag" @@ -2729,10 +2727,6 @@ else fi DUALCASE=1; export DUALCASE # for MKS sh -# The HP-UX ksh and POSIX shell print the target directory to stdout -# if CDPATH is set. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH - relink_command=\"$relink_command\" # This environment variable determines our operation mode. -- cgit v1.2.3