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

Commit 04ca4ca

Browse files
committed
Remove use of lorder and tsort while building static libraries. There's
no evidence that any currently-supported platform needs this, and good reason to think that any platform that did need it couldn't use the static libraries anyway --- libpq, at least, has circular references. Removing the code shuts up tsort warnings about the circular references on some platforms.
1 parent 8f52496 commit 04ca4ca

9 files changed

+7
-60
lines changed

configure

+1-42
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,7 @@ ac_includes_default="\
314314
# include <unistd.h>
315315
#endif"
316316

317-
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS configure_args build build_cpu build_vendor build_os host host_cpu host_vendor host_os PORTNAME docdir enable_nls WANTED_LANGUAGES default_port enable_shared enable_rpath enable_debug CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP GCC TAS autodepend INCLUDES enable_thread_safety with_tcl with_perl with_python with_krb5 krb_srvtab with_pam with_ldap with_bonjour with_openssl with_zlib EGREP ELF_SYS LDFLAGS_SL AWK FLEX FLEXFLAGS LN_S LD with_gnu_ld ld_R_works RANLIB ac_ct_RANLIB LORDER TAR STRIP ac_ct_STRIP STRIP_STATIC_LIB STRIP_SHARED_LIB YACC YFLAGS PERL perl_archlibexp perl_privlibexp perl_useshrplib perl_embed_ldflags PYTHON python_version python_configdir python_includespec python_libdir python_libspec python_additional_libs HAVE_IPV6 LIBOBJS acx_pthread_config PTHREAD_CC PTHREAD_LIBS PTHREAD_CFLAGS HAVE_POSIX_SIGNALS MSGFMT MSGMERGE XGETTEXT localedir TCLSH TCL_CONFIG_SH TCL_INCLUDE_SPEC TCL_LIB_FILE TCL_LIBS TCL_LIB_SPEC TCL_SHARED_BUILD TCL_SHLIB_LD_LIBS NSGMLS JADE have_docbook DOCBOOKSTYLE COLLATEINDEX SGMLSPL vpath_build LTLIBOBJS'
317+
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS configure_args build build_cpu build_vendor build_os host host_cpu host_vendor host_os PORTNAME docdir enable_nls WANTED_LANGUAGES default_port enable_shared enable_rpath enable_debug CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP GCC TAS autodepend INCLUDES enable_thread_safety with_tcl with_perl with_python with_krb5 krb_srvtab with_pam with_ldap with_bonjour with_openssl with_zlib EGREP ELF_SYS LDFLAGS_SL AWK FLEX FLEXFLAGS LN_S LD with_gnu_ld ld_R_works RANLIB ac_ct_RANLIB TAR STRIP ac_ct_STRIP STRIP_STATIC_LIB STRIP_SHARED_LIB YACC YFLAGS PERL perl_archlibexp perl_privlibexp perl_useshrplib perl_embed_ldflags PYTHON python_version python_configdir python_includespec python_libdir python_libspec python_additional_libs HAVE_IPV6 LIBOBJS acx_pthread_config PTHREAD_CC PTHREAD_LIBS PTHREAD_CFLAGS HAVE_POSIX_SIGNALS MSGFMT MSGMERGE XGETTEXT localedir TCLSH TCL_CONFIG_SH TCL_INCLUDE_SPEC TCL_LIB_FILE TCL_LIBS TCL_LIB_SPEC TCL_SHARED_BUILD TCL_SHLIB_LD_LIBS NSGMLS JADE have_docbook DOCBOOKSTYLE COLLATEINDEX SGMLSPL vpath_build LTLIBOBJS'
318318
ac_subst_files=''
319319

320320
# Initialize some variables set by options.
@@ -4349,46 +4349,6 @@ else
43494349
RANLIB="$ac_cv_prog_RANLIB"
43504350
fi
43514351

4352-
for ac_prog in lorder
4353-
do
4354-
# Extract the first word of "$ac_prog", so it can be a program name with args.
4355-
set dummy $ac_prog; ac_word=$2
4356-
echo "$as_me:$LINENO: checking for $ac_word" >&5
4357-
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
4358-
if test "${ac_cv_prog_LORDER+set}" = set; then
4359-
echo $ECHO_N "(cached) $ECHO_C" >&6
4360-
else
4361-
if test -n "$LORDER"; then
4362-
ac_cv_prog_LORDER="$LORDER" # Let the user override the test.
4363-
else
4364-
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
4365-
for as_dir in $PATH
4366-
do
4367-
IFS=$as_save_IFS
4368-
test -z "$as_dir" && as_dir=.
4369-
for ac_exec_ext in '' $ac_executable_extensions; do
4370-
if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
4371-
ac_cv_prog_LORDER="$ac_prog"
4372-
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
4373-
break 2
4374-
fi
4375-
done
4376-
done
4377-
4378-
fi
4379-
fi
4380-
LORDER=$ac_cv_prog_LORDER
4381-
if test -n "$LORDER"; then
4382-
echo "$as_me:$LINENO: result: $LORDER" >&5
4383-
echo "${ECHO_T}$LORDER" >&6
4384-
else
4385-
echo "$as_me:$LINENO: result: no" >&5
4386-
echo "${ECHO_T}no" >&6
4387-
fi
4388-
4389-
test -n "$LORDER" && break
4390-
done
4391-
43924352
# Extract the first word of "tar", so it can be a program name with args.
43934353
set dummy tar; ac_word=$2
43944354
echo "$as_me:$LINENO: checking for $ac_word" >&5
@@ -23314,7 +23274,6 @@ s,@with_gnu_ld@,$with_gnu_ld,;t t
2331423274
s,@ld_R_works@,$ld_R_works,;t t
2331523275
s,@RANLIB@,$RANLIB,;t t
2331623276
s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
23317-
s,@LORDER@,$LORDER,;t t
2331823277
s,@TAR@,$TAR,;t t
2331923278
s,@STRIP@,$STRIP,;t t
2332023279
s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t

