Skip to content

Commit 580476f

Browse files
committed
Modify aclocal.mp/config.guess/configure to sync wiht ubuntu-24.04
1 parent 6eaa23e commit 580476f

File tree

3 files changed

+207
-133
lines changed

3 files changed

+207
-133
lines changed

aclocal.m4

Lines changed: 79 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

config.guess

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
#! /bin/sh
22
# Attempt to guess a canonical system name.
3-
# Copyright 1992-2021 Free Software Foundation, Inc.
3+
# Copyright 1992-2022 Free Software Foundation, Inc.
44

55
# shellcheck disable=SC2006,SC2268 # see below for rationale
66

7-
timestamp='2021-06-03'
7+
timestamp='2022-01-09'
88

99
# This file is free software; you can redistribute it and/or modify it
1010
# under the terms of the GNU General Public License as published by
11-
# the Free Software Foundation; either version 3 of the License, or
11+
# the Free Software Foundation, either version 3 of the License, or
1212
# (at your option) any later version.
1313
#
1414
# This program is distributed in the hope that it will be useful, but
@@ -60,7 +60,7 @@ version="\
6060
GNU config.guess ($timestamp)
6161
6262
Originally written by Per Bothner.
63-
Copyright 1992-2021 Free Software Foundation, Inc.
63+
Copyright 1992-2022 Free Software Foundation, Inc.
6464
6565
This is free software; see the source for copying conditions. There is NO
6666
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -437,7 +437,7 @@ case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION in
437437
# This test works for both compilers.
438438
if test "$CC_FOR_BUILD" != no_compiler_found; then
439439
if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
440-
(CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
440+
(CCOPTS="" $CC_FOR_BUILD -m64 -E - 2>/dev/null) | \
441441
grep IS_64BIT_ARCH >/dev/null
442442
then
443443
SUN_ARCH=x86_64
@@ -929,6 +929,9 @@ EOF
929929
i*:PW*:*)
930930
GUESS=$UNAME_MACHINE-pc-pw32
931931
;;
932+
*:SerenityOS:*:*)
933+
GUESS=$UNAME_MACHINE-pc-serenity
934+
;;
932935
*:Interix*:*)
933936
case $UNAME_MACHINE in
934937
x86)
@@ -1522,6 +1525,9 @@ EOF
15221525
i*86:rdos:*:*)
15231526
GUESS=$UNAME_MACHINE-pc-rdos
15241527
;;
1528+
i*86:Fiwix:*:*)
1529+
GUESS=$UNAME_MACHINE-pc-fiwix
1530+
;;
15251531
*:AROS:*:*)
15261532
GUESS=$UNAME_MACHINE-unknown-aros
15271533
;;

0 commit comments

Comments
 (0)