From 3b5a21a60a7d721f873acb6f1bb10f40b5a7a290 Mon Sep 17 00:00:00 2001 From: hyung-hwan Date: Sun, 26 Oct 2025 23:18:23 +0900 Subject: [PATCH] adding go wrapper --- Makefile.am | 43 + Makefile.in | 156 +- ac/ar-lib | 23 +- ac/compile | 35 +- ac/config.guess | 191 +- ac/config.sub | 2 +- ac/depcomp | 8 +- ac/install-sh | 6 +- ac/ltmain.sh | 747 +++-- ac/missing | 8 +- ac/tap-driver.sh | 114 +- ac/test-driver | 8 +- aclocal.m4 | 74 +- bin/Makefile.in | 5 +- configure | 6520 ++++++++++++++++--------------------------- configure.ac | 12 + go.mod | 3 + hawk-inst.go | 68 + hawk.go | 327 +++ lib/Makefile.in | 5 +- lib/err.c | 26 +- lib/hawk-cfg.h.in | 390 ++- lib/hawk.h | 16 + m4/libtool.m4 | 466 ++-- m4/ltoptions.m4 | 106 +- m4/ltsugar.m4 | 2 +- m4/ltversion.m4 | 12 +- m4/lt~obsolete.m4 | 2 +- mod/Makefile.in | 5 +- pkgs/hawk.spec.in | 4 + samples/Makefile.in | 5 +- t/Makefile.in | 7 +- t/h-003.hawk | 11 +- tools/Makefile.in | 5 +- 34 files changed, 4103 insertions(+), 5309 deletions(-) mode change 100644 => 100755 ac/ltmain.sh create mode 100644 go.mod create mode 100644 hawk-inst.go create mode 100644 hawk.go diff --git a/Makefile.am b/Makefile.am index 60baf144..86400341 100644 --- a/Makefile.am +++ b/Makefile.am @@ -16,6 +16,49 @@ DIST_SUBDIRS = $(SUBDIRS) distclean-local: @rm -rf $(top_srcdir)/autom4te.cache +clean-local: + rm -rf $(builddir)/go.mod $(builddir)/go.sum + go clean -C $(srcdir) -x -modfile $(abs_builddir)/go.mod -cache + +###################################################################### +if ENABLE_HAWKGO +bin_PROGRAMS = hawkgo +hawkgo_SOURCES = \ + hawk.go \ + hawk-inst.go \ + go.mod +hawkgo_DEPENDENCIES = hawkgo.bin + +## let the linker to move hawkgo.bin to the actual target +hawkgo_LINK = cp -pf hawkgo.bin hawkgo$(EXEEXT) || echo "FAILED TO LINK" + +if ENABLE_STATIC +CGO_CFLAGS_EXTRA="-static" +CGO_LDFLAGS_EXTRA="-static" +else +CGO_CFLAGS_EXTRA="" +CGO_LDFLAGS_EXTRA="" +endif + +hawkgo.bin: lib/libhawk.la $(hawkgo_OBJECTS) + cp -pf $(srcdir)/go.mod $(builddir)/go.mod >/dev/null 2>&1 || true + chmod u+w $(builddir)/go.mod ## with `make distcheck`, the echo's redirection to the file fails without this permission change + [ -f $(srcdir)/go.sum ] && cp -pf $(srcdir)/go.sum $(builddir)/go.sum >/dev/null 2>&1 || true + ## --------------------------------------------------------------- + CC=$(CC) \ + CGO_CFLAGS="-I$(abs_srcdir)/lib -I$(abs_builddir)/lib $(CFLAGS) $(CGO_CFLAGS_EXTRA)" \ + CGO_LDFLAGS="-L$(abs_builddir)/lib -L$(abs_builddir)/lib/.libs -lhawk -ldl $(LIBM) $(CGO_LDFLAGS_EXTRA)" \ + go build -C $(srcdir) -ldflags "-X 'main.BINDIR=$(bindir)' -X 'main.SBINDIR=$(sbindir)' -X 'main.LIBDIR=$(libdir)' -X 'main.SYSCONFDIR=$(sysconfdir)'" -x -o $(abs_builddir)/hawkgo.bin -modfile $(abs_builddir)/go.mod + ## --------------------------------------------------------------- + go clean -C $(srcdir) -x -modfile $(abs_builddir)/go.mod +# fake recipes to deceive make +.go.o: + echo $< > $@ + +.mod.o: + echo $< > $@ + +endif ###################################################################### rpm: dist-gzip diff --git a/Makefile.in b/Makefile.in index 58c6b445..5a0f69c5 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.17 from Makefile.am. +# Makefile.in generated by automake 1.18.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2024 Free Software Foundation, Inc. +# Copyright (C) 1994-2025 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -13,6 +13,7 @@ # PARTICULAR PURPOSE. @SET_MAKE@ + VPATH = @srcdir@ am__is_gnu_make = { \ if test -z '$(MAKELEVEL)'; then \ @@ -89,6 +90,7 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ +@ENABLE_HAWKGO_TRUE@bin_PROGRAMS = hawkgo$(EXEEXT) subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_sign.m4 \ @@ -110,6 +112,13 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/lib/hawk-cfg.h CONFIG_CLEAN_FILES = pkgs/hawk.spec CONFIG_CLEAN_VPATH_FILES = +am__installdirs = "$(DESTDIR)$(bindir)" +PROGRAMS = $(bin_PROGRAMS) +am__hawkgo_SOURCES_DIST = hawk.go hawk-inst.go go.mod +@ENABLE_HAWKGO_TRUE@am_hawkgo_OBJECTS = hawk.$(OBJEXT) \ +@ENABLE_HAWKGO_TRUE@ hawk-inst.$(OBJEXT) go.$(OBJEXT) +hawkgo_OBJECTS = $(am_hawkgo_OBJECTS) +hawkgo_LDADD = $(LDADD) AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) am__v_P_0 = false @@ -122,8 +131,9 @@ AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ am__v_at_1 = -SOURCES = -DIST_SOURCES = +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/lib +SOURCES = $(hawkgo_SOURCES) +DIST_SOURCES = $(am__hawkgo_SOURCES_DIST) RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ ctags-recursive dvi-recursive html-recursive info-recursive \ install-data-recursive install-dvi-recursive \ @@ -382,9 +392,21 @@ SUBDIRS = tools lib mod bin samples t #SUBDIRS += tools lib mod bin samples t #endif DIST_SUBDIRS = $(SUBDIRS) +@ENABLE_HAWKGO_TRUE@hawkgo_SOURCES = \ +@ENABLE_HAWKGO_TRUE@ hawk.go \ +@ENABLE_HAWKGO_TRUE@ hawk-inst.go \ +@ENABLE_HAWKGO_TRUE@ go.mod + +@ENABLE_HAWKGO_TRUE@hawkgo_DEPENDENCIES = hawkgo.bin +@ENABLE_HAWKGO_TRUE@hawkgo_LINK = cp -pf hawkgo.bin hawkgo$(EXEEXT) || echo "FAILED TO LINK" +@ENABLE_HAWKGO_TRUE@@ENABLE_STATIC_FALSE@CGO_CFLAGS_EXTRA = "" +@ENABLE_HAWKGO_TRUE@@ENABLE_STATIC_TRUE@CGO_CFLAGS_EXTRA = "-static" +@ENABLE_HAWKGO_TRUE@@ENABLE_STATIC_FALSE@CGO_LDFLAGS_EXTRA = "" +@ENABLE_HAWKGO_TRUE@@ENABLE_STATIC_TRUE@CGO_LDFLAGS_EXTRA = "-static" all: all-recursive .SUFFIXES: +.SUFFIXES: .go .mod .o am--refresh: Makefile @: $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @@ -420,6 +442,60 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) $(am__aclocal_m4_deps): pkgs/hawk.spec: $(top_builddir)/config.status $(top_srcdir)/pkgs/hawk.spec.in cd $(top_builddir) && $(SHELL) ./config.status $@ +install-binPROGRAMS: $(bin_PROGRAMS) + @$(NORMAL_INSTALL) + @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ + fi; \ + for p in $$list; do echo "$$p $$p"; done | \ + sed 's/$(EXEEXT)$$//' | \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ + done | \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ + -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ + sed 'N;N;N;s,\n, ,g' | \ + $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ + { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ + if ($$2 == $$4) files[d] = files[d] " " $$1; \ + else { print "f", $$3 "/" $$4, $$1; } } \ + END { for (d in files) print "f", d, files[d] }' | \ + while read type dir files; do \ + if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ + test -z "$$files" || { \ + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \ + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \ + } \ + ; done + +uninstall-binPROGRAMS: + @$(NORMAL_UNINSTALL) + @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ + files=`for p in $$list; do echo "$$p"; done | \ + sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ + -e 's/$$/$(EXEEXT)/' \ + `; \ + test -n "$$list" || exit 0; \ + echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(bindir)" && $(am__rm_f) $$files + +clean-binPROGRAMS: + $(am__rm_f) $(bin_PROGRAMS) + test -z "$(EXEEXT)" || $(am__rm_f) $(bin_PROGRAMS:$(EXEEXT)=) + +hawkgo$(EXEEXT): $(hawkgo_OBJECTS) $(hawkgo_DEPENDENCIES) $(EXTRA_hawkgo_DEPENDENCIES) + @rm -f hawkgo$(EXEEXT) + $(AM_V_GEN)$(hawkgo_LINK) $(hawkgo_OBJECTS) $(hawkgo_LDADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c mostlyclean-libtool: -rm -f *.lo @@ -535,6 +611,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -rm -f cscope.out cscope.in.out cscope.po.out cscope.files + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am @@ -610,6 +687,10 @@ dist-bzip2: distdir tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 $(am__post_remove_distdir) +dist-bzip3: distdir + tardir=$(distdir) && $(am__tar) | bzip3 -c >$(distdir).tar.bz3 + $(am__post_remove_distdir) + dist-lzip: distdir tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz $(am__post_remove_distdir) @@ -654,6 +735,8 @@ distcheck: dist eval GZIP= gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ + *.tar.bz3*) \ + bzip3 -dc $(distdir).tar.bz3 | $(am__untar) ;;\ *.tar.lz*) \ lzip -dc $(distdir).tar.lz | $(am__untar) ;;\ *.tar.xz*) \ @@ -734,9 +817,12 @@ distcleancheck: distclean exit 1; } >&2 check-am: all-am check: check-recursive -all-am: Makefile +all-am: Makefile $(PROGRAMS) installdirs: installdirs-recursive installdirs-am: + for dir in "$(DESTDIR)$(bindir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done install: install-recursive install-exec: install-exec-recursive install-data: install-data-recursive @@ -769,13 +855,14 @@ maintainer-clean-generic: @echo "it deletes files that may require special tools to rebuild." clean: clean-recursive -clean-am: clean-generic clean-libtool mostlyclean-am +clean-am: clean-binPROGRAMS clean-generic clean-libtool clean-local \ + mostlyclean-am distclean: distclean-recursive -rm -f $(am__CONFIG_DISTCLEAN_FILES) -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-libtool \ - distclean-local distclean-tags +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-libtool distclean-local distclean-tags dvi: dvi-recursive @@ -795,7 +882,7 @@ install-dvi: install-dvi-recursive install-dvi-am: -install-exec-am: +install-exec-am: install-binPROGRAMS install-html: install-html-recursive @@ -825,7 +912,8 @@ maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-recursive -mostlyclean-am: mostlyclean-generic mostlyclean-libtool +mostlyclean-am: mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool pdf: pdf-recursive @@ -835,26 +923,28 @@ ps: ps-recursive ps-am: -uninstall-am: +uninstall-am: uninstall-binPROGRAMS .MAKE: $(am__recursive_targets) install-am install-strip .PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \ - am--refresh check check-am clean clean-cscope clean-generic \ - clean-libtool cscope cscopelist-am ctags ctags-am dist \ - dist-all dist-bzip2 dist-gzip dist-lzip dist-shar dist-tarZ \ - dist-xz dist-zip dist-zstd distcheck distclean \ + am--refresh check check-am clean clean-binPROGRAMS \ + clean-cscope clean-generic clean-libtool clean-local cscope \ + cscopelist-am ctags ctags-am dist dist-all dist-bzip2 \ + dist-bzip3 dist-gzip dist-lzip dist-shar dist-tarZ dist-xz \ + dist-zip dist-zstd distcheck distclean distclean-compile \ distclean-generic distclean-libtool distclean-local \ distclean-tags distcleancheck distdir distuninstallcheck dvi \ dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs installdirs-am \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags tags-am uninstall uninstall-am + install-binPROGRAMS install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ + uninstall-am uninstall-binPROGRAMS .PRECIOUS: Makefile @@ -862,6 +952,26 @@ uninstall-am: distclean-local: @rm -rf $(top_srcdir)/autom4te.cache +clean-local: + rm -rf $(builddir)/go.mod $(builddir)/go.sum + go clean -C $(srcdir) -x -modfile $(abs_builddir)/go.mod -cache + +@ENABLE_HAWKGO_TRUE@hawkgo.bin: lib/libhawk.la $(hawkgo_OBJECTS) +@ENABLE_HAWKGO_TRUE@ cp -pf $(srcdir)/go.mod $(builddir)/go.mod >/dev/null 2>&1 || true +@ENABLE_HAWKGO_TRUE@ chmod u+w $(builddir)/go.mod ## with `make distcheck`, the echo's redirection to the file fails without this permission change +@ENABLE_HAWKGO_TRUE@ [ -f $(srcdir)/go.sum ] && cp -pf $(srcdir)/go.sum $(builddir)/go.sum >/dev/null 2>&1 || true +@ENABLE_HAWKGO_TRUE@ CC=$(CC) \ +@ENABLE_HAWKGO_TRUE@ CGO_CFLAGS="-I$(abs_srcdir)/lib -I$(abs_builddir)/lib $(CFLAGS) $(CGO_CFLAGS_EXTRA)" \ +@ENABLE_HAWKGO_TRUE@ CGO_LDFLAGS="-L$(abs_builddir)/lib -L$(abs_builddir)/lib/.libs -lhawk -ldl $(LIBM) $(CGO_LDFLAGS_EXTRA)" \ +@ENABLE_HAWKGO_TRUE@ go build -C $(srcdir) -ldflags "-X 'main.BINDIR=$(bindir)' -X 'main.SBINDIR=$(sbindir)' -X 'main.LIBDIR=$(libdir)' -X 'main.SYSCONFDIR=$(sysconfdir)'" -x -o $(abs_builddir)/hawkgo.bin -modfile $(abs_builddir)/go.mod +@ENABLE_HAWKGO_TRUE@ go clean -C $(srcdir) -x -modfile $(abs_builddir)/go.mod +# fake recipes to deceive make +@ENABLE_HAWKGO_TRUE@.go.o: +@ENABLE_HAWKGO_TRUE@ echo $< > $@ + +@ENABLE_HAWKGO_TRUE@.mod.o: +@ENABLE_HAWKGO_TRUE@ echo $< > $@ + ###################################################################### rpm: dist-gzip diff --git a/ac/ar-lib b/ac/ar-lib index 15219874..d0a7b5c8 100755 --- a/ac/ar-lib +++ b/ac/ar-lib @@ -2,9 +2,9 @@ # Wrapper for Microsoft lib.exe me=ar-lib -scriptversion=2024-06-19.01; # UTC +scriptversion=2025-02-03.05; # UTC -# Copyright (C) 2010-2024 Free Software Foundation, Inc. +# Copyright (C) 2010-2025 Free Software Foundation, Inc. # Written by Peter Rosin . # # This program is free software; you can redistribute it and/or modify @@ -51,9 +51,20 @@ func_file_conv () # lazily determine how to convert abs files case `uname -s` in MINGW*) - file_conv=mingw + if test -n "$MSYSTEM" && (cygpath --version) >/dev/null 2>&1; then + # MSYS2 environment. + file_conv=cygwin + else + # Original MinGW environment. + file_conv=mingw + fi ;; - CYGWIN* | MSYS*) + MSYS*) + # Old MSYS environment, or MSYS2 with 32-bit MSYS2 shell. + file_conv=cygwin + ;; + CYGWIN*) + # Cygwin environment. file_conv=cygwin ;; *) @@ -65,8 +76,8 @@ func_file_conv () mingw) file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` ;; - cygwin | msys) - file=`cygpath -m "$file" || echo "$file"` + cygwin) + file=`cygpath -w "$file" || echo "$file"` ;; wine) file=`winepath -w "$file" || echo "$file"` diff --git a/ac/compile b/ac/compile index 49b3d05f..02ff093c 100755 --- a/ac/compile +++ b/ac/compile @@ -1,9 +1,9 @@ #! /bin/sh # Wrapper for compilers which do not understand '-c -o'. -scriptversion=2024-06-19.01; # UTC +scriptversion=2025-06-18.21; # UTC -# Copyright (C) 1999-2024 Free Software Foundation, Inc. +# Copyright (C) 1999-2025 Free Software Foundation, Inc. # Written by Tom Tromey . # # This program is free software; you can redistribute it and/or modify @@ -37,11 +37,11 @@ IFS=" "" $nl" file_conv= -# func_file_conv build_file lazy +# func_file_conv build_file unneeded_conversions # Convert a $build file to $host form and store it in $file # Currently only supports Windows hosts. If the determined conversion -# type is listed in (the comma separated) LAZY, no conversion will -# take place. +# type is listed in (the comma separated) UNNEEDED_CONVERSIONS, no +# conversion will take place. func_file_conv () { file=$1 @@ -51,9 +51,20 @@ func_file_conv () # lazily determine how to convert abs files case `uname -s` in MINGW*) - file_conv=mingw + if test -n "$MSYSTEM" && (cygpath --version) >/dev/null 2>&1; then + # MSYS2 environment. + file_conv=cygwin + else + # Original MinGW environment. + file_conv=mingw + fi ;; - CYGWIN* | MSYS*) + MSYS*) + # Old MSYS environment, or MSYS2 with 32-bit MSYS2 shell. + file_conv=cygwin + ;; + CYGWIN*) + # Cygwin environment. file_conv=cygwin ;; *) @@ -63,12 +74,14 @@ func_file_conv () fi case $file_conv/,$2, in *,$file_conv,*) + # This is the optimization mentioned above: + # If UNNEEDED_CONVERSIONS contains $file_conv, don't convert. ;; mingw/*) file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` ;; - cygwin/* | msys/*) - file=`cygpath -m "$file" || echo "$file"` + cygwin/*) + file=`cygpath -w "$file" || echo "$file"` ;; wine/*) file=`winepath -w "$file" || echo "$file"` @@ -343,9 +356,9 @@ exit $ret # Local Variables: # mode: shell-script # sh-indentation: 2 -# eval: (add-hook 'before-save-hook 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp nil t) # time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-format: "%Y-%02m-%02d.%02H" # time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: diff --git a/ac/config.guess b/ac/config.guess index b790fcbe..6116f187 100755 --- a/ac/config.guess +++ b/ac/config.guess @@ -1,4 +1,4 @@ -#!/usr/bin/sh +#! /bin/sh # Attempt to guess a canonical system name. # Copyright 1992-2024 Free Software Foundation, Inc. @@ -194,6 +194,17 @@ Linux|GNU|GNU/*) ;; esac +case "${UNAME_MACHINE}" in + i?86) + test -z "$VENDOR" && VENDOR=pc + ;; + *) + test -z "$VENDOR" && VENDOR=unknown + ;; +esac +test -f /etc/SuSE-release -o -f /.buildenv && VENDOR=suse +test -f /etc/os-release && grep -q suse /etc/os-release && VENDOR=suse + # Note: order is significant - the case branches are not exclusive. case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION in @@ -275,46 +286,46 @@ case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION in ;; *:Bitrig:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` - GUESS=$UNAME_MACHINE_ARCH-unknown-bitrig$UNAME_RELEASE + GUESS=$UNAME_MACHINE_ARCH-${VENDOR}-bitrig$UNAME_RELEASE ;; *:OpenBSD:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` - GUESS=$UNAME_MACHINE_ARCH-unknown-openbsd$UNAME_RELEASE + GUESS=$UNAME_MACHINE_ARCH-${VENDOR}-openbsd$UNAME_RELEASE ;; *:SecBSD:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/SecBSD.//'` - GUESS=$UNAME_MACHINE_ARCH-unknown-secbsd$UNAME_RELEASE + GUESS=$UNAME_MACHINE_ARCH-${VENDOR}-secbsd$UNAME_RELEASE ;; *:LibertyBSD:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'` - GUESS=$UNAME_MACHINE_ARCH-unknown-libertybsd$UNAME_RELEASE + GUESS=$UNAME_MACHINE_ARCH-${VENDOR}-libertybsd$UNAME_RELEASE ;; *:MidnightBSD:*:*) - GUESS=$UNAME_MACHINE-unknown-midnightbsd$UNAME_RELEASE + GUESS=$UNAME_MACHINE-${VENDOR}-midnightbsd$UNAME_RELEASE ;; *:ekkoBSD:*:*) - GUESS=$UNAME_MACHINE-unknown-ekkobsd$UNAME_RELEASE + GUESS=$UNAME_MACHINE-${VENDOR}-ekkobsd$UNAME_RELEASE ;; *:SolidBSD:*:*) - GUESS=$UNAME_MACHINE-unknown-solidbsd$UNAME_RELEASE + GUESS=$UNAME_MACHINE-${VENDOR}-solidbsd$UNAME_RELEASE ;; *:OS108:*:*) - GUESS=$UNAME_MACHINE-unknown-os108_$UNAME_RELEASE + GUESS=$UNAME_MACHINE-${VENDOR}-os108_$UNAME_RELEASE ;; macppc:MirBSD:*:*) - GUESS=powerpc-unknown-mirbsd$UNAME_RELEASE + GUESS=powerpc-${VENDOR}-mirbsd$UNAME_RELEASE ;; *:MirBSD:*:*) - GUESS=$UNAME_MACHINE-unknown-mirbsd$UNAME_RELEASE + GUESS=$UNAME_MACHINE-${VENDOR}-mirbsd$UNAME_RELEASE ;; *:Sortix:*:*) - GUESS=$UNAME_MACHINE-unknown-sortix + GUESS=$UNAME_MACHINE-${VENDOR}-sortix ;; *:Twizzler:*:*) - GUESS=$UNAME_MACHINE-unknown-twizzler + GUESS=$UNAME_MACHINE-${VENDOR}-twizzler ;; *:Redox:*:*) - GUESS=$UNAME_MACHINE-unknown-redox + GUESS=$UNAME_MACHINE-${VENDOR}-redox ;; mips:OSF1:*.*) GUESS=mips-dec-osf1 @@ -376,13 +387,13 @@ case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION in GUESS=$UNAME_MACHINE-dec-osf$OSF_REL ;; Amiga*:UNIX_System_V:4.0:*) - GUESS=m68k-unknown-sysv4 + GUESS=m68k-${VENDOR}-sysv4 ;; *:[Aa]miga[Oo][Ss]:*:*) - GUESS=$UNAME_MACHINE-unknown-amigaos + GUESS=$UNAME_MACHINE-${VENDOR}-amigaos ;; *:[Mm]orph[Oo][Ss]:*:*) - GUESS=$UNAME_MACHINE-unknown-morphos + GUESS=$UNAME_MACHINE-${VENDOR}-morphos ;; *:OS/390:*:*) GUESS=i370-ibm-openedition @@ -397,7 +408,7 @@ case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION in GUESS=arm-acorn-riscix$UNAME_RELEASE ;; arm*:riscos:*:*|arm*:RISCOS:*:*) - GUESS=arm-unknown-riscos + GUESS=arm-${VENDOR}-riscos ;; SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) GUESS=hppa1.1-hitachi-hiuxmpp @@ -511,7 +522,7 @@ case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION in GUESS=m68k-hades-mint$UNAME_RELEASE ;; *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) - GUESS=m68k-unknown-mint$UNAME_RELEASE + GUESS=m68k-${VENDOR}-mint$UNAME_RELEASE ;; m68k:machten:*:*) GUESS=m68k-apple-machten$UNAME_RELEASE @@ -826,9 +837,9 @@ EOF ;; i*86:OSF1:*:*) if test -x /usr/sbin/sysversion ; then - GUESS=$UNAME_MACHINE-unknown-osf1mk + GUESS=$UNAME_MACHINE-${VENDOR}-osf1mk else - GUESS=$UNAME_MACHINE-unknown-osf1 + GUESS=$UNAME_MACHINE-${VENDOR}-osf1 fi ;; parisc*:Lites*:*:*) @@ -893,10 +904,10 @@ EOF GUESS=$UNAME_MACHINE-pc-bsdi$UNAME_RELEASE ;; sparc*:BSD/OS:*:*) - GUESS=sparc-unknown-bsdi$UNAME_RELEASE + GUESS=sparc-${VENDOR}-bsdi$UNAME_RELEASE ;; *:BSD/OS:*:*) - GUESS=$UNAME_MACHINE-unknown-bsdi$UNAME_RELEASE + GUESS=$UNAME_MACHINE-${VENDOR}-bsdi$UNAME_RELEASE ;; arm:FreeBSD:*:*) UNAME_PROCESSOR=`uname -p` @@ -905,10 +916,10 @@ EOF | grep -q __ARM_PCS_VFP then FREEBSD_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'` - GUESS=$UNAME_PROCESSOR-unknown-freebsd$FREEBSD_REL-gnueabi + GUESS=$UNAME_PROCESSOR-${VENDOR}-freebsd$FREEBSD_REL-gnueabi else FREEBSD_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'` - GUESS=$UNAME_PROCESSOR-unknown-freebsd$FREEBSD_REL-gnueabihf + GUESS=$UNAME_PROCESSOR-${VENDOR}-freebsd$FREEBSD_REL-gnueabihf fi ;; *:FreeBSD:*:*) @@ -920,7 +931,7 @@ EOF UNAME_PROCESSOR=i586 ;; esac FREEBSD_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'` - GUESS=$UNAME_PROCESSOR-unknown-freebsd$FREEBSD_REL + GUESS=$UNAME_PROCESSOR-${VENDOR}-freebsd$FREEBSD_REL ;; i*:CYGWIN*:*) GUESS=$UNAME_MACHINE-pc-cygwin @@ -946,10 +957,10 @@ EOF GUESS=i586-pc-interix$UNAME_RELEASE ;; authenticamd | genuineintel | EM64T) - GUESS=x86_64-unknown-interix$UNAME_RELEASE + GUESS=x86_64-${VENDOR}-interix$UNAME_RELEASE ;; IA64) - GUESS=ia64-unknown-interix$UNAME_RELEASE + GUESS=ia64-${VENDOR}-interix$UNAME_RELEASE ;; esac ;; i*:UWIN*:*) @@ -960,7 +971,7 @@ EOF ;; prep*:SunOS:5.*:*) SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'` - GUESS=powerpcle-unknown-solaris2$SUN_REL + GUESS=powerpcle-${VENDOR}-solaris2$SUN_REL ;; *:GNU:*:*) # the GNU system @@ -978,10 +989,10 @@ EOF GUESS="$UNAME_MACHINE-pc-managarm-mlibc" ;; *:[Mm]anagarm:*:*) - GUESS="$UNAME_MACHINE-unknown-managarm-mlibc" + GUESS="$UNAME_MACHINE-${VENDOR}-managarm-mlibc" ;; *:Minix:*:*) - GUESS=$UNAME_MACHINE-unknown-minix + GUESS=$UNAME_MACHINE-${VENDOR}-minix ;; aarch64:Linux:*:*) set_cc_for_build @@ -1004,11 +1015,11 @@ EOF eabi | eabihf) CPU=armv8l; LIBCABI=$LIBC$ABI ;; esac fi - GUESS=$CPU-unknown-linux-$LIBCABI + GUESS=$CPU-${VENDOR}-linux-$LIBCABI ;; aarch64_be:Linux:*:*) UNAME_MACHINE=aarch64_be - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + GUESS=$UNAME_MACHINE-${VENDOR}-linux-$LIBC ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' /proc/cpuinfo 2>/dev/null` in @@ -1022,29 +1033,29 @@ EOF esac objdump --private-headers /bin/sh | grep -q ld.so.1 if test "$?" = 0 ; then LIBC=gnulibc1 ; fi - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + GUESS=$UNAME_MACHINE-${VENDOR}-linux-$LIBC ;; arc:Linux:*:* | arceb:Linux:*:* | arc32:Linux:*:* | arc64:Linux:*:*) - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + GUESS=$UNAME_MACHINE-${VENDOR}-linux-$LIBC ;; arm*:Linux:*:*) set_cc_for_build if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_EABI__ then - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + GUESS=$UNAME_MACHINE-${VENDOR}-linux-$LIBC else if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_PCS_VFP then - GUESS=$UNAME_MACHINE-unknown-linux-${LIBC}eabi + GUESS=$UNAME_MACHINE-${VENDOR}-linux-${LIBC}eabi else - GUESS=$UNAME_MACHINE-unknown-linux-${LIBC}eabihf + GUESS=$UNAME_MACHINE-${VENDOR}-linux-${LIBC}eabihf fi fi ;; avr32*:Linux:*:*) - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + GUESS=$UNAME_MACHINE-${VENDOR}-linux-$LIBC ;; cris:Linux:*:*) GUESS=$UNAME_MACHINE-axis-linux-$LIBC @@ -1053,40 +1064,40 @@ EOF GUESS=$UNAME_MACHINE-axis-linux-$LIBC ;; e2k:Linux:*:*) - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + GUESS=$UNAME_MACHINE-${VENDOR}-linux-$LIBC ;; frv:Linux:*:*) - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + GUESS=$UNAME_MACHINE-${VENDOR}-linux-$LIBC ;; hexagon:Linux:*:*) - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + GUESS=$UNAME_MACHINE-${VENDOR}-linux-$LIBC ;; i*86:Linux:*:*) GUESS=$UNAME_MACHINE-pc-linux-$LIBC ;; ia64:Linux:*:*) - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + GUESS=$UNAME_MACHINE-${VENDOR}-linux-$LIBC ;; k1om:Linux:*:*) - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + GUESS=$UNAME_MACHINE-${VENDOR}-linux-$LIBC ;; kvx:Linux:*:*) - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + GUESS=$UNAME_MACHINE-${VENDOR}-linux-$LIBC ;; kvx:cos:*:*) - GUESS=$UNAME_MACHINE-unknown-cos + GUESS=$UNAME_MACHINE-${VENDOR}-cos ;; kvx:mbr:*:*) - GUESS=$UNAME_MACHINE-unknown-mbr + GUESS=$UNAME_MACHINE-${VENDOR}-mbr ;; loongarch32:Linux:*:* | loongarch64:Linux:*:*) - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + GUESS=$UNAME_MACHINE-${VENDOR}-linux-$LIBC ;; m32r*:Linux:*:*) - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + GUESS=$UNAME_MACHINE-${VENDOR}-linux-$LIBC ;; m68*:Linux:*:*) - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + GUESS=$UNAME_MACHINE-${VENDOR}-linux-$LIBC ;; mips:Linux:*:* | mips64:Linux:*:*) set_cc_for_build @@ -1137,57 +1148,57 @@ EOF test "x$CPU" != x && { echo "$CPU${MIPS_ENDIAN}-unknown-linux-$LIBCABI"; exit; } ;; mips64el:Linux:*:*) - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + GUESS=$UNAME_MACHINE-${VENDOR}-linux-$LIBC ;; openrisc*:Linux:*:*) - GUESS=or1k-unknown-linux-$LIBC + GUESS=or1k-${VENDOR}-linux-$LIBC ;; or32:Linux:*:* | or1k*:Linux:*:*) - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + GUESS=$UNAME_MACHINE-${VENDOR}-linux-$LIBC ;; padre:Linux:*:*) - GUESS=sparc-unknown-linux-$LIBC + GUESS=sparc-${VENDOR}-linux-$LIBC ;; parisc64:Linux:*:* | hppa64:Linux:*:*) - GUESS=hppa64-unknown-linux-$LIBC + GUESS=hppa64-${VENDOR}-linux-$LIBC ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in - PA7*) GUESS=hppa1.1-unknown-linux-$LIBC ;; - PA8*) GUESS=hppa2.0-unknown-linux-$LIBC ;; - *) GUESS=hppa-unknown-linux-$LIBC ;; + PA7*) GUESS=hppa1.1-${VENDOR}-linux-$LIBC ;; + PA8*) GUESS=hppa2.0-${VENDOR}-linux-$LIBC ;; + *) GUESS=hppa-${VENDOR}-linux-$LIBC ;; esac ;; ppc64:Linux:*:*) - GUESS=powerpc64-unknown-linux-$LIBC + GUESS=powerpc64-${VENDOR}-linux-$LIBC ;; ppc:Linux:*:*) - GUESS=powerpc-unknown-linux-$LIBC + GUESS=powerpc-${VENDOR}-linux-$LIBC ;; ppc64le:Linux:*:*) - GUESS=powerpc64le-unknown-linux-$LIBC + GUESS=powerpc64le-${VENDOR}-linux-$LIBC ;; ppcle:Linux:*:*) - GUESS=powerpcle-unknown-linux-$LIBC + GUESS=powerpcle-${VENDOR}-linux-$LIBC ;; riscv32:Linux:*:* | riscv32be:Linux:*:* | riscv64:Linux:*:* | riscv64be:Linux:*:*) - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + GUESS=$UNAME_MACHINE-${VENDOR}-linux-$LIBC ;; s390:Linux:*:* | s390x:Linux:*:*) GUESS=$UNAME_MACHINE-ibm-linux-$LIBC ;; sh64*:Linux:*:*) - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + GUESS=$UNAME_MACHINE-${VENDOR}-linux-$LIBC ;; sh*:Linux:*:*) - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + GUESS=$UNAME_MACHINE-${VENDOR}-linux-$LIBC ;; sparc:Linux:*:* | sparc64:Linux:*:*) - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + GUESS=$UNAME_MACHINE-${VENDOR}-linux-$LIBC ;; tile*:Linux:*:*) - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + GUESS=$UNAME_MACHINE-${VENDOR}-linux-$LIBC ;; vax:Linux:*:*) GUESS=$UNAME_MACHINE-dec-linux-$LIBC @@ -1217,7 +1228,7 @@ EOF GUESS=$CPU-pc-linux-$LIBCABI ;; xtensa*:Linux:*:*) - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + GUESS=$UNAME_MACHINE-${VENDOR}-linux-$LIBC ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. @@ -1239,16 +1250,16 @@ EOF GUESS=$UNAME_MACHINE-pc-os2-emx ;; i*86:XTS-300:*:STOP) - GUESS=$UNAME_MACHINE-unknown-stop + GUESS=$UNAME_MACHINE-${VENDOR}-stop ;; i*86:atheos:*:*) - GUESS=$UNAME_MACHINE-unknown-atheos + GUESS=$UNAME_MACHINE-${VENDOR}-atheos ;; i*86:syllable:*:*) GUESS=$UNAME_MACHINE-pc-syllable ;; i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) - GUESS=i386-unknown-lynxos$UNAME_RELEASE + GUESS=i386-${VENDOR}-lynxos$UNAME_RELEASE ;; i*86:*DOS:*:*) GUESS=$UNAME_MACHINE-pc-msdosdjgpp @@ -1268,7 +1279,7 @@ EOF *Pentium) UNAME_MACHINE=i586 ;; *Pent*|*Celeron) UNAME_MACHINE=i686 ;; esac - GUESS=$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} + GUESS=$UNAME_MACHINE-${VENDOR}-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} ;; i*86:*:3.2:*) if test -f /usr/options/cb.name; then @@ -1307,7 +1318,7 @@ EOF if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then GUESS=i860-stardent-sysv$UNAME_RELEASE # Stardent Vistra i860-SVR4 else # Add other i860-SVR4 vendors below as they are discovered. - GUESS=i860-unknown-sysv$UNAME_RELEASE # Unknown i860-SVR4 + GUESS=i860-${VENDOR}-sysv$UNAME_RELEASE # Unknown i860-SVR4 fi ;; mini*:CTIX:SYS*5:*) @@ -1344,19 +1355,19 @@ EOF /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;; m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) - GUESS=m68k-unknown-lynxos$UNAME_RELEASE + GUESS=m68k-${VENDOR}-lynxos$UNAME_RELEASE ;; mc68030:UNIX_System_V:4.*:*) GUESS=m68k-atari-sysv4 ;; TSUNAMI:LynxOS:2.*:*) - GUESS=sparc-unknown-lynxos$UNAME_RELEASE + GUESS=sparc-${VENDOR}-lynxos$UNAME_RELEASE ;; rs6000:LynxOS:2.*:*) - GUESS=rs6000-unknown-lynxos$UNAME_RELEASE + GUESS=rs6000-${VENDOR}-lynxos$UNAME_RELEASE ;; PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) - GUESS=powerpc-unknown-lynxos$UNAME_RELEASE + GUESS=powerpc-${VENDOR}-lynxos$UNAME_RELEASE ;; SM[BE]S:UNIX_SV:*:*) GUESS=mips-dde-sysv$UNAME_RELEASE @@ -1406,7 +1417,7 @@ EOF if test -d /usr/nec; then GUESS=mips-nec-sysv$UNAME_RELEASE else - GUESS=mips-unknown-sysv$UNAME_RELEASE + GUESS=mips-${VENDOR}-sysv$UNAME_RELEASE fi ;; BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. @@ -1425,7 +1436,7 @@ EOF GUESS=powerpc-apple-haiku ;; *:Haiku:*:*) # Haiku modern gcc (not bound by BeOS compat) - GUESS=$UNAME_MACHINE-unknown-haiku + GUESS=$UNAME_MACHINE-${VENDOR}-haiku ;; SX-4:SUPER-UX:*:*) GUESS=sx4-nec-superux$UNAME_RELEASE @@ -1538,13 +1549,13 @@ EOF elif test "x${cputype-}" != x; then UNAME_MACHINE=$cputype fi - GUESS=$UNAME_MACHINE-unknown-plan9 + GUESS=$UNAME_MACHINE-${VENDOR}-plan9 ;; *:TOPS-10:*:*) - GUESS=pdp10-unknown-tops10 + GUESS=pdp10-${VENDOR}-tops10 ;; *:TENEX:*:*) - GUESS=pdp10-unknown-tenex + GUESS=pdp10-${VENDOR}-tenex ;; KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) GUESS=pdp10-dec-tops20 @@ -1553,17 +1564,17 @@ EOF GUESS=pdp10-xkl-tops20 ;; *:TOPS-20:*:*) - GUESS=pdp10-unknown-tops20 + GUESS=pdp10-${VENDOR}-tops20 ;; *:ITS:*:*) - GUESS=pdp10-unknown-its + GUESS=pdp10-${VENDOR}-its ;; SEI:*:*:SEIUX) GUESS=mips-sei-seiux$UNAME_RELEASE ;; *:DragonFly:*:*) DRAGONFLY_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'` - GUESS=$UNAME_MACHINE-unknown-dragonfly$DRAGONFLY_REL + GUESS=$UNAME_MACHINE-${VENDOR}-dragonfly$DRAGONFLY_REL ;; *:*VMS:*:*) UNAME_MACHINE=`(uname -p) 2>/dev/null` @@ -1586,19 +1597,19 @@ EOF GUESS=$UNAME_MACHINE-pc-fiwix ;; *:AROS:*:*) - GUESS=$UNAME_MACHINE-unknown-aros + GUESS=$UNAME_MACHINE-${VENDOR}-aros ;; x86_64:VMkernel:*:*) - GUESS=$UNAME_MACHINE-unknown-esx + GUESS=$UNAME_MACHINE-${VENDOR}-esx ;; amd64:Isilon\ OneFS:*:*) - GUESS=x86_64-unknown-onefs + GUESS=x86_64-${VENDOR}-onefs ;; *:Unleashed:*:*) - GUESS=$UNAME_MACHINE-unknown-unleashed$UNAME_RELEASE + GUESS=$UNAME_MACHINE-${VENDOR}-unleashed$UNAME_RELEASE ;; *:Ironclad:*:*) - GUESS=$UNAME_MACHINE-unknown-ironclad + GUESS=$UNAME_MACHINE-${VENDOR}-ironclad ;; esac diff --git a/ac/config.sub b/ac/config.sub index 743b8c28..4aaae46f 100755 --- a/ac/config.sub +++ b/ac/config.sub @@ -1,4 +1,4 @@ -#!/usr/bin/sh +#! /bin/sh # Configuration validation subroutine script. # Copyright 1992-2024 Free Software Foundation, Inc. diff --git a/ac/depcomp b/ac/depcomp index 1f0aa972..9f6725b9 100755 --- a/ac/depcomp +++ b/ac/depcomp @@ -1,9 +1,9 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2024-06-19.01; # UTC +scriptversion=2025-06-18.21; # UTC -# Copyright (C) 1999-2024 Free Software Foundation, Inc. +# Copyright (C) 1999-2025 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -784,9 +784,9 @@ exit 0 # Local Variables: # mode: shell-script # sh-indentation: 2 -# eval: (add-hook 'before-save-hook 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp nil t) # time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-format: "%Y-%02m-%02d.%02H" # time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: diff --git a/ac/install-sh b/ac/install-sh index b1d7a6f6..1d8d9669 100755 --- a/ac/install-sh +++ b/ac/install-sh @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2024-06-19.01; # UTC +scriptversion=2025-06-18.21; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -533,9 +533,9 @@ do done # Local variables: -# eval: (add-hook 'before-save-hook 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp nil t) # time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-format: "%Y-%02m-%02d.%02H" # time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: diff --git a/ac/ltmain.sh b/ac/ltmain.sh old mode 100644 new mode 100755 index ff2d73a6..2a50d7f6 --- a/ac/ltmain.sh +++ b/ac/ltmain.sh @@ -2,11 +2,11 @@ ## DO NOT EDIT - This file generated from ./build-aux/ltmain.in ## by inline-source v2019-02-19.15 -# libtool (GNU libtool) 2.5.4 +# libtool (GNU libtool) 2.4.7 # Provide generalized library-building support services. # Written by Gordon Matzigkeit , 1996 -# Copyright (C) 1996-2019, 2021-2024 Free Software Foundation, Inc. +# Copyright (C) 1996-2019, 2021-2022 Free Software Foundation, Inc. # This is free software; see the source for copying conditions. There is NO # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. @@ -31,8 +31,8 @@ PROGRAM=libtool PACKAGE=libtool -VERSION=2.5.4 -package_revision=2.5.4 +VERSION=2.4.7 +package_revision=2.4.7 ## ------ ## @@ -72,11 +72,11 @@ scriptversion=2019-02-19.15; # UTC # This is free software. There is NO warranty; not even for # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. # -# Copyright (C) 2004-2019, 2021, 2023-2024 Bootstrap Authors +# Copyright (C) 2004-2019, 2021 Bootstrap Authors # # This file is dual licensed under the terms of the MIT license -# , and GPL version 2 or later -# . You must apply one of +# , and GPL version 2 or later +# . You must apply one of # these licenses when using or redistributing this software or any of # the files within it. See the URLs above, or the file `LICENSE` # included in the Bootstrap distribution for the full license texts. @@ -143,7 +143,7 @@ nl=' ' IFS="$sp $nl" -# There are apparently some systems that use ';' as a PATH separator! +# There are apparently some retarded systems that use ';' as a PATH separator! if test "${PATH_SEPARATOR+set}" != set; then PATH_SEPARATOR=: (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { @@ -589,7 +589,7 @@ func_require_term_colors () # _G_HAVE_PLUSEQ_OP # Can be empty, in which case the shell is probed, "yes" if += is - # usable or anything else if it does not work. + # useable or anything else if it does not work. test -z "$_G_HAVE_PLUSEQ_OP" \ && (eval 'x=a; x+=" b"; test "a b" = "$x"') 2>/dev/null \ && _G_HAVE_PLUSEQ_OP=yes @@ -739,7 +739,7 @@ eval 'func_dirname () # to NONDIR_REPLACEMENT. # value returned in "$func_dirname_result" # basename: Compute filename of FILE. -# value returned in "$func_basename_result" +# value retuned in "$func_basename_result" # For efficiency, we do not delegate to the functions above but instead # duplicate the functionality here. eval 'func_dirname_and_basename () @@ -897,7 +897,7 @@ func_mkdir_p () # While some portion of DIR does not yet exist... while test ! -d "$_G_directory_path"; do # ...make a list in topmost first order. Use a colon delimited - # list in case some portion of path contains whitespace. + # list incase some portion of path contains whitespace. _G_dir_list=$_G_directory_path:$_G_dir_list # If the last portion added has no slash in it, the list is done @@ -1536,11 +1536,11 @@ func_lt_ver () # This is free software. There is NO warranty; not even for # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. # -# Copyright (C) 2010-2019, 2021, 2023-2024 Bootstrap Authors +# Copyright (C) 2010-2019, 2021 Bootstrap Authors # # This file is dual licensed under the terms of the MIT license -# , and GPL version 2 or later -# . You must apply one of +# , and GPL version 2 or later +# . You must apply one of # these licenses when using or redistributing this software or any of # the files within it. See the URLs above, or the file `LICENSE` # included in the Bootstrap distribution for the full license texts. @@ -2215,30 +2215,7 @@ func_version () # End: # Set a version string. -scriptversion='(GNU libtool) 2.5.4' - -# func_version -# ------------ -# Echo version message to standard output and exit. -func_version () -{ - $debug_cmd - - year=`date +%Y` - - cat < -This is free software: you are free to change and redistribute it. -There is NO WARRANTY, to the extent permitted by law. - -Originally written by Gordon Matzigkeit, 1996 -(See AUTHORS for complete contributor listing) -EOF - - exit $? -} +scriptversion='(GNU libtool) 2.4.7' # func_echo ARG... @@ -2261,6 +2238,18 @@ func_echo () } +# func_warning ARG... +# ------------------- +# Libtool warnings are not categorized, so override funclib.sh +# func_warning with this simpler definition. +func_warning () +{ + $debug_cmd + + $warning_func ${1+"$@"} +} + + ## ---------------- ## ## Options parsing. ## ## ---------------- ## @@ -2272,23 +2261,19 @@ usage='$progpath [OPTION]... [MODE-ARG]...' # Short help message in response to '-h'. usage_message="Options: - --config show all configuration variables - --debug enable verbose shell tracing - -n, --dry-run display commands without modifying any files - --features display basic configuration information - --finish use operation '--mode=finish' - --mode=MODE use operation mode MODE - --no-finish don't update shared library cache - --no-quiet, --no-silent print default informational messages - --no-warnings equivalent to '-Wnone' - --preserve-dup-deps don't remove duplicate dependency libraries - --quiet, --silent don't print informational messages - --reorder-cache=DIRS reorder shared library cache for preferred DIRS - --tag=TAG use configuration variables from tag TAG - -v, --verbose print more informational messages than default - --version print version information - -W, --warnings=CATEGORY report the warnings falling in CATEGORY [all] - -h, --help, --help-all print short, long, or detailed help message + --config show all configuration variables + --debug enable verbose shell tracing + -n, --dry-run display commands without modifying any files + --features display basic configuration information and exit + --mode=MODE use operation mode MODE + --no-warnings equivalent to '-Wnone' + --preserve-dup-deps don't remove duplicate dependency libraries + --quiet, --silent don't print informational messages + --tag=TAG use configuration variables from tag TAG + -v, --verbose print more informational messages than default + --version print version information + -W, --warnings=CATEGORY report the warnings falling in CATEGORY [all] + -h, --help, --help-all print short, long, or detailed help message " # Additional text appended to 'usage_message' in response to '--help'. @@ -2321,13 +2306,13 @@ include the following information: compiler: $LTCC compiler flags: $LTCFLAGS linker: $LD (gnu? $with_gnu_ld) - version: $progname $scriptversion + version: $progname (GNU libtool) 2.4.7 automake: `($AUTOMAKE --version) 2>/dev/null |$SED 1q` autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q` Report bugs to . -GNU libtool home page: . -General help using GNU software: ." +GNU libtool home page: . +General help using GNU software: ." exit 0 } @@ -2517,11 +2502,8 @@ libtool_options_prep () opt_dry_run=false opt_help=false opt_mode= - opt_reorder_cache=false opt_preserve_dup_deps=false opt_quiet=false - opt_finishing=true - opt_warning= nonopt= preserve_args= @@ -2611,18 +2593,14 @@ libtool_parse_options () clean|compile|execute|finish|install|link|relink|uninstall) ;; # Catch anything else as an error - *) func_error "invalid argument '$1' for $_G_opt" + *) func_error "invalid argument for $_G_opt" exit_cmd=exit + break ;; esac shift ;; - --no-finish) - opt_finishing=false - func_append preserve_args " $_G_opt" - ;; - --no-silent|--no-quiet) opt_quiet=false func_append preserve_args " $_G_opt" @@ -2638,24 +2616,6 @@ libtool_parse_options () func_append preserve_args " $_G_opt" ;; - --reorder-cache) - opt_reorder_cache=true - shared_lib_dirs=$1 - if test -n "$shared_lib_dirs"; then - case $1 in - # Must begin with /: - /*) ;; - - # Catch anything else as an error (relative paths) - *) func_error "invalid argument '$1' for $_G_opt" - func_error "absolute paths are required for $_G_opt" - exit_cmd=exit - ;; - esac - fi - shift - ;; - --silent|--quiet) opt_quiet=: opt_verbose=false @@ -2692,18 +2652,6 @@ libtool_parse_options () func_add_hook func_parse_options libtool_parse_options -# func_warning ARG... -# ------------------- -# Libtool warnings are not categorized, so override funclib.sh -# func_warning with this simpler definition. -func_warning () -{ - if $opt_warning; then - $debug_cmd - $warning_func ${1+"$@"} - fi -} - # libtool_validate_options [ARG]... # --------------------------------- @@ -2720,10 +2668,17 @@ libtool_validate_options () # preserve --debug test : = "$debug_cmd" || func_append preserve_args " --debug" - # Keeping compiler generated duplicates in $postdeps and $predeps is not - # harmful, and is necessary in a majority of systems that use it to satisfy - # symbol dependencies. - opt_duplicate_compiler_generated_deps=: + case $host in + # Solaris2 added to fix http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16452 + # see also: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59788 + *cygwin* | *mingw* | *pw32* | *cegcc* | *solaris2* | *os2*) + # don't eliminate duplications in $postdeps and $predeps + opt_duplicate_compiler_generated_deps=: + ;; + *) + opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps + ;; + esac $opt_help || { # Sanity checks first: @@ -3048,7 +3003,7 @@ EOF # func_convert_core_file_wine_to_w32 ARG # Helper function used by file name conversion functions when $build is *nix, -# and $host is mingw, windows, cygwin, or some other w32 environment. Relies on a +# and $host is mingw, cygwin, or some other w32 environment. Relies on a # correctly configured wine environment available, with the winepath program # in $build's $PATH. # @@ -3080,10 +3035,9 @@ func_convert_core_file_wine_to_w32 () # func_convert_core_path_wine_to_w32 ARG # Helper function used by path conversion functions when $build is *nix, and -# $host is mingw, windows, cygwin, or some other w32 environment. Relies on a -# correctly configured wine environment available, with the winepath program -# in $build's $PATH. Assumes ARG has no leading or trailing path separator -# characters. +# $host is mingw, cygwin, or some other w32 environment. Relies on a correctly +# configured wine environment available, with the winepath program in $build's +# $PATH. Assumes ARG has no leading or trailing path separator characters. # # ARG is path to be converted from $build format to win32. # Result is available in $func_convert_core_path_wine_to_w32_result. @@ -3226,15 +3180,6 @@ func_convert_path_front_back_pathsep () # end func_convert_path_front_back_pathsep -# func_convert_delimited_path PATH ORIG_DELIMITER NEW_DELIMITER -# Replaces a delimiter for a given path. -func_convert_delimited_path () -{ - converted_path=`$ECHO "$1" | $SED "s#$2#$3#g"` -} -# end func_convert_delimited_path - - ################################################## # $build to $host FILE NAME CONVERSION FUNCTIONS # ################################################## @@ -3569,65 +3514,6 @@ func_dll_def_p () } -# func_reorder_shared_lib_cache DIRS -# Reorder the shared library cache by unconfiguring previous shared library cache -# and configuring preferred search directories before previous search directories. -# Previous shared library cache: /usr/lib /usr/local/lib -# Preferred search directories: /tmp/testing -# Reordered shared library cache: /tmp/testing /usr/lib /usr/local/lib -func_reorder_shared_lib_cache () -{ - $debug_cmd - - case $host_os in - openbsd*) - get_search_directories=`PATH="$PATH:/sbin" ldconfig -r | $GREP "search directories" | $SED "s#.*search directories:\ ##g"` - func_convert_delimited_path "$get_search_directories" ':' '\ ' - save_search_directories=$converted_path - func_convert_delimited_path "$1" ':' '\ ' - - # Ensure directories exist - for dir in $converted_path; do - # Ensure each directory is an absolute path - case $dir in - /*) ;; - *) func_error "Directory '$dir' is not an absolute path" - exit $EXIT_FAILURE ;; - esac - # Ensure no trailing slashes - func_stripname '' '/' "$dir" - dir=$func_stripname_result - if test -d "$dir"; then - if test -n "$preferred_search_directories"; then - preferred_search_directories="$preferred_search_directories $dir" - else - preferred_search_directories=$dir - fi - else - func_error "Directory '$dir' does not exist" - exit $EXIT_FAILURE - fi - done - - PATH="$PATH:/sbin" ldconfig -U $save_search_directories - PATH="$PATH:/sbin" ldconfig -m $preferred_search_directories $save_search_directories - get_search_directories=`PATH="$PATH:/sbin" ldconfig -r | $GREP "search directories" | $SED "s#.*search directories:\ ##g"` - func_convert_delimited_path "$get_search_directories" ':' '\ ' - reordered_search_directories=$converted_path - - $ECHO "Original: $save_search_directories" - $ECHO "Reordered: $reordered_search_directories" - exit $EXIT_SUCCESS - ;; - *) - func_error "--reorder-cache is not supported for host_os=$host_os." - exit $EXIT_FAILURE - ;; - esac -} -# end func_reorder_shared_lib_cache - - # func_mode_compile arg... func_mode_compile () { @@ -3806,7 +3692,7 @@ func_mode_compile () # On Cygwin there's no "real" PIC flag so we must build both object types case $host_os in - cygwin* | mingw* | windows* | pw32* | os2* | cegcc*) + cygwin* | mingw* | pw32* | os2* | cegcc*) pic_mode=default ;; esac @@ -4200,12 +4086,6 @@ if $opt_help; then fi -# If option '--reorder-cache', reorder the shared library cache and exit. -if $opt_reorder_cache; then - func_reorder_shared_lib_cache $shared_lib_dirs -fi - - # func_mode_execute arg... func_mode_execute () { @@ -4390,7 +4270,7 @@ func_mode_finish () fi fi - if test -n "$finish_cmds$finish_eval" && test -n "$libdirs" && $opt_finishing; then + if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then for libdir in $libdirs; do if test -n "$finish_cmds"; then # Do each command in the finish commands. @@ -4415,12 +4295,6 @@ func_mode_finish () for libdir in $libdirs; do $ECHO " $libdir" done - if test "false" = "$opt_finishing"; then - echo - echo "NOTE: finish_cmds were not executed during testing, so you must" - echo "manually run ldconfig to add a given test directory, LIBDIR, to" - echo "the search path for generated executables." - fi echo echo "If you ever happen to want to link against installed libraries" echo "in a given directory, LIBDIR, you must either use libtool, and" @@ -4657,15 +4531,8 @@ func_mode_install () func_append dir "$objdir" if test -n "$relink_command"; then - # Strip any trailing slash from the destination. - func_stripname '' '/' "$libdir" - destlibdir=$func_stripname_result - - func_stripname '' '/' "$destdir" - s_destdir=$func_stripname_result - # Determine the prefix the user has applied to our future dir. - inst_prefix_dir=`$ECHO "X$s_destdir" | $Xsed -e "s%$destlibdir\$%%"` + inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"` # Don't allow the user to place us outside of our expected # location b/c this prevents finding dependent libraries that @@ -4702,7 +4569,7 @@ func_mode_install () 'exit $?' tstripme=$stripme case $host_os in - cygwin* | mingw* | windows* | pw32* | cegcc*) + cygwin* | mingw* | pw32* | cegcc*) case $realname in *.dll.a) tstripme= @@ -4815,7 +4682,7 @@ func_mode_install () # Do a test to see if this is really a libtool program. case $host in - *cygwin* | *mingw* | *windows*) + *cygwin* | *mingw*) if func_ltwrapper_executable_p "$file"; then func_ltwrapper_scriptname "$file" wrapper=$func_ltwrapper_scriptname_result @@ -5043,7 +4910,7 @@ extern \"C\" { $RM $export_symbols eval "$SED -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' case $host in - *cygwin* | *mingw* | *windows* | *cegcc* ) + *cygwin* | *mingw* | *cegcc* ) eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"' ;; @@ -5055,7 +4922,7 @@ extern \"C\" { eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T' eval '$MV "$nlist"T "$nlist"' case $host in - *cygwin* | *mingw* | *windows* | *cegcc* ) + *cygwin* | *mingw* | *cegcc* ) eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' eval 'cat "$nlist" >> "$output_objdir/$outputname.def"' ;; @@ -5069,7 +4936,7 @@ extern \"C\" { func_basename "$dlprefile" name=$func_basename_result case $host in - *cygwin* | *mingw* | *windows* | *cegcc* ) + *cygwin* | *mingw* | *cegcc* ) # if an import library, we need to obtain dlname if func_win32_import_lib_p "$dlprefile"; then func_tr_sh "$dlprefile" @@ -5095,16 +4962,8 @@ extern \"C\" { eval '$ECHO ": $name " >> "$nlist"' fi func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 - case $host in - i[3456]86-*-mingw32*) - eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe | - $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'" - ;; - *) - eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe | - $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/__nm_//' >> '$nlist'" - ;; - esac + eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe | + $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'" } else # not an import lib $opt_dry_run || { @@ -5252,7 +5111,7 @@ static const void *lt_preloaded_setup() { # Transform the symbol file into the correct name. symfileobj=$output_objdir/${my_outputname}S.$objext case $host in - *cygwin* | *mingw* | *windows* | *cegcc* ) + *cygwin* | *mingw* | *cegcc* ) if test -f "$output_objdir/$my_outputname.def"; then compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` @@ -5328,7 +5187,7 @@ func_win32_libid () *ar\ archive*) # could be an import, or static # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD. if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | - $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64|pe-aarch64)' >/dev/null; then + $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then case $nm_interface in "MS dumpbin") if func_cygming_ms_implib_p "$1" || @@ -5595,7 +5454,7 @@ func_extract_archives () # # Emit a libtool wrapper script on stdout. # Don't directly open a file because we may want to -# incorporate the script contents within a cygwin/mingw/windows +# incorporate the script contents within a cygwin/mingw # wrapper executable. Must ONLY be called from within # func_mode_link because it depends on a number of variables # set therein. @@ -5603,7 +5462,7 @@ func_extract_archives () # ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR # variable will take. If 'yes', then the emitted script # will assume that the directory where it is stored is -# the $objdir directory. This is a cygwin/mingw/windows-specific +# the $objdir directory. This is a cygwin/mingw-specific # behavior. func_emit_wrapper () { @@ -5728,7 +5587,7 @@ func_exec_program_core () " case $host in # Backslashes separate directories on plain windows - *-*-mingw* | *-*-windows* | *-*-os2* | *-cegcc*) + *-*-mingw | *-*-os2* | *-cegcc*) $ECHO "\ if test -n \"\$lt_option_debug\"; then \$ECHO \"$outputname:$output:\$LINENO: newargv[0]: \$progdir\\\\\$program\" 1>&2 @@ -5796,7 +5655,7 @@ func_exec_program () file=\`ls -ld \"\$thisdir/\$file\" | $SED -n 's/.*-> //p'\` done - # Usually 'no', except on cygwin/mingw/windows when embedded into + # Usually 'no', except on cygwin/mingw when embedded into # the cwrapper. WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_arg1 if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then @@ -5928,7 +5787,7 @@ EOF #endif #include #include -#if defined _WIN32 && !defined __GNUC__ +#ifdef _MSC_VER # include # include # include @@ -5953,7 +5812,7 @@ EOF /* declarations of non-ANSI functions */ #if defined __MINGW32__ # ifdef __STRICT_ANSI__ -_CRTIMP int __cdecl _putenv (const char *); +int _putenv (const char *); # endif #elif defined __CYGWIN__ # ifdef __STRICT_ANSI__ @@ -6151,7 +6010,7 @@ main (int argc, char *argv[]) { EOF case $host in - *mingw* | *windows* | *cygwin* ) + *mingw* | *cygwin* ) # make stdout use "unix" line endings echo " setmode(1,_O_BINARY);" ;; @@ -6170,7 +6029,7 @@ EOF { /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX namespace, but it is not one of the ones we know about and - have already dealt with, above (including dump-script), then + have already dealt with, above (inluding dump-script), then report an error. Otherwise, targets might begin to believe they are allowed to use options in the LTWRAPPER_OPTION_PREFIX namespace. The first time any user complains about this, we'll @@ -6254,7 +6113,7 @@ EOF EOF case $host_os in - mingw* | windows*) + mingw*) cat <<"EOF" { char* p; @@ -6296,7 +6155,7 @@ EOF EOF case $host_os in - mingw* | windows*) + mingw*) cat <<"EOF" /* execv doesn't actually work on mingw as expected on unix */ newargz = prepare_spawn (newargz); @@ -6715,7 +6574,7 @@ lt_update_lib_path (const char *name, const char *value) EOF case $host_os in - mingw* | windows*) + mingw*) cat <<"EOF" /* Prepares an argument vector before calling spawn(). @@ -6890,7 +6749,7 @@ func_mode_link () $debug_cmd case $host in - *-*-cygwin* | *-*-mingw* | *-*-windows* | *-*-pw32* | *-*-os2* | *-cegcc*) + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) # It is impossible to link a dll without this setting, and # we shouldn't force the makefile maintainer to figure out # what system we are compiling for in order to pass an extra @@ -6914,7 +6773,6 @@ func_mode_link () finalize_command=$nonopt compile_rpath= - compile_rpath_tail= finalize_rpath= compile_shlibpath= finalize_shlibpath= @@ -6955,12 +6813,10 @@ func_mode_link () xrpath= perm_rpath= temp_rpath= - temp_rpath_tail= thread_safe=no vinfo= vinfo_number=no weak_libs= - rpath_arg= single_module=$wl-single_module func_infer_tag $base_compile @@ -7223,7 +7079,7 @@ func_mode_link () case $arg in [\\/]* | [A-Za-z]:[\\/]*) ;; *) - func_fatal_error "argument to -rpath is not absolute: $arg" + func_fatal_error "only absolute run-paths are allowed" ;; esac if test rpath = "$prev"; then @@ -7399,7 +7255,7 @@ func_mode_link () ;; esac case $host in - *-*-cygwin* | *-*-mingw* | *-*-windows* | *-*-pw32* | *-*-os2* | *-cegcc*) + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) testbindir=`$ECHO "$dir" | $SED 's*/lib$*/bin*'` case :$dllsearchpath: in *":$dir:"*) ;; @@ -7419,7 +7275,7 @@ func_mode_link () -l*) if test X-lc = "X$arg" || test X-lm = "X$arg"; then case $host in - *-*-cygwin* | *-*-mingw* | *-*-windows* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*) + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*) # These systems don't actually have a C or math library (as such) continue ;; @@ -7427,7 +7283,7 @@ func_mode_link () # These systems don't actually have a C library (as such) test X-lc = "X$arg" && continue ;; - *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-midnightbsd*) + *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig* | *-*-midnightbsd*) # Do not include libc due to us having libc/libc_r. test X-lc = "X$arg" && continue ;; @@ -7447,7 +7303,7 @@ func_mode_link () esac elif test X-lc_r = "X$arg"; then case $host in - *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-midnightbsd*) + *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig* | *-*-midnightbsd*) # Do not include libc_r directly, use -pthread flag. continue ;; @@ -7470,8 +7326,7 @@ func_mode_link () # Tru64 UNIX uses -model [arg] to determine the layout of C++ # classes, name mangling, and exception handling. # Darwin uses the -arch flag to determine output architecture. - # -q