Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitc72f9b9

Browse files
committed
Remove support for non-ELF BSD systems
This is long obsolete.Discussion:https://www.postgresql.org/message-id/8eacdc0d-123f-dbca-bacf-0a68766a4889@2ndquadrant.com
1 parent615cebc commitc72f9b9

File tree

7 files changed

+161
-275
lines changed

7 files changed

+161
-275
lines changed

‎configure

Lines changed: 133 additions & 166 deletions
Original file line numberDiff line numberDiff line change
@@ -658,6 +658,8 @@ PTHREAD_CFLAGS
658658
PTHREAD_LIBS
659659
PTHREAD_CC
660660
ax_pthread_config
661+
EGREP
662+
GREP
661663
SED
662664
ZIC
663665
python_additional_libs
@@ -697,9 +699,6 @@ with_gnu_ld
697699
LD
698700
LDFLAGS_SL
699701
LDFLAGS_EX
700-
ELF_SYS
701-
EGREP
702-
GREP
703702
with_zlib
704703
with_system_tzdata
705704
with_libxslt
@@ -8306,169 +8305,6 @@ fi
83068305

83078306

83088307

8309-
#
8310-
# Elf
8311-
#
8312-
8313-
# Assume system is ELF if it predefines __ELF__ as 1,
8314-
# otherwise believe host_os based default.
8315-
case $host_os in
8316-
freebsd1*|freebsd2*) elf=no;;
8317-
freebsd3*|freebsd4*) elf=yes;;
8318-
esac
8319-
8320-
8321-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
8322-
$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
8323-
if ${ac_cv_path_GREP+:} false; then :
8324-
$as_echo_n "(cached) " >&6
8325-
else
8326-
if test -z "$GREP"; then
8327-
ac_path_GREP_found=false
8328-
# Loop through the user's path and test for each of PROGNAME-LIST
8329-
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
8330-
for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
8331-
do
8332-
IFS=$as_save_IFS
8333-
test -z "$as_dir" && as_dir=.
8334-
for ac_prog in grep ggrep; do
8335-
for ac_exec_ext in '' $ac_executable_extensions; do
8336-
ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
8337-
as_fn_executable_p "$ac_path_GREP" || continue
8338-
# Check for GNU ac_path_GREP and select it if it is found.
8339-
# Check for GNU $ac_path_GREP
8340-
case `"$ac_path_GREP" --version 2>&1` in
8341-
*GNU*)
8342-
ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
8343-
*)
8344-
ac_count=0
8345-
$as_echo_n 0123456789 >"conftest.in"
8346-
while :
8347-
do
8348-
cat "conftest.in" "conftest.in" >"conftest.tmp"
8349-
mv "conftest.tmp" "conftest.in"
8350-
cp "conftest.in" "conftest.nl"
8351-
$as_echo 'GREP' >> "conftest.nl"
8352-
"$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
8353-
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
8354-
as_fn_arith $ac_count + 1 && ac_count=$as_val
8355-
if test $ac_count -gt ${ac_path_GREP_max-0}; then
8356-
# Best one so far, save it but keep looking for a better one
8357-
ac_cv_path_GREP="$ac_path_GREP"
8358-
ac_path_GREP_max=$ac_count
8359-
fi
8360-
# 10*(2^10) chars as input seems more than enough
8361-
test $ac_count -gt 10 && break
8362-
done
8363-
rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
8364-
esac
8365-
8366-
$ac_path_GREP_found && break 3
8367-
done
8368-
done
8369-
done
8370-
IFS=$as_save_IFS
8371-
if test -z "$ac_cv_path_GREP"; then
8372-
as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
8373-
fi
8374-
else
8375-
ac_cv_path_GREP=$GREP
8376-
fi
8377-
8378-
fi
8379-
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
8380-
$as_echo "$ac_cv_path_GREP" >&6; }
8381-
GREP="$ac_cv_path_GREP"
8382-
8383-
8384-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
8385-
$as_echo_n "checking for egrep... " >&6; }
8386-
if ${ac_cv_path_EGREP+:} false; then :
8387-
$as_echo_n "(cached) " >&6
8388-
else
8389-
if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
8390-
then ac_cv_path_EGREP="$GREP -E"
8391-
else
8392-
if test -z "$EGREP"; then
8393-
ac_path_EGREP_found=false
8394-
# Loop through the user's path and test for each of PROGNAME-LIST
8395-
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
8396-
for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
8397-
do
8398-
IFS=$as_save_IFS
8399-
test -z "$as_dir" && as_dir=.
8400-
for ac_prog in egrep; do
8401-
for ac_exec_ext in '' $ac_executable_extensions; do
8402-
ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
8403-
as_fn_executable_p "$ac_path_EGREP" || continue
8404-
# Check for GNU ac_path_EGREP and select it if it is found.
8405-
# Check for GNU $ac_path_EGREP
8406-
case `"$ac_path_EGREP" --version 2>&1` in
8407-
*GNU*)
8408-
ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
8409-
*)
8410-
ac_count=0
8411-
$as_echo_n 0123456789 >"conftest.in"
8412-
while :
8413-
do
8414-
cat "conftest.in" "conftest.in" >"conftest.tmp"
8415-
mv "conftest.tmp" "conftest.in"
8416-
cp "conftest.in" "conftest.nl"
8417-
$as_echo 'EGREP' >> "conftest.nl"
8418-
"$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
8419-
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
8420-
as_fn_arith $ac_count + 1 && ac_count=$as_val
8421-
if test $ac_count -gt ${ac_path_EGREP_max-0}; then
8422-
# Best one so far, save it but keep looking for a better one
8423-
ac_cv_path_EGREP="$ac_path_EGREP"
8424-
ac_path_EGREP_max=$ac_count
8425-
fi
8426-
# 10*(2^10) chars as input seems more than enough
8427-
test $ac_count -gt 10 && break
8428-
done
8429-
rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
8430-
esac
8431-
8432-
$ac_path_EGREP_found && break 3
8433-
done
8434-
done
8435-
done
8436-
IFS=$as_save_IFS
8437-
if test -z "$ac_cv_path_EGREP"; then
8438-
as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
8439-
fi
8440-
else
8441-
ac_cv_path_EGREP=$EGREP
8442-
fi
8443-
8444-
fi
8445-
fi
8446-
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
8447-
$as_echo "$ac_cv_path_EGREP" >&6; }
8448-
EGREP="$ac_cv_path_EGREP"
8449-
8450-
8451-
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8452-
/* end confdefs.h. */
8453-
#if __ELF__
8454-
yes
8455-
#endif
8456-
8457-
_ACEOF
8458-
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
8459-
$EGREP "yes" >/dev/null 2>&1; then :
8460-
ELF_SYS=true
8461-
else
8462-
if test "X$elf" = "Xyes" ; then
8463-
ELF_SYS=true
8464-
else
8465-
ELF_SYS=
8466-
fi
8467-
fi
8468-
rm -f conftest*
8469-
8470-
8471-
84728308
#
84738309
# Assignments
84748310
#
@@ -10055,6 +9891,137 @@ $as_echo "$ac_cv_path_SED" >&6; }
100559891
SED="$ac_cv_path_SED"
100569892
rm -f conftest.sed
100579893

