Ticket #3629: 0001-Ticket-3629-configure.ac-drop-bundled-gettext.patch

File 0001-Ticket-3629-configure.ac-drop-bundled-gettext.patch, 3.5 KB (added by slyfox, 5 years ago)

0001-Ticket-3629-configure.ac-drop-bundled-gettext.patch

  • .gitignore 

    From 8a1339e38380c2cdb5b848e2746422064b0e55bf Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyfox@gentoo.org>
Date: Wed, 11 Sep 2019 22:58:18 +0100
Subject: [PATCH] Ticket #3629: configure.ac: drop bundled gettext

Bundled libintl did not support linking to internal static
libraries (libmc in our case): directly specified static
libraries are not pulled by libtool and are not usable for
dynamic libraries as PIC-related flags are not passed for
compilation.

This renders bundled libintl library unusable.

The change drops libintl bundling support and always relies
on external libintl (or falls back to disabled NLS).

On a related note gettext-0.20 drops support for bundling
or libintl and this change will ease migration to newer version.

The change is tested on x86_64-gentoo-linux-musl: mc builds
and links all tests successfully. A few tests fail for lack
of NLS support.

Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
---
 .gitignore            | 1 -
 Makefile.am           | 2 +-
 configure.ac          | 3 +--
 doc/doxygen.cfg       | 2 +-
 lib/Makefile.am       | 2 +-
 m4.include/mc-i18n.m4 | 5 -----
 6 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/.gitignore b/.gitignore
index 488ed421f..67f81ead2 100644
    a b config.sub 
    2020configure 
    2121configure.mc 
    2222gettext.m4 
    23 intl 
    2423install-sh 
    2524m4 
    2625mc.qpg 

  • Makefile.am 

    diff --git a/Makefile.am b/Makefile.am
index ac05a83ea..f86f6ed38 100644
    a b  
    11## Process this file with automake to create Makefile.in. 
    22AUTOMAKE_OPTIONS = 1.5 
    33 
    4 SUBDIRS = intl po lib src doc contrib misc 
     4SUBDIRS = po lib src doc contrib misc 
    55 
    66if HAVE_TESTS 
    77    SUBDIRS += tests 

  • configure.ac 

    diff --git a/configure.ac b/configure.ac
index f516048a6..79b63b39f 100644
    a b dnl ############################################################################ 
    272272dnl Internationalization 
    273273dnl ############################################################################ 
    274274 
    275 AM_GNU_GETTEXT([no-libtool], [need-ngettext]) 
     275AM_GNU_GETTEXT([external], [need-ngettext]) 
    276276AM_GNU_GETTEXT_VERSION([0.18.1]) 
    277277 
    278278mc_I18N 
    … … doc/hlp/pl/Makefile 
    675675doc/hlp/ru/Makefile 
    676676doc/hlp/sr/Makefile 
    677677 
    678 intl/Makefile 
    679678po/Makefile.in 
    680679]) 
    681680 

  • doc/doxygen.cfg 

    diff --git a/doc/doxygen.cfg b/doc/doxygen.cfg
index 07bc973ae..1118062f6 100644
    a b FILE_PATTERNS = *.c \ 
    9191RECURSIVE              = YES 
    9292EXCLUDE                = 
    9393EXCLUDE_SYMLINKS       = NO 
    94 EXCLUDE_PATTERNS       = */intl/* */tests/* */.git/* 
     94EXCLUDE_PATTERNS       = */tests/* */.git/* 
    9595EXCLUDE_SYMBOLS        = 
    9696EXAMPLE_PATH           = $(SRCDIR) 
    9797EXAMPLE_PATTERNS       = 

  • lib/Makefile.am 

    diff --git a/lib/Makefile.am b/lib/Makefile.am
index c448e2ddb..69c47601f 100644
    a b else 
    7474    libmc_la_LIBADD += $(GLIB_LIBS) 
    7575endif 
    7676 
    77 libmc_la_LIBADD += $(PCRE_LIBS) $(LIBICONV) $(LIBINTL) 
     77libmc_la_LIBADD += $(PCRE_LIBS) $(LIBICONV) 

  • m4.include/mc-i18n.m4 

    diff --git a/m4.include/mc-i18n.m4 b/m4.include/mc-i18n.m4
index 724ca5d26..8f1474139 100644
    a b dnl @license GPL 
    88dnl @copyright Free Software Foundation, Inc. 
    99 
    1010AC_DEFUN([mc_I18N],[ 
    11  
    12     if test "x$USE_INCLUDED_LIBINTL" = xyes; then 
    13         CPPFLAGS="$CPPFLAGS -I\$(top_builddir)/intl -I\$(top_srcdir)/intl" 
    14     fi 
    15  
    1611    dnl User visible support for charset conversion. 
    1712    AC_ARG_ENABLE([charset], 
    1813        AS_HELP_STRING([--enable-charset], [Support for charset selection and conversion @<:@yes@:>@]))