autoconf: Rely on ar supporting index creation
This way we don't need RANLIB anymore, making it a bit simpler for the meson build to generate Makefile.global for PGXS compatibility. FreeBSD, NetBSD, OpenBSD, the only platforms where we didn't use AROPT=crs, all have supported the 's' option for a long time. On macOS we ran ranlib after installing a static library. This was added a long time ago, in58ad65ec2d. I cannot reproduce an issue in more recent macOS versions. This is removed now. Based on discussion with Tom, I left the 'touch' at the end of static libraries generation, added in826eff57c4, in place. While it looks like current versions of Apple's ar/ranlib don't need it, it was needed not too long ago. Reviewed-by: Tom Lane <tgl@sss.pgh.pa.us> Discussion: https://postgr.es/m/20221005200710.luvw5evhwf6clig6@awork3.anarazel.de
This commit is contained in:
Andres Freund
parent
614a406b4f
commit
2473cb9ff3
|
|
@ -692,7 +692,6 @@ AR
|
|||
STRIP_SHARED_LIB
|
||||
STRIP_STATIC_LIB
|
||||
STRIP
|
||||
RANLIB
|
||||
with_gnu_ld
|
||||
LD
|
||||
LDFLAGS_SL
|
||||
|
|
@ -9557,98 +9556,6 @@ with_gnu_ld=$ac_cv_prog_gnu_ld
|
|||
|
||||
|
||||
|
||||
if test -n "$ac_tool_prefix"; then
|
||||
# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
|
||||
set dummy ${ac_tool_prefix}ranlib; ac_word=$2
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
||||
$as_echo_n "checking for $ac_word... " >&6; }
|
||||
if ${ac_cv_prog_RANLIB+:} false; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
if test -n "$RANLIB"; then
|
||||
ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
|
||||
else
|
||||
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||||
for as_dir in $PATH
|
||||
do
|
||||
IFS=$as_save_IFS
|
||||
test -z "$as_dir" && as_dir=.
|
||||
for ac_exec_ext in '' $ac_executable_extensions; do
|
||||
if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
||||
ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
|
||||
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||||
break 2
|
||||
fi
|
||||
done
|
||||
done
|
||||
IFS=$as_save_IFS
|
||||
|
||||
fi
|
||||
fi
|
||||
RANLIB=$ac_cv_prog_RANLIB
|
||||
if test -n "$RANLIB"; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
|
||||
$as_echo "$RANLIB" >&6; }
|
||||
else
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||
$as_echo "no" >&6; }
|
||||
fi
|
||||
|
||||
|
||||
fi
|
||||
if test -z "$ac_cv_prog_RANLIB"; then
|
||||
ac_ct_RANLIB=$RANLIB
|
||||
# Extract the first word of "ranlib", so it can be a program name with args.
|
||||
set dummy ranlib; ac_word=$2
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
||||
$as_echo_n "checking for $ac_word... " >&6; }
|
||||
if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
if test -n "$ac_ct_RANLIB"; then
|
||||
ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
|
||||
else
|
||||
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||||
for as_dir in $PATH
|
||||
do
|
||||
IFS=$as_save_IFS
|
||||
test -z "$as_dir" && as_dir=.
|
||||
for ac_exec_ext in '' $ac_executable_extensions; do
|
||||
if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
||||
ac_cv_prog_ac_ct_RANLIB="ranlib"
|
||||
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||||
break 2
|
||||
fi
|
||||
done
|
||||
done
|
||||
IFS=$as_save_IFS
|
||||
|
||||
fi
|
||||
fi
|
||||
ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
|
||||
if test -n "$ac_ct_RANLIB"; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
|
||||
$as_echo "$ac_ct_RANLIB" >&6; }
|
||||
else
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||
$as_echo "no" >&6; }
|
||||
fi
|
||||
|
||||
if test "x$ac_ct_RANLIB" = x; then
|
||||
RANLIB=":"
|
||||
else
|
||||
case $cross_compiling:$ac_tool_warned in
|
||||
yes:)
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
|
||||
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
|
||||
ac_tool_warned=yes ;;
|
||||
esac
|
||||
RANLIB=$ac_ct_RANLIB
|
||||
fi
|
||||
else
|
||||
RANLIB="$ac_cv_prog_RANLIB"
|
||||
fi
|
||||
|
||||
|
||||
if test -n "$ac_tool_prefix"; then
|
||||
# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
|
||||
|
|
|
|||
|
|
@ -1131,7 +1131,6 @@ AC_ARG_VAR(LDFLAGS_SL, [extra linker flags for linking shared libraries only])
|
|||
PGAC_PROG_LD
|
||||
AC_SUBST(LD)
|
||||
AC_SUBST(with_gnu_ld)
|
||||
AC_PROG_RANLIB
|
||||
PGAC_CHECK_STRIP
|
||||
AC_CHECK_TOOL(AR, ar, ar)
|
||||
if test "$PORTNAME" = "win32"; then
|
||||
|
|
|
|||
|
|
@ -284,6 +284,7 @@ ZIC = @ZIC@
|
|||
# Linking
|
||||
|
||||
AR = @AR@
|
||||
AROPT = crs
|
||||
LIBS = @LIBS@
|
||||
LDAP_LIBS_FE = @LDAP_LIBS_FE@
|
||||
LDAP_LIBS_BE = @LDAP_LIBS_BE@
|
||||
|
|
@ -318,7 +319,6 @@ LDFLAGS_EX = @LDFLAGS_EX@
|
|||
LDFLAGS_SL += @LDFLAGS_SL@
|
||||
LDREL = -r
|
||||
LDOUT = -o
|
||||
RANLIB = @RANLIB@
|
||||
WINDRES = @WINDRES@
|
||||
X = @EXEEXT@
|
||||
|
||||
|
|
|
|||
|
|
@ -252,7 +252,7 @@ all-static-lib: $(stlib)
|
|||
all-shared-lib: $(shlib)
|
||||
|
||||
# In this rule, "touch $@" works around a problem on some platforms wherein
|
||||
# ranlib updates the library file's mod time with a value calculated to
|
||||
# ar updates the library file's mod time with a value calculated to
|
||||
# seconds precision. If the filesystem has sub-second timestamps, this can
|
||||
# cause the library file to appear older than its input files, triggering
|
||||
# parallel-make problems.
|
||||
|
|
@ -260,7 +260,6 @@ ifndef haslibarule
|
|||
$(stlib): $(OBJS) | $(SHLIB_PREREQS)
|
||||
rm -f $@
|
||||
$(LINK.static) $@ $^
|
||||
$(RANLIB) $@
|
||||
touch $@
|
||||
endif #haslibarule
|
||||
|
||||
|
|
@ -394,10 +393,6 @@ install-lib-pc: lib$(NAME).pc installdirs-lib
|
|||
|
||||
install-lib-static: $(stlib) installdirs-lib
|
||||
$(INSTALL_STLIB) $< '$(DESTDIR)$(libdir)/$(stlib)'
|
||||
ifeq ($(PORTNAME), darwin)
|
||||
cd '$(DESTDIR)$(libdir)' && \
|
||||
$(RANLIB) $(stlib)
|
||||
endif
|
||||
|
||||
install-lib-shared: $(shlib) installdirs-lib
|
||||
ifdef soname
|
||||
|
|
|
|||
|
|
@ -2,9 +2,6 @@
|
|||
# symbol names to tell them what to export/import.
|
||||
MAKE_EXPORTS= true
|
||||
|
||||
RANLIB= touch
|
||||
AROPT = crs
|
||||
|
||||
# -blibpath must contain ALL directories where we should look for libraries
|
||||
libpath := $(shell echo $(subst -L,:,$(filter -L/%,$(LDFLAGS))) | sed -e's/ //g'):/usr/lib:/lib
|
||||
|
||||
|
|
|
|||
|
|
@ -10,8 +10,6 @@ endif
|
|||
# (see http://sources.redhat.com/cygwin/faq/faq.html#SEC110)
|
||||
LIBS:=$(filter-out -lm -lc, $(LIBS))
|
||||
|
||||
AROPT = crs
|
||||
|
||||
override CPPFLAGS += -DWIN32_STACK_RLIMIT=$(WIN32_STACK_RLIMIT)
|
||||
|
||||
ifneq (,$(findstring backend,$(subdir)))
|
||||
|
|
|
|||
|
|
@ -1,5 +1,3 @@
|
|||
AROPT = crs
|
||||
|
||||
# env var name to use in place of LD_LIBRARY_PATH
|
||||
ld_library_path_var = DYLD_LIBRARY_PATH
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,3 @@
|
|||
AROPT = cr
|
||||
|
||||
export_dynamic = -Wl,-export-dynamic
|
||||
rpath = -Wl,-R'$(rpathdir)'
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,3 @@
|
|||
AROPT = crs
|
||||
|
||||
export_dynamic = -Wl,-E
|
||||
# Use --enable-new-dtags to generate DT_RUNPATH instead of DT_RPATH.
|
||||
# This allows LD_LIBRARY_PATH to still work when needed.
|
||||
|
|
|
|||
|
|
@ -1,5 +1,3 @@
|
|||
AROPT = cr
|
||||
|
||||
export_dynamic = -Wl,-E
|
||||
rpath = -Wl,-R'$(rpathdir)'
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,3 @@
|
|||
AROPT = cr
|
||||
|
||||
export_dynamic = -Wl,-E
|
||||
rpath = -Wl,-R'$(rpathdir)'
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,4 @@
|
|||
# src/makefiles/Makefile.solaris
|
||||
|
||||
AROPT = crs
|
||||
rpath = -Wl,-rpath,'$(rpathdir)'
|
||||
|
||||
ifeq ($(with_gnu_ld), yes)
|
||||
|
|
|
|||
|
|
@ -10,8 +10,6 @@ endif
|
|||
|
||||
override CPPFLAGS += -DWIN32_STACK_RLIMIT=$(WIN32_STACK_RLIMIT)
|
||||
|
||||
AROPT = crs
|
||||
|
||||
ifneq (,$(findstring backend,$(subdir)))
|
||||
ifeq (,$(findstring conversion_procs,$(subdir)))
|
||||
ifeq (,$(findstring libpqwalreceiver,$(subdir)))
|
||||
|
|
|
|||
Loading…
Reference in New Issue