re PR other/56780 (--disable-install-libiberty still installs libiberty.a)
PR other/56780 * libiberty/configure.ac: Move test for --enable-install-libiberty outside of the 'with_target_subdir' test so that it actually gets run. Add output messages to show the test result. * libiberty/configure: Regenerate. * libiberty/Makefile.in (install_to_libdir): Place the installation of the libiberty library in the same guard as that used for the headers to prevent it being installed unless requested via --enable-install-libiberty. From-SVN: r199570
This commit is contained in:
Matt Burgess
Ian Lance Taylor
parent
4bb1dd0fb8
commit
8c9fddf41d
|
|
@ -1,3 +1,15 @@
|
|||
2013-05-31 Matt Burgess <matthew@linuxfromscratch.org>
|
||||
|
||||
PR other/56780
|
||||
* libiberty/configure.ac: Move test for --enable-install-libiberty
|
||||
outside of the 'with_target_subdir' test so that it actually gets
|
||||
run. Add output messages to show the test result.
|
||||
* libiberty/configure: Regenerate.
|
||||
* libiberty/Makefile.in (install_to_libdir): Place the
|
||||
installation of the libiberty library in the same guard as that
|
||||
used for the headers to prevent it being installed unless
|
||||
requested via --enable-install-libiberty.
|
||||
|
||||
2013-05-06 David Edelsohn <dje.gcc@gmail.com>
|
||||
Peter Bergner <bergner@vnet.ibm.com>
|
||||
Segher Boessenkool <segher@kernel.crashing.org>
|
||||
|
|
|
|||
|
|
@ -355,19 +355,19 @@ install-strip: install
|
|||
# since it will be passed the multilib flags.
|
||||
MULTIOSDIR = `$(CC) $(CFLAGS) -print-multi-os-directory`
|
||||
install_to_libdir: all
|
||||
${mkinstalldirs} $(DESTDIR)$(libdir)/$(MULTIOSDIR)
|
||||
$(INSTALL_DATA) $(TARGETLIB) $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIB)n
|
||||
( cd $(DESTDIR)$(libdir)/$(MULTIOSDIR) ; chmod 644 $(TARGETLIB)n ;$(RANLIB) $(TARGETLIB)n )
|
||||
mv -f $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIB)n $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIB)
|
||||
if test -n "${target_header_dir}"; then \
|
||||
case "${target_header_dir}" in \
|
||||
/*) thd=${target_header_dir};; \
|
||||
*) thd=${includedir}/${target_header_dir};; \
|
||||
esac; \
|
||||
${mkinstalldirs} $(DESTDIR)$${thd}; \
|
||||
for h in ${INSTALLED_HEADERS}; do \
|
||||
${INSTALL_DATA} $$h $(DESTDIR)$${thd}; \
|
||||
done; \
|
||||
${mkinstalldirs} $(DESTDIR)$(libdir)/$(MULTIOSDIR); \
|
||||
$(INSTALL_DATA) $(TARGETLIB) $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIB)n; \
|
||||
( cd $(DESTDIR)$(libdir)/$(MULTIOSDIR) ; chmod 644 $(TARGETLIB)n ;$(RANLIB) $(TARGETLIB)n ); \
|
||||
mv -f $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIB)n $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIB); \
|
||||
case "${target_header_dir}" in \
|
||||
/*) thd=${target_header_dir};; \
|
||||
*) thd=${includedir}/${target_header_dir};; \
|
||||
esac; \
|
||||
${mkinstalldirs} $(DESTDIR)$${thd}; \
|
||||
for h in ${INSTALLED_HEADERS}; do \
|
||||
${INSTALL_DATA} $$h $(DESTDIR)$${thd}; \
|
||||
done; \
|
||||
fi
|
||||
@$(MULTIDO) $(FLAGS_TO_PASS) multi-do DO=install
|
||||
|
||||
|
|
|
|||
|
|
@ -675,8 +675,8 @@ with_cross_host
|
|||
with_newlib
|
||||
enable_maintainer_mode
|
||||
enable_multilib
|
||||
enable_largefile
|
||||
enable_install_libiberty
|
||||
enable_largefile
|
||||
'
|
||||
ac_precious_vars='build_alias
|
||||
host_alias
|
||||
|
|
@ -1303,8 +1303,8 @@ Optional Features:
|
|||
enable make rules and dependencies not useful
|
||||
(and sometimes confusing) to the casual installer
|
||||
--enable-multilib build many library versions (default)
|
||||
--enable-install-libiberty Install headers and library for end users
|
||||
--disable-largefile omit support for large files
|
||||
--enable-install-libiberty Install headers for end users
|
||||
|
||||
Optional Packages:
|
||||
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
|
||||
|
|
@ -2784,6 +2784,35 @@ if test $cross_compiling = no && test $multilib = yes \
|
|||
cross_compiling=maybe
|
||||
fi
|
||||
|
||||
# We may wish to install the target headers somewhere.
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to install libiberty headers and static library" >&5
|
||||
$as_echo_n "checking whether to install libiberty headers and static library... " >&6; }
|
||||
|
||||
# Check whether --enable-install-libiberty was given.
|
||||
if test "${enable_install_libiberty+set}" = set; then :
|
||||
enableval=$enable_install_libiberty; enable_install_libiberty=$enableval
|
||||
else
|
||||
enable_install_libiberty=no
|
||||
fi
|
||||
|
||||
# Option parsed, now set things appropriately.
|
||||
case x"$enable_install_libiberty" in
|
||||
xyes|x)
|
||||
target_header_dir=libiberty
|
||||
;;
|
||||
xno)
|
||||
target_header_dir=
|
||||
;;
|
||||
*)
|
||||
# This could be sanity-checked in various ways...
|
||||
target_header_dir="${enable_install_libiberty}"
|
||||
;;
|
||||
esac
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_install_libiberty" >&5
|
||||
$as_echo "$enable_install_libiberty" >&6; }
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: target_header_dir = $target_header_dir" >&5
|
||||
$as_echo "$as_me: target_header_dir = $target_header_dir" >&6;}
|
||||
|
||||
|
||||
ac_ext=c
|
||||
ac_cpp='$CPP $CPPFLAGS'
|
||||
|
|
@ -5761,29 +5790,6 @@ _ACEOF
|
|||
|
||||
esac
|
||||
|
||||
# We may wish to install the target headers somewhere.
|
||||
# Check whether --enable-install-libiberty was given.
|
||||
if test "${enable_install_libiberty+set}" = set; then :
|
||||
enableval=$enable_install_libiberty; enable_install_libiberty=$enableval
|
||||
else
|
||||
enable_install_libiberty=no
|
||||
fi
|
||||
|
||||
# Option parsed, now set things appropriately.
|
||||
case x"$enable_install_libiberty" in
|
||||
xyes|x)
|
||||
target_header_dir=libiberty
|
||||
;;
|
||||
xno)
|
||||
target_header_dir=
|
||||
;;
|
||||
*)
|
||||
# This could be sanity-checked in various ways...
|
||||
target_header_dir="${enable_install_libiberty}"
|
||||
;;
|
||||
esac
|
||||
|
||||
|
||||
else
|
||||
|
||||
# Not a target library, so we set things up to run the test suite.
|
||||
|
|
|
|||
|
|
@ -128,6 +128,31 @@ if test $cross_compiling = no && test $multilib = yes \
|
|||
cross_compiling=maybe
|
||||
fi
|
||||
|
||||
# We may wish to install the target headers somewhere.
|
||||
AC_MSG_CHECKING([whether to install libiberty headers and static library])
|
||||
dnl install-libiberty is disabled by default
|
||||
|
||||
AC_ARG_ENABLE(install-libiberty,
|
||||
[ --enable-install-libiberty Install headers and library for end users],
|
||||
enable_install_libiberty=$enableval,
|
||||
enable_install_libiberty=no)dnl
|
||||
|
||||
# Option parsed, now set things appropriately.
|
||||
case x"$enable_install_libiberty" in
|
||||
xyes|x)
|
||||
target_header_dir=libiberty
|
||||
;;
|
||||
xno)
|
||||
target_header_dir=
|
||||
;;
|
||||
*)
|
||||
# This could be sanity-checked in various ways...
|
||||
target_header_dir="${enable_install_libiberty}"
|
||||
;;
|
||||
esac
|
||||
AC_MSG_RESULT($enable_install_libiberty)
|
||||
AC_MSG_NOTICE([target_header_dir = $target_header_dir])
|
||||
|
||||
GCC_NO_EXECUTABLES
|
||||
AC_PROG_CC
|
||||
AC_SYS_LARGEFILE
|
||||
|
|
@ -492,27 +517,6 @@ if test -n "${with_target_subdir}"; then
|
|||
|
||||
esac
|
||||
|
||||
# We may wish to install the target headers somewhere.
|
||||
AC_ARG_ENABLE(install-libiberty,
|
||||
[ --enable-install-libiberty Install headers for end users],
|
||||
enable_install_libiberty=$enableval,
|
||||
enable_install_libiberty=no)dnl
|
||||
|
||||
# Option parsed, now set things appropriately.
|
||||
case x"$enable_install_libiberty" in
|
||||
xyes|x)
|
||||
target_header_dir=libiberty
|
||||
;;
|
||||
xno)
|
||||
target_header_dir=
|
||||
;;
|
||||
*)
|
||||
# This could be sanity-checked in various ways...
|
||||
target_header_dir="${enable_install_libiberty}"
|
||||
;;
|
||||
esac
|
||||
|
||||
|
||||
else
|
||||
|
||||
# Not a target library, so we set things up to run the test suite.
|
||||
|
|
|
|||
Loading…
Reference in New Issue