Skip to content

Commit d15108a

Browse files
authored
stop using ranlib (closes bpo-31625) (python#3815)
Instead, simply pass 's' to ar.
1 parent 90f1d98 commit d15108a

File tree

4 files changed

+4
-106
lines changed

4 files changed

+4
-106
lines changed

Makefile.pre.in

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ CXX= @CXX@
3838
MAINCC= @MAINCC@
3939
LINKCC= @LINKCC@
4040
AR= @AR@
41-
RANLIB= @RANLIB@
4241
READELF= @READELF@
4342
SOABI= @SOABI@
4443
LDVERSION= @LDVERSION@
@@ -577,16 +576,9 @@ sharedmods: $(BUILDPYTHON) pybuilddir.txt Modules/_math.o
577576

578577

579578
# Build static library
580-
# avoid long command lines, same as LIBRARY_OBJS
581579
$(LIBRARY): $(LIBRARY_OBJS)
582580
-rm -f $@
583-
$(AR) $(ARFLAGS) $@ Modules/getbuildinfo.o
584-
$(AR) $(ARFLAGS) $@ $(PARSER_OBJS)
585-
$(AR) $(ARFLAGS) $@ $(OBJECT_OBJS)
586-
$(AR) $(ARFLAGS) $@ $(PYTHON_OBJS) Python/frozen.o
587-
$(AR) $(ARFLAGS) $@ $(MODULE_OBJS)
588-
$(AR) $(ARFLAGS) $@ $(MODOBJS)
589-
$(RANLIB) $@
581+
$(AR) $(ARFLAGS) $@ $^
590582

591583
libpython$(LDVERSION).so: $(LIBRARY_OBJS)
592584
if test $(INSTSONAME) != $(LDLIBRARY); then \
@@ -1422,7 +1414,6 @@ libainstall: @DEF_MAKE_RULE@ python-config
14221414
$(INSTALL_DATA) $(LDLIBRARY) $(DESTDIR)$(LIBPL) ; \
14231415
else \
14241416
$(INSTALL_DATA) $(LIBRARY) $(DESTDIR)$(LIBPL)/$(LIBRARY) ; \
1425-
$(RANLIB) $(DESTDIR)$(LIBPL)/$(LIBRARY) ; \
14261417
fi; \
14271418
else \
14281419
echo Skip install of $(LIBRARY) - use make frameworkinstall; \
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Stop using ranlib on static libraries. Instead, we assume ar supports the 's' flag.

configure

Lines changed: 1 addition & 94 deletions
Original file line numberDiff line numberDiff line change
@@ -692,7 +692,6 @@ READELF
692692
ARFLAGS
693693
ac_ct_AR
694694
AR
695-
RANLIB
696695
GNULD
697696
LINKCC
698697
LDVERSION
@@ -5944,98 +5943,6 @@ fi
59445943
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $LDLIBRARY" >&5
59455944
$as_echo "$LDLIBRARY" >&6; }
59465945

5947-
if test -n "$ac_tool_prefix"; then
5948-
# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
5949-
set dummy ${ac_tool_prefix}ranlib; ac_word=$2
5950-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
5951-
$as_echo_n "checking for $ac_word... " >&6; }
5952-
if ${ac_cv_prog_RANLIB+:} false; then :
5953-
$as_echo_n "(cached) " >&6
5954-
else
5955-
if test -n "$RANLIB"; then
5956-
ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
5957-
else
5958-
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
5959-
for as_dir in $PATH
5960-
do
5961-
IFS=$as_save_IFS
5962-
test -z "$as_dir" && as_dir=.
5963-
for ac_exec_ext in '' $ac_executable_extensions; do
5964-
if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
5965-
ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
5966-
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
5967-
break 2
5968-
fi
5969-
done
5970-
done
5971-
IFS=$as_save_IFS
5972-
5973-
fi
5974-
fi
5975-
RANLIB=$ac_cv_prog_RANLIB
5976-
if test -n "$RANLIB"; then
5977-
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
5978-
$as_echo "$RANLIB" >&6; }
5979-
else
5980-
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
5981-
$as_echo "no" >&6; }
5982-
fi
5983-
5984-
5985-
fi
5986-
if test -z "$ac_cv_prog_RANLIB"; then
5987-
ac_ct_RANLIB=$RANLIB
5988-
# Extract the first word of "ranlib", so it can be a program name with args.
5989-
set dummy ranlib; ac_word=$2
5990-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
5991-
$as_echo_n "checking for $ac_word... " >&6; }
5992-
if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
5993-
$as_echo_n "(cached) " >&6
5994-
else
5995-
if test -n "$ac_ct_RANLIB"; then
5996-
ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
5997-
else
5998-
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
5999-
for as_dir in $PATH
6000-
do
6001-
IFS=$as_save_IFS
6002-
test -z "$as_dir" && as_dir=.
6003-
for ac_exec_ext in '' $ac_executable_extensions; do
6004-
if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
6005-
ac_cv_prog_ac_ct_RANLIB="ranlib"
6006-
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6007-
break 2
6008-
fi
6009-
done
6010-
done
6011-
IFS=$as_save_IFS
6012-
6013-
fi
6014-
fi
6015-
ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
6016-
if test -n "$ac_ct_RANLIB"; then
6017-
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
6018-
$as_echo "$ac_ct_RANLIB" >&6; }
6019-
else
6020-
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
6021-
$as_echo "no" >&6; }
6022-
fi
6023-
6024-
if test "x$ac_ct_RANLIB" = x; then
6025-
RANLIB=":"
6026-
else
6027-
case $cross_compiling:$ac_tool_warned in
6028-
yes:)
6029-
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
6030-
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
6031-
ac_tool_warned=yes ;;
6032-
esac
6033-
RANLIB=$ac_ct_RANLIB
6034-
fi
6035-
else
6036-
RANLIB="$ac_cv_prog_RANLIB"
6037-
fi
6038-
60395946

60405947
if test -n "$ac_tool_prefix"; then
60415948
for ac_prog in ar aal
@@ -6142,7 +6049,7 @@ fi
61426049

61436050
if test -z "$ARFLAGS"
61446051
then
6145-
ARFLAGS="rc"
6052+
ARFLAGS="rcs"
61466053
fi
61476054

61486055
if test -n "$ac_tool_prefix"; then

configure.ac

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1161,15 +1161,14 @@ fi
11611161

11621162
AC_MSG_RESULT($LDLIBRARY)
11631163

1164-
AC_PROG_RANLIB
11651164
AC_SUBST(AR)
11661165
AC_CHECK_TOOLS(AR, ar aal, ar)
11671166

11681167
# tweak ARFLAGS only if the user didn't set it on the command line
11691168
AC_SUBST(ARFLAGS)
11701169
if test -z "$ARFLAGS"
11711170
then
1172-
ARFLAGS="rc"
1171+
ARFLAGS="rcs"
11731172
fi
11741173

11751174
AC_CHECK_TOOLS([READELF], [readelf], [:])

0 commit comments

Comments
 (0)