From 4a1493f0603262a7dc1114d9827353e9810e63dc Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Fri, 16 Apr 2021 18:32:27 +0200 Subject: [PATCH] intl: Add --enable-host-shared support [PR100096] As mentioned in the PR, building gcc with jit enabled and --enable-host-shared doesn't work on NetBSD/i?86, as libgccjit.so.0 has text relocations. The r0-125846-g459260ecf8b420b029601a664cdb21c185268ecb changes added --enable-host-shared support to various libraries, but didn't add it to intl/ subdirectory; on Linux it isn't really needed, because all: all-no all-no: #nothing but on other OSes intl/libintl.a is built. The following patch makes sure it is built with -fPIC when --enable-host-shared is used. 2021-04-16 Jakub Jelinek PR jit/100096 * configure.ac: Add --enable-host-shared support. * Makefile.in: Update copyright. Add @PICFLAG@ to CFLAGS. * configure: Regenerated. --- intl/Makefile.in | 4 ++-- intl/configure | 12 ++++++++++++ intl/configure.ac | 6 ++++++ 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/intl/Makefile.in b/intl/Makefile.in index 356c8ab9b65..ec8c648b7a9 100644 --- a/intl/Makefile.in +++ b/intl/Makefile.in @@ -1,5 +1,5 @@ # Makefile for directory with message catalog handling library of GNU gettext -# Copyright (C) 1995-1998, 2000-2003 Free Software Foundation, Inc. +# Copyright (C) 1995-2021 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify it # under the terms of the GNU Library General Public License as published @@ -45,7 +45,7 @@ RANLIB = @RANLIB@ YACC = @INTLBISON@ -y -d YFLAGS = --name-prefix=__gettext CPPFLAGS = @CPPFLAGS@ -CFLAGS = @CFLAGS@ +CFLAGS = @CFLAGS@ @PICFLAG@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ DEFS = -DHAVE_CONFIG_H diff --git a/intl/configure b/intl/configure index d69767b7d21..1e100395369 100755 --- a/intl/configure +++ b/intl/configure @@ -622,6 +622,7 @@ ac_unique_file="gettext.c" ac_header_list= ac_subst_vars='LTLIBOBJS LIBOBJS +PICFLAG BISON3_NO BISON3_YES INCINTL @@ -726,6 +727,7 @@ with_included_gettext with_libintl_prefix with_libintl_type enable_maintainer_mode +enable_host_shared ' ac_precious_vars='build_alias host_alias @@ -1350,6 +1352,7 @@ Optional Features: --disable-nls do not use Native Language Support --disable-rpath do not hardcode runtime library paths --enable-maintainer-mode enable rules only needed by maintainers + --enable-host-shared build host code as shared libraries Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -6815,6 +6818,15 @@ 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 config.intl" cat >confcache <<\_ACEOF diff --git a/intl/configure.ac b/intl/configure.ac index 6363e55e68a..72b145958cf 100644 --- a/intl/configure.ac +++ b/intl/configure.ac @@ -69,5 +69,11 @@ fi AC_SUBST(BISON3_YES) AC_SUBST(BISON3_NO) +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 config.intl) AC_OUTPUT