Accepting request 86123 from Base:System

- add libtool as buildrequire to make the spec file more reliable (forwarded request 86110 from coolo)

OBS-URL: https://build.opensuse.org/request/show/86123
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gettext-runtime?expand=0&rev=29

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+

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

gettext-runtime.changes

@@ -1,9 +1,30 @@
+-------------------------------------------------------------------
+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
 
 - 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
+
+- 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
 

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/
@@ -114,7 +115,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 +160,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}