Accepting request 224625 from devel:libraries:c_c++
- fix parallel build * added parallel-make.patch [bnc#866723] (private) OBS-URL: https://build.opensuse.org/request/show/224625 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libunistring?expand=0&rev=17
This commit is contained in:
commit
93bdbadd9e
27
libunistring-parallel-make.patch
Normal file
27
libunistring-parallel-make.patch
Normal file
@ -0,0 +1,27 @@
|
|||||||
|
Fix a parallel make race where cdefs.h uses the unused-parameter.h header file
|
||||||
|
but has no dependency listed. This can result in an empty cdefs.h file which
|
||||||
|
results in a build failure like:
|
||||||
|
|
||||||
|
| In file included from striconveh.c:30:0:
|
||||||
|
| unistr.h:193:48: error: expected ';', ',' or ')' before '_GL_UNUSED_PARAMETER'
|
||||||
|
| In file included from striconveh.c:30:0:
|
||||||
|
| unistr.h:263:54: error: expected ';', ',' or ')' before '_GL_UNUSED_PARAMETER'
|
||||||
|
|
||||||
|
Upstream-Status: Pending
|
||||||
|
|
||||||
|
RP 2012/4/12
|
||||||
|
|
||||||
|
Index: lib/Makefile.am
|
||||||
|
===================================================================
|
||||||
|
--- lib/Makefile.am 2012-04-12 07:45:41.450059820 +0000
|
||||||
|
+++ lib/Makefile.am 2012-04-12 07:48:45.434055559 +0000
|
||||||
|
@@ -157,7 +157,7 @@
|
||||||
|
|
||||||
|
# unistring/cdefs.h is not public, but is included by other header files.
|
||||||
|
nobase_nodist_include_HEADERS += unistring/cdefs.h
|
||||||
|
-unistring/cdefs.h : unistring/cdefs.in.h
|
||||||
|
+unistring/cdefs.h : unistring/cdefs.in.h $(UNUSED_PARAMETER_H)
|
||||||
|
@MKDIR_P@ unistring
|
||||||
|
rm -f $@-t $@
|
||||||
|
sed -e '/definition of _GL_UNUSED_PARAMETER/r $(UNUSED_PARAMETER_H)' \
|
||||||
|
|
@ -1,3 +1,9 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Mar 4 13:48:59 UTC 2014 - pgajdos@suse.com
|
||||||
|
|
||||||
|
- fix parallel build
|
||||||
|
* added parallel-make.patch [bnc#866723] (private)
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Wed Dec 18 19:56:18 UTC 2013 - uweigand@de.ibm.com
|
Wed Dec 18 19:56:18 UTC 2013 - uweigand@de.ibm.com
|
||||||
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# spec file for package libunistring
|
# spec file for package libunistring
|
||||||
#
|
#
|
||||||
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||||
#
|
#
|
||||||
# All modifications and additions to the file contributed by third parties
|
# All modifications and additions to the file contributed by third parties
|
||||||
# remain the property of their copyright owners, unless otherwise agreed
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
@ -26,9 +26,14 @@ Group: Development/Libraries/C and C++
|
|||||||
Url: http://www.gnu.org/software/libunistring/
|
Url: http://www.gnu.org/software/libunistring/
|
||||||
Source0: libunistring-%{version}.tar.bz2
|
Source0: libunistring-%{version}.tar.bz2
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
|
BuildRequires: autoconf
|
||||||
|
BuildRequires: automake
|
||||||
|
BuildRequires: libtool
|
||||||
|
|
||||||
# Fix imported gnulib long double math tests for little-endian PowerPC
|
# Fix imported gnulib long double math tests for little-endian PowerPC
|
||||||
Patch1: libunistring-gnulib-ppc64le.patch
|
Patch1: libunistring-gnulib-ppc64le.patch
|
||||||
|
# http://lists.openembedded.org/pipermail/openembedded-core/2012-April/059850.html
|
||||||
|
Patch2: libunistring-parallel-make.patch
|
||||||
|
|
||||||
%description
|
%description
|
||||||
This portable C library implements Unicode string types in three flavours:
|
This portable C library implements Unicode string types in three flavours:
|
||||||
@ -65,8 +70,10 @@ case folding and regular expressions).
|
|||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
%patch1 -p1
|
%patch1 -p1
|
||||||
|
%patch2
|
||||||
|
|
||||||
%build
|
%build
|
||||||
|
autoreconf -fi
|
||||||
%configure --disable-static --disable-rpath --docdir=%_docdir/%name
|
%configure --disable-static --disable-rpath --docdir=%_docdir/%name
|
||||||
make %{?_smp_mflags}
|
make %{?_smp_mflags}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user