forked from Imagelibrary/binutils-gdb
Move gnulib to top level
This patch moves the gdb/gnulib subdirectory to the top level. It adjusts the top-level build system to build gnulib when necessary, and changes gdb to use this. However, gdbserver still builds its own copy of gnulib, just from the new source location. A small hack was needed to ensure that gnulib is only built when gdb is enabled. The Makefile only provides an ordering -- the directory must be mentioned in configdirs to actually be compiled at all. Most of the patch is just a "git mv" of gnulib, though a few minor path adjustments were needed in some files there. Tested by the buildbot. ChangeLog 2019-06-14 Tom Tromey <tom@tromey.com> * MAINTAINERS: Add gnulib. * gnulib: New directory, move from gdb/gnulib. * configure.ac (host_libs): Add gnulib. * configure: Rebuild. * Makefile.def (host_modules, dependencies): Add gnulib. * Makefile.in: Rebuild. gdb/ChangeLog 2019-06-14 Tom Tromey <tom@tromey.com> * gnulib: Move directory to top-level. * configure.ac: Don't configure gnulib. * configure: Rebuild. * common/common-defs.h: Use new path to gnulib. * Makefile.in (GNULIB_BUILDDIR): Now ../gnulib. (GNULIB_H): Remove. (INCGNU): Look in new gnulib location. (HFILES_NO_SRCDIR): Remove gnulib files. (SUBDIR, REQUIRED_SUBDIRS): Remove gnulib. (generated_files): Remove GNULIB_H. ($(LIBGNU), all-lib): Remove targets. (distclean): Don't mention GNULIB_BUILDDIR. ($(GNULIB_BUILDDIR)/Makefile): Remove target. gdb/gdbserver/ChangeLog 2019-06-14 Tom Tromey <tom@tromey.com> * configure.ac: Use new path to gnulib. * configure: Rebuild. * Makefile.in (INCGNU, $(GNULIB_BUILDDIR)/Makefile): Use new path to gnulib. gnulib/ChangeLog 2019-06-14 Tom Tromey <tom@tromey.com> * update-gnulib.sh: Adjust paths. * Makefile.in: Adjust paths. * configure.ac: Adjust paths. Use ACX_LARGEFILE. * configure: Rebuild.
This commit is contained in:
Tom Tromey
123
gdb/configure
vendored
123
gdb/configure
vendored
@@ -757,7 +757,6 @@ MAKEINFO_EXTRA_FLAGS
|
||||
MAKEINFOFLAGS
|
||||
MAKEINFO
|
||||
PACKAGE
|
||||
GNULIB_STDINT_H
|
||||
CATOBJEXT
|
||||
GENCAT
|
||||
INSTOBJEXT
|
||||
@@ -6194,119 +6193,6 @@ else CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
|
||||
fi
|
||||
|
||||
|
||||
gnulib_extra_configure_args=
|
||||
# If large-file support is disabled, make sure gnulib does the same.
|
||||
if test "$enable_largefile" = no; then
|
||||
gnulib_extra_configure_args="$gnulib_extra_configure_args --disable-largefile"
|
||||
fi
|
||||
|
||||
# Configure gnulib. We need to build gnulib under some other
|
||||
# directory not "gnulib", to avoid the problem of both GDB and
|
||||
# GDBserver wanting to build it in the same directory, when building
|
||||
# in the source dir.
|
||||
|
||||
in_src="gnulib"
|
||||
in_build="build-gnulib"
|
||||
in_extra_args="$gnulib_extra_configure_args"
|
||||
|
||||
# Remove --cache-file, --srcdir, and --disable-option-checking arguments
|
||||
# so they do not pile up.
|
||||
ac_sub_configure_args=
|
||||
ac_prev=
|
||||
eval "set x $ac_configure_args"
|
||||
shift
|
||||
for ac_arg
|
||||
do
|
||||
if test -n "$ac_prev"; then
|
||||
ac_prev=
|
||||
continue
|
||||
fi
|
||||
case $ac_arg in
|
||||
-cache-file | --cache-file | --cache-fil | --cache-fi \
|
||||
| --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
|
||||
ac_prev=cache_file ;;
|
||||
-cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
|
||||
| --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* \
|
||||
| --c=*)
|
||||
;;
|
||||
--config-cache | -C)
|
||||
;;
|
||||
-srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
|
||||
ac_prev=srcdir ;;
|
||||
-srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
|
||||
;;
|
||||
-prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
|
||||
ac_prev=prefix ;;
|
||||
-prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
|
||||
;;
|
||||
--disable-option-checking)
|
||||
;;
|
||||
*)
|
||||
case $ac_arg in
|
||||
*\'*) ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
|
||||
esac
|
||||
as_fn_append ac_sub_configure_args " '$ac_arg'" ;;
|
||||
esac
|
||||
done
|
||||
|
||||
# Always prepend --prefix to ensure using the same prefix
|
||||
# in subdir configurations.
|
||||
ac_arg="--prefix=$prefix"
|
||||
case $ac_arg in
|
||||
*\'*) ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
|
||||
esac
|
||||
ac_sub_configure_args="'$ac_arg' $ac_sub_configure_args"
|
||||
|
||||
# Pass --silent
|
||||
if test "$silent" = yes; then
|
||||
ac_sub_configure_args="--silent $ac_sub_configure_args"
|
||||
fi
|
||||
|
||||
# Always prepend --disable-option-checking to silence warnings, since
|
||||
# different subdirs can have different --enable and --with options.
|
||||
ac_sub_configure_args="--disable-option-checking $ac_sub_configure_args"
|
||||
|
||||
ac_popdir=`pwd`
|
||||
ac_dir=$in_build
|
||||
|
||||
ac_msg="=== configuring in $ac_dir (`pwd`/$ac_dir)"
|
||||
$as_echo "$as_me:${as_lineno-$LINENO}: $ac_msg" >&5
|
||||
$as_echo "$ac_msg" >&6
|
||||
as_dir="$ac_dir"; as_fn_mkdir_p
|
||||
|
||||
case $srcdir in
|
||||
[\\/]* | ?:[\\/]* )
|
||||
ac_srcdir=$srcdir/$in_src ;;
|
||||
*) # Relative name.
|
||||
ac_srcdir=../$srcdir/$in_src ;;
|
||||
esac
|
||||
|
||||
cd "$ac_dir"
|
||||
|
||||
ac_sub_configure=$ac_srcdir/configure
|
||||
|
||||
# Make the cache file name correct relative to the subdirectory.
|
||||
case $cache_file in
|
||||
[\\/]* | ?:[\\/]* ) ac_sub_cache_file=$cache_file ;;
|
||||
*) # Relative name.
|
||||
ac_sub_cache_file=$ac_top_build_prefix$cache_file ;;
|
||||
esac
|
||||
|
||||
if test -n "$in_extra_args"; then
|
||||
# Add the extra args at the end.
|
||||
ac_sub_configure_args="$ac_sub_configure_args $in_extra_args"
|
||||
fi
|
||||
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&5
|
||||
$as_echo "$as_me: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&6;}
|
||||
# The eval makes quoting arguments work.
|
||||
eval "\$SHELL \"\$ac_sub_configure\" $ac_sub_configure_args \
|
||||
--cache-file=\"\$ac_sub_cache_file\" --srcdir=\"\$ac_srcdir\"" ||
|
||||
as_fn_error $? "$ac_sub_configure failed for $ac_dir" "$LINENO" 5
|
||||
|
||||
cd "$ac_popdir"
|
||||
|
||||
|
||||
|
||||
CONFIG_OBS=
|
||||
CONFIG_DEPS=
|
||||
@@ -6399,15 +6285,6 @@ if test x"$USE_NLS" = xyes; then
|
||||
CONFIG_UNINSTALL="$CONFIG_UNINSTALL uninstall-po"
|
||||
fi
|
||||
|
||||
GNULIB=build-gnulib/import
|
||||
|
||||
# For Makefile dependencies.
|
||||
GNULIB_STDINT_H=
|
||||
if test x"$STDINT_H" != x; then
|
||||
GNULIB_STDINT_H=$GNULIB/$STDINT_H
|
||||
fi
|
||||
|
||||
|
||||
PACKAGE=gdb
|
||||
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
|
||||
Reference in New Issue
Block a user