configure.in

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
dnl Process this file with autoconf to produce a configure script.
2-
dnl $PostgreSQL: pgsql/configure.in,v 1.456 2006/04/07 17:50:03 adunstan Exp $
2+
dnl $PostgreSQL: pgsql/configure.in,v 1.457 2006/04/19 16:32:08 tgl Exp $
33
dnl
44
dnl Developers, please strive to achieve this order:
55
dnl
@@ -559,7 +559,6 @@ case $host_os in sysv5*)
559559
AC_SUBST(ld_R_works)
560560
esac
561561
AC_PROG_RANLIB
562-
AC_CHECK_PROGS(LORDER, lorder)
563562
AC_PATH_PROG(TAR, tar)
564563
PGAC_CHECK_STRIP
565564

src/Makefile.global.in

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# -*-makefile-*-
2-
# $PostgreSQL: pgsql/src/Makefile.global.in,v 1.221 2006/02/12 07:29:36 momjian Exp $
2+
# $PostgreSQL: pgsql/src/Makefile.global.in,v 1.222 2006/04/19 16:32:08 tgl Exp $
33

44
#------------------------------------------------------------------------------
55
# All PostgreSQL makefiles include this file and use the variables it sets,
@@ -222,7 +222,6 @@ LDFLAGS_SL = @LDFLAGS_SL@
222222
LDREL = -r
223223
LDOUT = -o
224224
RANLIB = @RANLIB@
225-
LORDER = @LORDER@
226225
X = @EXEEXT@
227226

228227
# Perl

src/Makefile.shlib

+1-9
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# Copyright (c) 1998, Regents of the University of California
77
#
88
# IDENTIFICATION
9-
# $PostgreSQL: pgsql/src/Makefile.shlib,v 1.102 2006/01/05 03:01:34 momjian Exp $
9+
# $PostgreSQL: pgsql/src/Makefile.shlib,v 1.103 2006/04/19 16:32:08 tgl Exp $
1010
#
1111
#-------------------------------------------------------------------------
1212

@@ -266,17 +266,9 @@ all-static-lib: lib$(NAME).a
266266

267267
all-shared-lib: $(shlib)
268268

269-
ifndef LORDER
270-
MK_NO_LORDER := true
271-
endif
272-
273269
ifndef haslibarule
274270
lib$(NAME).a: $(OBJS)
275-
ifdef MK_NO_LORDER
276271
$(LINK.static) $@ $^
277-
else
278-
$(LINK.static) $@ `$(LORDER) $^ | tsort`
279-
endif
280272
$(RANLIB) $@
281273
endif #haslibarule
282274

src/makefiles/Makefile.aix

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
MAKE_EXPORTS= true
44

55
RANLIB= touch
6-
MK_NO_LORDER= true
76
AROPT = crs
87

98
DLSUFFIX = .so

src/makefiles/Makefile.freebsd

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ else
2121
$(LD) $(LDREL) $(LDOUT) $<.obj -x $<
2222
@echo building shared object $@
2323
@rm -f $@.pic
24-
@${AR} cq $@.pic `lorder $<.obj | tsort`
24+
@${AR} cq $@.pic $<.obj
2525
${RANLIB} $@.pic
2626
@rm -f $@
2727
$(LD) -x -Bshareable -Bforcearchive -o $@ $@.pic

src/makefiles/Makefile.irix

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
MK_NO_LORDER= true
21
AROPT = crs
32
rpath = -Wl,-rpath,'$(rpathdir)'
43

src/makefiles/Makefile.netbsd

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ else
2323
$(LD) $(LDREL) $(LDOUT) $<.obj -x $<
2424
@echo building shared object $@
2525
@rm -f $@.pic
26-
@${AR} cq $@.pic `lorder $<.obj | tsort`
26+
@${AR} cq $@.pic $<.obj
2727
${RANLIB} $@.pic
2828
@rm -f $@
2929
$(LD) -x -Bshareable -Bforcearchive -o $@ $@.pic

src/makefiles/Makefile.openbsd

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ else
2121
$(LD) $(LDREL) $(LDOUT) $<.obj -x $<
2222
@echo building shared object $@
2323
@rm -f $@.pic
24-
@${AR} cq $@.pic `lorder $<.obj | tsort`
24+
@${AR} cq $@.pic $<.obj
2525
${RANLIB} $@.pic
2626
@rm -f $@
2727
$(LD) -x -Bshareable -Bforcearchive -o $@ $@.pic

0 commit comments

Comments
 (0)