Commit 1db4dba8 authored by Sebastian Dröge's avatar Sebastian Dröge 🍵
Browse files

gettext: Update to 0.18.3.1 and switch to a tarball

This should also get rid of many build failures caused by autotools
timestamps problems.
parent fd05dc3f
......@@ -3,7 +3,10 @@ import shutil
class Recipe(recipe.Recipe):
name = 'gettext-m4'
version = '0.18.1.1+2012-01-26'
version = '0.18.3.1'
stype = SourceType.TARBALL
tarball_dirname = 'gettext-%(version)s'
url = 'http://ftp.gnu.org/pub/gnu/gettext/gettext-0.18.3.1.tar.gz'
# only libraries are LGPLv2+, tools are GPLv3+ and defined below
licenses = [License.LGPLv2Plus]
autoreconf = True
......@@ -43,10 +46,6 @@ class Recipe(recipe.Recipe):
'share/aclocal/xsize.m4',
]
def prepare(self):
self.remotes['origin'] = ('%s/%s.git' %
(self.config.git_root, 'gettext'))
def post_install(self):
m4dir = os.path.join(self.build_dir, 'gettext-runtime', 'm4')
for f in [x for x in os.listdir(m4dir) if x.endswith('.m4')]:
......
......@@ -3,12 +3,12 @@ from cerbero.utils import shell
class Recipe(recipe.Recipe):
name = 'gettext-tools'
version = '0.18.2'
version = '0.18.3.1'
licenses = [License.GPLv3]
srcdir = 'gettext-tools'
stype = SourceType.TARBALL
tarball_dirname = 'gettext-%(version)s'
url = 'http://ftp.gnu.org/pub/gnu/gettext/gettext-0.18.2.tar.gz'
url = 'http://ftp.gnu.org/pub/gnu/gettext/gettext-0.18.3.1.tar.gz'
platform_deps = {
Platform.DARWIN: ['libiconv', 'sed'],
Platform.WINDOWS: ['libiconv', 'mingw-runtime'],}
......
......@@ -3,10 +3,14 @@ import shutil
class Recipe(recipe.Recipe):
name = 'gettext'
version = '0.18.1.1+2012-01-26'
version = '0.18.3.1'
# only libraries are LGPLv2+, tools are GPLv3+ and defined below
licenses = [License.LGPLv2Plus]
stype = SourceType.TARBALL
url = 'http://ftp.gnu.org/pub/gnu/gettext/gettext-0.18.3.1.tar.gz'
srcdir = 'gettext-runtime'
patches = ['gettext/0001-Fix-linker-error-redefinition-of-vasprintf.patch',
'gettext/0002-intl-fix-build-targetting-10.6-with-the-10.7-or-10.8.patch']
platform_deps = {
Platform.DARWIN: ['libiconv'],
Platform.WINDOWS: ['mingw-runtime'],
......@@ -21,8 +25,5 @@ class Recipe(recipe.Recipe):
self.make_install = 'cd %s && make PACKAGE=gettext-tools install' % intl_path
if self.config.target_platform == Platform.WINDOWS:
self.configure_options += ' --enable-threads=win32'
elif self.config.target_platform == Platform.ANDROID:
self.autoreconf = True
self.autoreconf_sh = 'cd .. && ./autogen.sh --quick --skip-gnulib'
if self.config.target_platform != Platform.LINUX:
self.runtime_dep = True
From a76649dae62768d0af7017b3fc0ca5f891588c78 Mon Sep 17 00:00:00 2001
From: Andoni Morales Alastruey <ylatuya@gmail.com>
Date: Wed, 29 Feb 2012 10:44:43 +0100
Subject: [PATCH] Fix linker error: redefinition of vasprintf
This might not be the best patch, but it works for us
The link error was:
.libs/autosprintf.o:autosprintf.cc:(.text$vasprintf[_vasprintf]+0x0): multiple definition of `_vasprintf'
.libs/lib-asprintf.o:lib-asprintf.c:(.text+0x4621): first defined here
---
gettext-runtime/libasprintf/autosprintf.cc | 2 ++
1 file changed, 2 insertions(+)
diff --git a/gettext-runtime/libasprintf/autosprintf.cc b/gettext-runtime/libasprintf/autosprintf.cc
index ca318f7..2526210 100644
--- a/gettext-runtime/libasprintf/autosprintf.cc
+++ b/gettext-runtime/libasprintf/autosprintf.cc
@@ -21,8 +21,10 @@
This must come before <config.h> because <config.h> may include
<features.h>, and once <features.h> has been included, it's too late. */
#ifndef _GNU_SOURCE
+#ifndef _WIN32
# define _GNU_SOURCE 1
#endif
+#endif
/* Specification. */
#include "autosprintf.h"
--
1.8.4
From 30ce36dc44e069812bf389e561ec3765399c1457 Mon Sep 17 00:00:00 2001
From: Andoni Morales Alastruey <ylatuya@gmail.com>
Date: Tue, 7 May 2013 13:20:14 +0200
Subject: [PATCH] intl: fix build targetting 10.6 with the 10.7 or 10.8 SDK
10.7 and 10.8 defines unconditionally PTHREAD_RECURSIVE_MUTEX_INITIALIZER
and PTHREAD_ERRORCHECK_MUTEX_INITIALIZER which where not defined in 10.6.
Targetting 10.6 with -mmacosx-version-min=10.6 with the newer SDK leads
to an abort in nl_load_domain
references:
http://gcc.gnu.org/bugzilla/show_bug.cgi?id=51906
https://trac.adium.im/ticket/15996#comment:16
---
gettext-runtime/intl/lock.h | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/gettext-runtime/intl/lock.h b/gettext-runtime/intl/lock.h
index 5fcb984..658a7b4 100644
--- a/gettext-runtime/intl/lock.h
+++ b/gettext-runtime/intl/lock.h
@@ -89,6 +89,13 @@
# include <pthread.h>
+#ifdef __APPLE__
+#if MAC_OS_X_VERSION_MIN_REQUIRED <= MAC_OS_X_VERSION_10_6
+#undef PTHREAD_RECURSIVE_MUTEX_INITIALIZER
+#undef PTHREAD_ERRORCHECK_MUTEX_INITIALIZER
+#endif
+#endif
+
# ifdef __cplusplus
extern "C" {
# endif
--
1.8.4
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment