Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 64393a7

Browse files
committed
Don't probe extra libraries for fdatasync.
Commit d2e1508 got rid of the main configure probe and HAVE_FDATASYNC macro, but we still searched -lrt and -lposix4 for old Solaris systems. It's in the C library on modern Solaris, as on other supported systems. Reviewed-by: Peter Eisentraut <peter@eisentraut.org> Reviewed-by: Tristan Partin <tristan@neon.tech> Discussion: https://postgr.es/m/CA%2BhUKGLLVx4drdvXats9PxH3eeB%2BE2NkJReJ%2BRGmaOpU%3D9rgEA%40mail.gmail.com
1 parent 81e36d3 commit 64393a7

File tree

3 files changed

+0
-60
lines changed

3 files changed

+0
-60
lines changed

configure

-57
Original file line numberDiff line numberDiff line change
@@ -12195,63 +12195,6 @@ if test "$ac_res" != no; then :
1219512195

1219612196
fi
1219712197

12198-
# Solaris:
12199-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing fdatasync" >&5
12200-
$as_echo_n "checking for library containing fdatasync... " >&6; }
12201-
if ${ac_cv_search_fdatasync+:} false; then :
12202-
$as_echo_n "(cached) " >&6
12203-
else
12204-
ac_func_search_save_LIBS=$LIBS
12205-
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
12206-
/* end confdefs.h. */
12207-
12208-
/* Override any GCC internal prototype to avoid an error.
12209-
Use char because int might match the return type of a GCC
12210-
builtin and then its argument prototype would still apply. */
12211-
#ifdef __cplusplus
12212-
extern "C"
12213-
#endif
12214-
char fdatasync ();
12215-
int
12216-
main ()
12217-
{
12218-
return fdatasync ();
12219-
;
12220-
return 0;
12221-
}
12222-
_ACEOF
12223-
for ac_lib in '' rt posix4; do
12224-
if test -z "$ac_lib"; then
12225-
ac_res="none required"
12226-
else
12227-
ac_res=-l$ac_lib
12228-
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
12229-
fi
12230-
if ac_fn_c_try_link "$LINENO"; then :
12231-
ac_cv_search_fdatasync=$ac_res
12232-
fi
12233-
rm -f core conftest.err conftest.$ac_objext \
12234-
conftest$ac_exeext
12235-
if ${ac_cv_search_fdatasync+:} false; then :
12236-
break
12237-
fi
12238-
done
12239-
if ${ac_cv_search_fdatasync+:} false; then :
12240-
12241-
else
12242-
ac_cv_search_fdatasync=no
12243-
fi
12244-
rm conftest.$ac_ext
12245-
LIBS=$ac_func_search_save_LIBS
12246-
fi
12247-
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_fdatasync" >&5
12248-
$as_echo "$ac_cv_search_fdatasync" >&6; }
12249-
ac_res=$ac_cv_search_fdatasync
12250-
if test "$ac_res" != no; then :
12251-
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
12252-
12253-
fi
12254-
1225512198
# Cygwin:
1225612199
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing shmget" >&5
1225712200
$as_echo_n "checking for library containing shmget... " >&6; }

configure.ac

-2
Original file line numberDiff line numberDiff line change
@@ -1286,8 +1286,6 @@ AC_SEARCH_LIBS(getopt_long, [getopt gnugetopt])
12861286
AC_SEARCH_LIBS(shm_open, rt)
12871287
AC_SEARCH_LIBS(shm_unlink, rt)
12881288
AC_SEARCH_LIBS(clock_gettime, [rt posix4])
1289-
# Solaris:
1290-
AC_SEARCH_LIBS(fdatasync, [rt posix4])
12911289
# Cygwin:
12921290
AC_SEARCH_LIBS(shmget, cygipc)
12931291
# *BSD:

meson.build

-1
Original file line numberDiff line numberDiff line change
@@ -2421,7 +2421,6 @@ func_checks = [
24212421
# required. Just checking for dlsym() ought to suffice.
24222422
['dlsym', {'dependencies': [dl_dep], 'define': false}],
24232423
['explicit_bzero'],
2424-
['fdatasync', {'dependencies': [rt_dep, posix4_dep], 'define': false}], # Solaris
24252424
['getifaddrs'],
24262425
['getopt', {'dependencies': [getopt_dep, gnugetopt_dep], 'skip': always_replace_getopt}],
24272426
['getopt_long', {'dependencies': [getopt_dep, gnugetopt_dep], 'skip': always_replace_getopt_long}],

0 commit comments

Comments
 (0)