Commit 0d4133ed authored by Thomas Petazzoni's avatar Thomas Petazzoni Committed by Peter Korsgaard
Browse files

gettext: don't patch different the host and target build 



Until now, the gettext source code was being patched differently for
the host and the target build, which is going to be incompatible with
out-of-tree build. The difference is that the gettext tools could be
disabled in the target build, but are always enabled on the host
build.

Therefore, this commit switches the gettext package to using proper
patches against the relevant configure.ac and Makefile.am
files. gettext is now being autoreconfigured. Configuration options
are also passed for the host variant, in order to disable the build of
a large number of things we don't care about.

Finally, the two existing patches are renamed to include a number in
their filename.

Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent a94650c1

package/gettext/gettext-03-option-to-disable-tools.patch

0 → 100644
+42 −0
Original line number Diff line number Diff line 
Add a --disable-tools option



This patch adds a --disable-tools option that allows to disable the

compilation of the gettext tools, which may not be necessary on a

small embedded Linux system.



Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>



Index: b/configure.ac

===================================================================

--- a/configure.ac

+++ b/configure.ac

@@ -37,6 +37,10 @@

 

 dnl Checks for library functions.

 

+AC_ARG_ENABLE([tools], [--disable-tools  do not build tools],

+		       [enable_tools=$enableval], [enable_tools=yes])

+AM_CONDITIONAL([ENABLE_TOOLS], [test "$enable_tools" = "yes"])

+

 AC_CONFIG_SUBDIRS([gettext-runtime gettext-tools])

 

 dnl Ensure that "configure --help" lists all the command line options that

Index: b/Makefile.am

===================================================================

--- a/Makefile.am

+++ b/Makefile.am

@@ -20,7 +20,13 @@

 ACLOCAL = build-aux/fixaclocal @ACLOCAL@

 ACLOCAL_AMFLAGS = -I m4

 

-SUBDIRS = gnulib-local gettext-runtime gettext-tools

+if ENABLE_TOOLS

+TOOLS_SUBDIR = gettext-tools

+else

+TOOLS_SUBDIR =

+endif

+

+SUBDIRS = gnulib-local gettext-runtime $(TOOLS_SUBDIR)

 

 EXTRA_DIST = \

   version.sh DEPENDENCIES PACKAGING HACKING ChangeLog.0 autogen.sh \

package/gettext/gettext-04-remove-examples-tests.patch

0 → 100644
+20 −0
Original line number Diff line number Diff line 
Disable tests and examples



This patch disables the gettext-tools tests and examples, which are

generally not necessary.



Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>



Index: b/gettext-tools/Makefile.am

===================================================================

--- a/gettext-tools/Makefile.am

+++ b/gettext-tools/Makefile.am

@@ -20,7 +20,7 @@

 ACLOCAL = ../build-aux/fixaclocal @ACLOCAL@

 ACLOCAL_AMFLAGS = -I m4 -I ../gettext-runtime/m4 -I ../m4 -I gnulib-m4 -I libgrep/gnulib-m4 -I libgettextpo/gnulib-m4

 

-SUBDIRS = doc intl gnulib-lib libgrep src libgettextpo po projects styles misc man m4 tests gnulib-tests examples

+SUBDIRS = doc intl gnulib-lib libgrep src libgettextpo po projects styles misc man m4

 

 EXTRA_DIST = misc/DISCLAIM

 MOSTLYCLEANFILES = core *.stackdump

package/gettext/gettext-05-use-shell.patch

0 → 100644
+25 −0
Original line number Diff line number Diff line 
gettext-runtime: use @SHELL@ for the SHELL variable definition



The gettext-runtime/Makefile.in uses an hardcoded SHELL = /bin/sh

variable. This causes problems at build time, because libtool is then

called with the 'sh' shell, which does not support the += construct

that the libtool script is using.



Instead, this Makefile.in should be definining SHELL = @SHELL@, just

like all other Makefile.in of gettext.



Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>



Index: b/gettext-runtime/intl/Makefile.in

===================================================================

--- a/gettext-runtime/intl/Makefile.in

+++ b/gettext-runtime/intl/Makefile.in

@@ -17,7 +17,7 @@

 PACKAGE = @PACKAGE@

 VERSION = @VERSION@

 

-SHELL = /bin/sh

+SHELL = @SHELL@

 

 srcdir = @srcdir@

 top_srcdir = @top_srcdir@