From ec28e8a9273498e0aa3109f85b8d3113bb87a6bcda67a6937de7ab603db7168b Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Sun, 2 Oct 2011 12:22:35 +0000 Subject: [PATCH 1/3] osc copypac from project:Base:build:arm package:gettext-runtime revision:11 OBS-URL: https://build.opensuse.org/package/show/Base:System/gettext-runtime?expand=0&rev=49 --- gettext-runtime.changes | 10 +++++++--- gettext-runtime.spec | 10 ++++++---- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/gettext-runtime.changes b/gettext-runtime.changes index f359a8b..c266586 100644 --- a/gettext-runtime.changes +++ b/gettext-runtime.changes @@ -1,8 +1,12 @@ ------------------------------------------------------------------- -Sat Oct 1 02:00:30 UTC 2011 - crrodriguez@opensuse.org +Thu Sep 29 13:27:17 CEST 2011 - dmueller@suse.de -- Test suite hangs in qemu-arm due to bugs in the emulator - workaround this issue. +- fix build + +------------------------------------------------------------------- +Thu Sep 29 10:20:07 UTC 2011 - adrian@suse.de + +- disable openmp when qemu is used for building (like on arm) ------------------------------------------------------------------- Fri Jan 7 10:36:22 CET 2011 - meissner@suse.de diff --git a/gettext-runtime.spec b/gettext-runtime.spec index 799e2c4..b0d501a 100644 --- a/gettext-runtime.spec +++ b/gettext-runtime.spec @@ -114,7 +114,11 @@ autoreconf -fiv #sh autogen.sh export CFLAGS="%{optflags} -pipe -W -Wall -Dgcc_is_lint" export CXXFLAGS="$CFLAGS -Dgcc_is_lint" -%configure --enable-shared +%if 0%{?qemu_user_space_build:1} + OPTS="--disable-openmp" +%endif +%configure --enable-shared $OPTS + make %{?_smp_mflags} GMSGFMT=../src/msgfmt # use texinfo.tex supplied by the system (texinfo) # make -C gettext-tools/doc gettext.pdf @@ -155,18 +159,16 @@ echo ".so man3/dgettext.3" > dcgettext.3 # s390s fails this test, # Starting test_recursive_lock ...test-lock: pthread_mutex_lock.c:66: __pthread_mutex_lock: Assertion `mutex->__data.__owner == 0' failed. -%if ! 0%{?qemu_user_space_build} make check || { %ifarch s390x echo "got this during mbuild testing on s390x (on both times which make check ran):" echo "Starting test_recursive_lock ...test-lock: pthread_mutex_lock.c:66: __pthread_mutex_lock: Assertion mutex->__data.__owner == 0 failed." echo "s390x needs kernel/glibc/gcc fix, but let it continue bootstrap for now!" -%else +%else echo "make check failed, check it!" exit 5 %endif } -%endif %clean rm -rf %{buildroot} From 69412534b04c969f2a3ad4a8faa7c9259a172146b01d434ab4cd3a326aa16dc6 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Sun, 2 Oct 2011 12:24:56 +0000 Subject: [PATCH 2/3] - revert last change - it is not the testsuite that hangs but everything. The better workaround is to disable openmp - Test suite hangs in qemu-arm due to bugs in the emulator workaround this issue. OBS-URL: https://build.opensuse.org/package/show/Base:System/gettext-runtime?expand=0&rev=50 --- gettext-runtime.changes | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/gettext-runtime.changes b/gettext-runtime.changes index c266586..e4bb1cf 100644 --- a/gettext-runtime.changes +++ b/gettext-runtime.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Sun Oct 2 14:24:27 CEST 2011 - dmueller@suse.de + +- revert last change - it is not the testsuite that hangs + but everything. The better workaround is to disable openmp + +------------------------------------------------------------------- +Sat Oct 1 02:00:30 UTC 2011 - crrodriguez@opensuse.org + +- Test suite hangs in qemu-arm due to bugs in the emulator + workaround this issue. + ------------------------------------------------------------------- Thu Sep 29 13:27:17 CEST 2011 - dmueller@suse.de From d67eae419e99e234fe70a4df7354ed6a2d7fd4c1d5463b3c2c27b15941924f2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= Date: Sun, 2 Oct 2011 19:19:40 +0000 Subject: [PATCH 3/3] Accepting request 86110 from home:coolo:removelibtool - add libtool as buildrequire to make the spec file more reliable OBS-URL: https://build.opensuse.org/request/show/86110 OBS-URL: https://build.opensuse.org/package/show/Base:System/gettext-runtime?expand=0&rev=51 --- gettext-csharp.spec | 1 + gettext-java.spec | 1 + gettext-runtime.changes | 5 +++++ gettext-runtime.spec | 1 + 4 files changed, 8 insertions(+) diff --git a/gettext-csharp.spec b/gettext-csharp.spec index 5c5fcce..ddfb5f9 100644 --- a/gettext-csharp.spec +++ b/gettext-csharp.spec @@ -20,6 +20,7 @@ Name: gettext-csharp BuildRequires: fdupes mono-devel perl-libintl-perl tcl +BuildRequires: libtool Requires: mono Url: http://www.gnu.org/software/gettext/ License: LGPLv2.1+ diff --git a/gettext-java.spec b/gettext-java.spec index f024016..be5c51f 100644 --- a/gettext-java.spec +++ b/gettext-java.spec @@ -20,6 +20,7 @@ Name: gettext-java BuildRequires: fdupes gcc-c++ gcc-java perl-libintl-perl tcl +BuildRequires: libtool Url: http://www.gnu.org/software/gettext/ License: LGPLv2.1+ Group: Development/Tools/Other diff --git a/gettext-runtime.changes b/gettext-runtime.changes index e4bb1cf..2996f25 100644 --- a/gettext-runtime.changes +++ b/gettext-runtime.changes @@ -4,6 +4,11 @@ Sun Oct 2 14:24:27 CEST 2011 - dmueller@suse.de - revert last change - it is not the testsuite that hangs but everything. The better workaround is to disable openmp +------------------------------------------------------------------- +Sat Oct 1 05:39:12 UTC 2011 - coolo@suse.com + +- add libtool as buildrequire to make the spec file more reliable + ------------------------------------------------------------------- Sat Oct 1 02:00:30 UTC 2011 - crrodriguez@opensuse.org diff --git a/gettext-runtime.spec b/gettext-runtime.spec index b0d501a..f96a904 100644 --- a/gettext-runtime.spec +++ b/gettext-runtime.spec @@ -23,6 +23,7 @@ Name: gettext-runtime Version: 0.18.1.1 Release: 2 BuildRequires: gcc-c++ perl-libintl-perl tcl +BuildRequires: libtool # To get an updated linkdupes.sh (in case there are new dupes), temproarily enable: #BuildRequires: fdupes Url: http://www.gnu.org/software/gettext/