packages: lvm2/lvm2.spec, lvm2/lvm2-wrapper.patch (NEW)=?UTF-8?Q?=20?=- fix uClibc build

baggins baggins at pld-linux.org
Sun Mar 4 10:58:56 CET 2012


Author: baggins                      Date: Sun Mar  4 09:58:56 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix uClibc build

---- Files affected:
packages/lvm2:
   lvm2.spec (1.184 -> 1.185) , lvm2-wrapper.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/lvm2/lvm2.spec
diff -u packages/lvm2/lvm2.spec:1.184 packages/lvm2/lvm2.spec:1.185
--- packages/lvm2/lvm2.spec:1.184	Sat Mar  3 16:46:51 2012
+++ packages/lvm2/lvm2.spec	Sun Mar  4 10:58:51 2012
@@ -55,6 +55,7 @@
 Patch3:		%{name}-clvmd_init.patch
 Patch4:		dl-dlsym.patch
 Patch5:		pldize_lvm2_monitor.patch
+Patch6:		%{name}-wrapper.patch
 URL:		http://sources.redhat.com/lvm2/
 BuildRequires:	autoconf >= 2.61
 BuildRequires:	automake
@@ -256,6 +257,7 @@
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 # do not force --export-symbol linker option for e.g. statically linked executables
 # -rdynamic compiler option drives linker in the right way.
@@ -276,6 +278,7 @@
 
 %configure \
 	ac_cv_lib_dl_dlopen=no \
+	%{?with_uClibc:ac_cv_func_siginterrupt=no} \
 	%{?debug:--enable-debug} \
 	--with-optimisation="%{rpmcflags} -Os" \
 	--enable-static_link \
@@ -484,6 +487,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.185  2012/03/04 09:58:51  baggins
+- fix uClibc build
+
 Revision 1.184  2012/03/03 15:46:51  baggins
 - 2.02.94
 - merge lvm2-systemd bits into respective packages

================================================================
Index: packages/lvm2/lvm2-wrapper.patch
diff -u /dev/null packages/lvm2/lvm2-wrapper.patch:1.1
--- /dev/null	Sun Mar  4 10:58:56 2012
+++ packages/lvm2/lvm2-wrapper.patch	Sun Mar  4 10:58:51 2012
@@ -0,0 +1,22 @@
+--- LVM2.2.02.94/lib/misc/lvm-wrappers.h~	2011-04-22 14:00:00.000000000 +0200
++++ LVM2.2.02.94/lib/misc/lvm-wrappers.h	2012-03-04 10:43:46.032807285 +0100
+@@ -33,7 +34,8 @@
+  */
+ int read_urandom(void *buf, size_t len);
+ 
+-#  ifndef HAVE_SIGINTERRUPT
++#ifndef HAVE_SIGINTERRUPT
++#include <signal.h>
+ #    define siginterrupt(sig, flag) \
+ 	do { \
+ 		int ret; \
+@@ -45,7 +47,7 @@
+ 			act.sa_flags |= SA_RESTART; \
+ 		ret = sigaction(sig, &act, NULL); \
+ 		return ret; \
+-	while (0)
+-#  endif
++	} while (0);
++#endif
+ 
+ #endif
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/lvm2/lvm2.spec?r1=1.184&r2=1.185&f=u



More information about the pld-cvs-commit mailing list