qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove relics of support for configuring in the source directory.

This commit is contained in:
Joseph Myers 2012-10-19 20:03:12 +00:00
parent d528cdcfde
commit 728e272aec
4 changed files with 15 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@ -1,5 +1,16 @@
2012-10-19 Joseph Myers <joseph@codesourcery.com> 2012-10-19 Joseph Myers <joseph@codesourcery.com>
* Makeconfig (ARCH): Remove all definitions.
(machine): Likewise.
[ARCH]: Remove conditional code.
[!objdir]: Give error.
[!objdir] (objpfx): Remove.
[!objdir] (common-objpfx): Likewise.
[!objdir] (common-objdir): Likewise.
* configure.in (config_makefile): Remove. Hardcode Makefile in
AC_CONFIG_FILES call.
* configure: Regenerated.
[BZ #13888] [BZ #13888]
* io/ftwtest-sh (tmp): Set to use the working directory, not /tmp * io/ftwtest-sh (tmp): Set to use the working directory, not /tmp
or TMPDIR. or TMPDIR.

35
Makeconfig
View File

@ -33,31 +33,6 @@ ifdef subdir
.. := ../ .. := ../
endif endif
# If config.make exists, the source directory was configured,
# so don't try to be clever and find another directory to build in.
ifneq (,$(wildcard $(..)config.make))
ARCH =
machine =
else # Not configured.
ifndef ARCH
ifdef machine
ARCH = $(machine)
endif # machine
endif # ARCH
endif # config.make
# Directory for object files and libc.a. If this is not defined, the
# object files live in the subdirectories where their sources live, and
# libc.a lives in the parent directory (this probably doesn't work any
# more).
ifdef ARCH
ifeq ($(filter /%,$(ARCH)),)
objdir := $(..)$(ARCH)
else
objdir = $(ARCH)
endif
endif
# $(common-objdir) is the place to put objects and # $(common-objdir) is the place to put objects and
# such that are not specific to a single subdir. # such that are not specific to a single subdir.
ifdef objdir ifdef objdir
@ -65,15 +40,7 @@ objpfx := $(patsubst %//,%/,$(objdir)/$(subdir)/)
common-objpfx = $(objdir)/ common-objpfx = $(objdir)/
common-objdir = $(objdir) common-objdir = $(objdir)
else else
objpfx := objdir must be defined by the build-directory Makefile.
ifdef ..
common-objpfx = $(..)
common-objdir = ..
else
# This is a kludge. make wizards might grok.
common-objpfx = sysdeps/../
common-objdir = .
endif
endif endif
# Root of the sysdeps tree. # Root of the sysdeps tree.

10
configure vendored
View File

@ -7529,18 +7529,12 @@ $as_echo "$libc_cv_pic_default" >&6; }
if test "`(cd $srcdir; pwd)`" = "`pwd`"; then
config_makefile=
else
config_makefile=Makefile
fi
VERSION=`sed -n -e 's/^#define VERSION "\([^"]*\)"/\1/p' < $srcdir/version.h` VERSION=`sed -n -e 's/^#define VERSION "\([^"]*\)"/\1/p' < $srcdir/version.h`
RELEASE=`sed -n -e 's/^#define RELEASE "\([^"]*\)"/\1/p' < $srcdir/version.h` RELEASE=`sed -n -e 's/^#define RELEASE "\([^"]*\)"/\1/p' < $srcdir/version.h`
ac_config_files="$ac_config_files config.make ${config_makefile}" ac_config_files="$ac_config_files config.make Makefile"
ac_config_commands="$ac_config_commands default" ac_config_commands="$ac_config_commands default"
@ -8259,7 +8253,7 @@ do
case $ac_config_target in case $ac_config_target in
"config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
"config.make") CONFIG_FILES="$CONFIG_FILES config.make" ;; "config.make") CONFIG_FILES="$CONFIG_FILES config.make" ;;
"${config_makefile}") CONFIG_FILES="$CONFIG_FILES ${config_makefile}" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"default") CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; "default") CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
*) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;

8
configure.in
View File

@ -2185,18 +2185,12 @@ AC_SUBST(DEFINES)
dnl See sysdeps/mach/configure.in for this variable. dnl See sysdeps/mach/configure.in for this variable.
AC_SUBST(mach_interface_list) AC_SUBST(mach_interface_list)
if test "`(cd $srcdir; pwd)`" = "`pwd`"; then
config_makefile=
else
config_makefile=Makefile
fi
VERSION=`sed -n -e 's/^#define VERSION "\([^"]*\)"/\1/p' < $srcdir/version.h` VERSION=`sed -n -e 's/^#define VERSION "\([^"]*\)"/\1/p' < $srcdir/version.h`
RELEASE=`sed -n -e 's/^#define RELEASE "\([^"]*\)"/\1/p' < $srcdir/version.h` RELEASE=`sed -n -e 's/^#define RELEASE "\([^"]*\)"/\1/p' < $srcdir/version.h`
AC_SUBST(VERSION) AC_SUBST(VERSION)
AC_SUBST(RELEASE) AC_SUBST(RELEASE)
AC_CONFIG_FILES([config.make ${config_makefile}]) AC_CONFIG_FILES([config.make Makefile])
AC_CONFIG_COMMANDS([default],[[ AC_CONFIG_COMMANDS([default],[[
case $CONFIG_FILES in *config.make*) case $CONFIG_FILES in *config.make*)
echo "$config_vars" >> config.make;; echo "$config_vars" >> config.make;;