9894+
9895+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
9896+
$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
9897+
if ${ac_cv_path_GREP+:} false; then :
9898+
$as_echo_n "(cached) " >&6
9899+
else
9900+
if test -z "$GREP"; then
9901+
ac_path_GREP_found=false
9902+
# Loop through the user's path and test for each of PROGNAME-LIST
9903+
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
9904+
for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
9905+
do
9906+
IFS=$as_save_IFS
9907+
test -z "$as_dir" && as_dir=.
9908+
for ac_prog in grep ggrep; do
9909+
for ac_exec_ext in '' $ac_executable_extensions; do
9910+
ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
9911+
as_fn_executable_p "$ac_path_GREP" || continue
9912+
# Check for GNU ac_path_GREP and select it if it is found.
9913+
# Check for GNU $ac_path_GREP
9914+
case `"$ac_path_GREP" --version 2>&1` in
9915+
*GNU*)
9916+
ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
9917+
*)
9918+
ac_count=0
9919+
$as_echo_n 0123456789 >"conftest.in"
9920+
while :
9921+
do
9922+
cat "conftest.in" "conftest.in" >"conftest.tmp"
9923+
mv "conftest.tmp" "conftest.in"
9924+
cp "conftest.in" "conftest.nl"
9925+
$as_echo 'GREP' >> "conftest.nl"
9926+
"$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
9927+
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
9928+
as_fn_arith $ac_count + 1 && ac_count=$as_val
9929+
if test $ac_count -gt ${ac_path_GREP_max-0}; then
9930+
# Best one so far, save it but keep looking for a better one
9931+
ac_cv_path_GREP="$ac_path_GREP"
9932+
ac_path_GREP_max=$ac_count
9933+
fi
9934+
# 10*(2^10) chars as input seems more than enough
9935+
test $ac_count -gt 10 && break
9936+
done
9937+
rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
9938+
esac
9939+
9940+
$ac_path_GREP_found && break 3
9941+
done
9942+
done
9943+
done
9944+
IFS=$as_save_IFS
9945+
if test -z "$ac_cv_path_GREP"; then
9946+
as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
9947+
fi
9948+
else
9949+
ac_cv_path_GREP=$GREP
9950+
fi
9951+
9952+
fi
9953+
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
9954+
$as_echo "$ac_cv_path_GREP" >&6; }
9955+
GREP="$ac_cv_path_GREP"
9956+
9957+
9958+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
9959+
$as_echo_n "checking for egrep... " >&6; }
9960+
if ${ac_cv_path_EGREP+:} false; then :
9961+
$as_echo_n "(cached) " >&6
9962+
else
9963+
if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
9964+
then ac_cv_path_EGREP="$GREP -E"
9965+
else
9966+
if test -z "$EGREP"; then
9967+
ac_path_EGREP_found=false
9968+
# Loop through the user's path and test for each of PROGNAME-LIST
9969+
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
9970+
for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
9971+
do
9972+
IFS=$as_save_IFS
9973+
test -z "$as_dir" && as_dir=.
9974+
for ac_prog in egrep; do
9975+
for ac_exec_ext in '' $ac_executable_extensions; do
9976+
ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
9977+
as_fn_executable_p "$ac_path_EGREP" || continue
9978+
# Check for GNU ac_path_EGREP and select it if it is found.
9979+
# Check for GNU $ac_path_EGREP
9980+
case `"$ac_path_EGREP" --version 2>&1` in
9981+
*GNU*)
9982+
ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
9983+
*)
9984+
ac_count=0
9985+
$as_echo_n 0123456789 >"conftest.in"
9986+
while :
9987+
do
9988+
cat "conftest.in" "conftest.in" >"conftest.tmp"
9989+
mv "conftest.tmp" "conftest.in"
9990+
cp "conftest.in" "conftest.nl"
9991+
$as_echo 'EGREP' >> "conftest.nl"
9992+
"$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
9993+
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
9994+
as_fn_arith $ac_count + 1 && ac_count=$as_val
9995+
if test $ac_count -gt ${ac_path_EGREP_max-0}; then
9996+
# Best one so far, save it but keep looking for a better one
9997+
ac_cv_path_EGREP="$ac_path_EGREP"
9998+
ac_path_EGREP_max=$ac_count
9999+
fi
10000+
# 10*(2^10) chars as input seems more than enough
10001+
test $ac_count -gt 10 && break
10002+
done
10003+
rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
10004+
esac
10005+
10006+
$ac_path_EGREP_found && break 3
10007+
done
10008+
done
10009+
done
10010+
IFS=$as_save_IFS
10011+
if test -z "$ac_cv_path_EGREP"; then
10012+
as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
10013+
fi
10014+
else
10015+
ac_cv_path_EGREP=$EGREP
10016+
fi
10017+
10018+
fi
10019+
fi
10020+
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
10021+
$as_echo "$ac_cv_path_EGREP" >&6; }
10022+
EGREP="$ac_cv_path_EGREP"
10023+
10024+
1005810025
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
1005910026
$as_echo_n "checking for ANSI C header files... " >&6; }
1006010027
if ${ac_cv_header_stdc+:} false; then :

