Skip to content
Snippets Groups Projects
Commit 3d02e1fa authored by Xavier Claessens's avatar Xavier Claessens
Browse files

TMP

parent a4ddf455
No related branches found
No related tags found
No related merge requests found
......@@ -34,7 +34,7 @@ class WindowsBootstrapper (BootstrapperBase):
"$git config core.autocrlf false")
if self.config.platform == Platform.WINDOWS:
for package in ['mingw32-gcc', 'mingw32-gcc-g++', 'mingw32-gendef']
for package in ['mingw32-gcc', 'mingw32-gcc-g++', 'mingw32-gendef']:
shell.call('mingw-get install ' + package)
......
......@@ -15,7 +15,8 @@ class Recipe(recipe.Recipe):
configure_options = ' --disable-java --disable-csharp --disable-native-java --without-csv'
patches = ['../gettext/0001-Fix-linker-error-redefinition-of-vasprintf.patch',
'../gettext/0001-Undefine-__USE_MINGW_ANSI_STDIO-as-otherwise-stdio.h.patch',
'../gettext/0001-Fix-build-invalid-instruction-on-macOS-10.13.patch' ]
'../gettext/0001-Fix-build-invalid-instruction-on-macOS-10.13.patch',
'../gettext/0001-gnulib-fix-underscore-condition.patch' ]
def prepare(self):
if self.config.target_platform == Platform.WINDOWS:
......
From ad19c8706a52cef674d4afaf02a25dbb2872a510 Mon Sep 17 00:00:00 2001
From: Xavier Claessens <xavier.claessens@collabora.com>
Date: Thu, 15 Mar 2018 15:49:02 -0400
Subject: [PATCH] gnulib: fix underscore condition
---
gettext-tools/gnulib-m4/asm-underscore.m4 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gettext-tools/gnulib-m4/asm-underscore.m4 b/gettext-tools/gnulib-m4/asm-underscore.m4
index 547dd62..feca18d 100644
--- a/gettext-tools/gnulib-m4/asm-underscore.m4
+++ b/gettext-tools/gnulib-m4/asm-underscore.m4
@@ -29,7 +29,7 @@ int foo(void) { return 0; }
EOF
# Look for the assembly language name in the .s file.
AC_TRY_COMMAND(${CC-cc} $CFLAGS $CPPFLAGS $gl_c_asm_opt conftest.c) >/dev/null 2>&1
- if LC_ALL=C grep -E '(^|[^a-zA-Z0-9_])_foo([^a-zA-Z0-9_]|$)' conftest.$gl_asmext >/dev/null; then
+ if LC_ALL=C grep -E '(^|[[^a-zA-Z0-9_]])_foo([[^a-zA-Z0-9_]]|$)' conftest.$gl_asmext >/dev/null; then
gl_cv_prog_as_underscore=yes
else
gl_cv_prog_as_underscore=no
--
2.14.1
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment