From 459260ecf8b420b029601a664cdb21c185268ecb Mon Sep 17 00:00:00 2001 From: David Malcolm Date: Tue, 15 Oct 2013 20:33:55 +0000 Subject: Add --enable-host-shared configuration option / * configure.ac: Add --enable-host-shared * configure: Regenerate. gcc/ * Makefile.in (PICFLAG): New. (enable_host_shared): New. (INTERNAL_CFLAGS): Use PICFLAG. (LIBIBERTY): Use pic build of libiberty.a if configured with --enable-host-shared. * configure.ac: Add --enable-host-shared, setting up new PICFLAG variable. * configure: Regenerate. * doc/install.texi (--enable-shared): Add note contrasting it with... (--enable-host-shared): New option. libbacktrace/ * configure.ac: Add --enable-host-shared, setting up pre-existing PIC_FLAG variable within Makefile.am et al. * configure: Regenerate. libcpp/ * Makefile.in (PICFLAG): New. (ALL_CFLAGS): Add PICFLAG. (ALL_CXXFLAGS): Likewise. * configure.ac: Add --enable-host-shared, setting up new PICFLAG variable. * configure: Regenerate. libdecnumber/ * Makefile.in (PICFLAG): New. (ALL_CFLAGS): Add PICFLAG. * configure.ac: Add --enable-host-shared, setting up new PICFLAG variable. * configure: Regenerate. libiberty/ * configure.ac: If --enable-host-shared, use -fPIC. * configure: Regenerate. zlib/ * configure.ac: Add --enable-host-shared, setting up new PICFLAG variable. * Makefile.am: Add PICFLAG to libz_a_CFLAGS. * Makefile.in: Regenerate. * configure: Regenerate. From-SVN: r203632 --- zlib/ChangeLog.gcj | 8 ++++++++ zlib/Makefile.am | 2 +- zlib/Makefile.in | 3 ++- zlib/configure | 16 ++++++++++++++-- zlib/configure.ac | 6 ++++++ 5 files changed, 31 insertions(+), 4 deletions(-) (limited to 'zlib') diff --git a/zlib/ChangeLog.gcj b/zlib/ChangeLog.gcj index 6025369262a..f32e3028496 100644 --- a/zlib/ChangeLog.gcj +++ b/zlib/ChangeLog.gcj @@ -1,3 +1,11 @@ +2013-10-15 David Malcolm + + * configure.ac: Add --enable-host-shared, setting up new + PICFLAG variable. + * Makefile.am: Add PICFLAG to libz_a_CFLAGS. + * Makefile.in: Regenerate. + * configure: Regenerate. + 2013-09-20 Alan Modra * configure: Regenerate. diff --git a/zlib/Makefile.am b/zlib/Makefile.am index a9c42cb2cf5..82f709d9ec7 100644 --- a/zlib/Makefile.am +++ b/zlib/Makefile.am @@ -16,7 +16,7 @@ libzgcj_convenience_la_SOURCES = $(ZLIB_SOURCES) else toolexeclib_LIBRARIES = libz.a libz_a_SOURCES = $(ZLIB_SOURCES) -libz_a_CFLAGS = $(AM_CFLAGS) +libz_a_CFLAGS = $(AM_CFLAGS) $(PICFLAG) endif # Work around what appears to be a GNU make bug handling MAKEFLAGS diff --git a/zlib/Makefile.in b/zlib/Makefile.in index f5ef37a647f..3c8fd5978c8 100644 --- a/zlib/Makefile.in +++ b/zlib/Makefile.in @@ -177,6 +177,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PICFLAG = @PICFLAG@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -255,7 +256,7 @@ zconf.h.in zlib.h zutil.c zutil.h @TARGET_LIBRARY_TRUE@libzgcj_convenience_la_SOURCES = $(ZLIB_SOURCES) @TARGET_LIBRARY_FALSE@toolexeclib_LIBRARIES = libz.a @TARGET_LIBRARY_FALSE@libz_a_SOURCES = $(ZLIB_SOURCES) -@TARGET_LIBRARY_FALSE@libz_a_CFLAGS = $(AM_CFLAGS) +@TARGET_LIBRARY_FALSE@libz_a_CFLAGS = $(AM_CFLAGS) $(PICFLAG) # Work around what appears to be a GNU make bug handling MAKEFLAGS # values defined in terms of make variables, as is the case for CC and diff --git a/zlib/configure b/zlib/configure index c71984f4c67..32e33e7a6fa 100755 --- a/zlib/configure +++ b/zlib/configure @@ -602,6 +602,7 @@ ac_subst_vars='am__EXEEXT_FALSE am__EXEEXT_TRUE LTLIBOBJS LIBOBJS +PICFLAG TARGET_LIBRARY_FALSE TARGET_LIBRARY_TRUE toolexeclibdir @@ -736,6 +737,7 @@ with_pic enable_fast_install with_gnu_ld enable_libtool_lock +enable_host_shared ' ac_precious_vars='build_alias host_alias @@ -1370,6 +1372,7 @@ Optional Features: --enable-fast-install[=PKGS] optimize for fast installation [default=yes] --disable-libtool-lock avoid locking (might break parallel builds) + --enable-host-shared build host code as shared libraries Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -10400,7 +10403,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10403 "configure" +#line 10406 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10506,7 +10509,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10509 "configure" +#line 10512 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11202,6 +11205,15 @@ else multilib_arg= fi +# Check whether --enable-host-shared was given. +if test "${enable_host_shared+set}" = set; then : + enableval=$enable_host_shared; PICFLAG=-fPIC +else + PICFLAG= +fi + + + ac_config_files="$ac_config_files Makefile" cat >confcache <<\_ACEOF diff --git a/zlib/configure.ac b/zlib/configure.ac index 80253e4fc5d..fb8d943905e 100644 --- a/zlib/configure.ac +++ b/zlib/configure.ac @@ -119,5 +119,11 @@ else multilib_arg= fi +AC_ARG_ENABLE(host-shared, +[AS_HELP_STRING([--enable-host-shared], + [build host code as shared libraries])], +[PICFLAG=-fPIC], [PICFLAG=]) +AC_SUBST(PICFLAG) + AC_CONFIG_FILES([Makefile]) AC_OUTPUT -- cgit v1.2.3