‎configure.in

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -964,30 +964,6 @@ PGAC_ARG_BOOL(with, zlib, yes,
964964
[do not use Zlib])
965965
AC_SUBST(with_zlib)
966966

967-
#
968-
# Elf
969-
#
970-
971-
# Assume system is ELF if it predefines __ELF__ as 1,
972-
# otherwise believe host_os based default.
973-
case $host_os in
974-
freebsd1*|freebsd2*) elf=no;;
975-
freebsd3*|freebsd4*) elf=yes;;
976-
esac
977-
978-
AC_EGREP_CPP(yes,
979-
[#if __ELF__
980-
yes
981-
#endif
982-
],
983-
[ELF_SYS=true],
984-
[if test "X$elf" = "Xyes" ; then
985-
ELF_SYS=true
986-
else
987-
ELF_SYS=
988-
fi])
989-
AC_SUBST(ELF_SYS)
990-
991967
#
992968
# Assignments
993969
#

‎src/Makefile.global.in

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -506,10 +506,6 @@ host_tuple = @host@
506506
host_os = @host_os@
507507
host_cpu = @host_cpu@
508508

509-
# This is mainly for use on FreeBSD, where we have both a.out and elf
510-
# systems now. May be applicable to other systems to?
511-
ELF_SYSTEM= @ELF_SYS@
512-
513509
# Backend stack size limit has to be hard-wired on Windows (it's in bytes)
514510
WIN32_STACK_RLIMIT=4194304
515511

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp