From: Bruno Haible <bruno@clisp.org>
Date: Mon, 29 Jan 2024 09:32:34 +0000 (+0100)
Subject: intl: Revert "Add special hack for GCC" from 2022-06-21.
X-Git-Tag: v0.23~280
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ae837135109bc3ed2d8a9414d76dd46f9c27f3a9;p=thirdparty%2Fgettext.git

intl: Revert "Add special hack for GCC" from 2022-06-21.

The added option --enable-host-shared has the same effect as the
libtool-provided option --with-pic, and gcc's Makefile.def actually
uses --with-pic, not --enable-host-shared.

* gettext-runtime/intl/configure.ac: Don't accept option --enable-host-shared.
Don't set PICFLAG.
* gettext-runtime/intl/Makefile.am (AM_CFLAGS): Remove the PICFLAG.
* gnulib-local/modules/gettext-runtime-intl-misc (Makefile.am): Remove the
PICFLAG from AM_CFLAGS.
---

diff --git a/gettext-runtime/intl/Makefile.am b/gettext-runtime/intl/Makefile.am
index 4080b1f8a..e7a8ec1b7 100644
--- a/gettext-runtime/intl/Makefile.am
+++ b/gettext-runtime/intl/Makefile.am
@@ -1,6 +1,6 @@
 ## Makefile for the gettext-runtime/intl and gettext-tools/intl subdirectories
 ## of GNU gettext.
-## Copyright (C) 1995-1998, 2000-2007, 2009-2023 Free Software Foundation, Inc.
+## Copyright (C) 1995-1998, 2000-2007, 2009-2024 Free Software Foundation, Inc.
 ##
 ## This program is free software: you can redistribute it and/or modify
 ## it under the terms of the GNU Lesser General Public License as published by
@@ -64,9 +64,6 @@ if WOE32DLL
 AM_LDFLAGS = -Wl,--export-all-symbols
 endif
 
-# Support building libintl.a with -fPIC (needed by GCC).
-AM_CFLAGS += @PICFLAG@
-
 
 # Library include file and code.
 
diff --git a/gettext-runtime/intl/configure.ac b/gettext-runtime/intl/configure.ac
index b68c4000e..640af52b4 100644
--- a/gettext-runtime/intl/configure.ac
+++ b/gettext-runtime/intl/configure.ac
@@ -1,5 +1,5 @@
 dnl Configuration for the gettext-runtime directory of GNU gettext
-dnl Copyright (C) 1995-2023 Free Software Foundation, Inc.
+dnl Copyright (C) 1995-2024 Free Software Foundation, Inc.
 dnl
 dnl This program is free software: you can redistribute it and/or modify
 dnl it under the terms of the GNU General Public License as published by
@@ -76,14 +76,6 @@ case "$host_os" in
 esac
 AM_CONDITIONAL([WINDOWS_NATIVE], [test $is_windows_native = yes])
 
-dnl Support building libintl.a with -fPIC (needed by GCC).
-dnl <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=100096>
-AC_ARG_ENABLE([host-shared],
-  [AS_HELP_STRING([[--enable-host-shared]], [special hack for GCC])],
-  [PICFLAG='-fPIC'],
-  [PICFLAG=])
-AC_SUBST([PICFLAG])
-
 dnl Checks for libraries.
 
 dnl These are the only lines required to internationalize the package.
diff --git a/gnulib-local/modules/gettext-runtime-intl-misc b/gnulib-local/modules/gettext-runtime-intl-misc
index 648889af8..b14e0924d 100644
--- a/gnulib-local/modules/gettext-runtime-intl-misc
+++ b/gnulib-local/modules/gettext-runtime-intl-misc
@@ -14,9 +14,6 @@ Makefile.am:
 # Enable more warning options in this directory.
 AM_CFLAGS += @WARN_CFLAGS@
 
-# Support building libintl.a with -fPIC (needed by GCC).
-AM_CFLAGS += @PICFLAG@
-
 Include:
 
 License: