Hello community, here is the log from the commit of package valgrind for openSUSE:Factory checked in at Mon Oct 3 09:25:18 CEST 2011.
-------- --- openSUSE:Factory/valgrind/valgrind.changes 2011-09-23 12:49:43.000000000 +0200 +++ valgrind/valgrind.changes 2011-10-02 17:51:09.000000000 +0200 @@ -1,0 +2,5 @@ +Sun Oct 2 17:50:41 CEST 2011 - [email protected] + +- enable build on %%arm + +------------------------------------------------------------------- @@ -5 +10 @@ -- require the right version of glibc at runtime +- require the right version of glibc at runtime (part of fix for bnc#700362) @@ -26 +31 @@ - 32bit code on 64bit archs + 32bit code on 64bit archs (bnc#705405) calling whatdependson for head-i586 New: ---- valgrind_r12002.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ valgrind.spec ++++++ --- /var/tmp/diff_new_pack.yM2OyH/_old 2011-10-03 09:25:14.000000000 +0200 +++ /var/tmp/diff_new_pack.yM2OyH/_new 2011-10-03 09:25:14.000000000 +0200 @@ -46,24 +46,24 @@ Patch15: vg_bug271042_r11699.patch Patch16: vg_bug271043_r11700.patch Patch17: vg_bug271043_r11765.patch - Patch41: vg_bug267630_r2127.patch Patch42: vg_bug270851_r2130.patch Patch43: vg_bug270856_r2136.patch Patch44: vg_bug270851_r2148.patch Patch45: valgrind-3.6.1-kernel3.patch Patch46: glibc-2.14.diff -# hack around stupid rebuilding on openSUSE Factory +Patch47: valgrind_r12002.diff # during building the major version of glibc is built into the suppression file -# so we do require the exact same major version to be installed -Requires: glibc = %(getconf GNU_LIBC_VERSION | cut -d' ' -f2) - +%define glibc_main_version %(getconf GNU_LIBC_VERSION | cut -d' ' -f2 | cut -d. -f1) +%define glibc_major_version %(getconf GNU_LIBC_VERSION | cut -d' ' -f2 | cut -d. -f2) +Requires: glibc >= %glibc_main_version.%glibc_major_version +Requires: glibc < %glibc_main_version.%{lua: print(rpm.expand("%glibc_major_version")+1)} %if %suse_version <= 1100 Provides: valgrind-devel = %version %endif Provides: callgrind = %version Obsoletes: callgrind < %version -ExclusiveArch: %ix86 x86_64 ppc ppc64 s390x +ExclusiveArch: %ix86 x86_64 ppc ppc64 s390x %arm %if %suse_version > 1100 %define building_docs 1 %else @@ -173,6 +173,7 @@ %patch44 %patch45 %patch46 +%patch47 %build export CFLAGS="$RPM_OPT_FLAGS" @@ -202,15 +203,30 @@ %defattr(-,root,root) /usr/bin/* %doc %_defaultdocdir/%name -%_libdir/valgrind %doc %_mandir/*/* +%dir %_libdir/valgrind +%ifarch x86_64 +%_libdir/valgrind/*-amd64-linux +%endif +%ifarch %ix86 x86_64 +%_libdir/valgrind/*-x86-linux +%endif +%ifarch ppc ppc64 +%_libdir/valgrind/*-ppc32-linux +%_libdir/valgrind/*-ppc64-linux +%endif +%ifarch s390 s390x +%_libdir/valgrind/*-s390x-linux +%endif +%_libdir/valgrind/*-linux.so +%_libdir/valgrind/*.supp %if %suse_version > 1100 %files devel %defattr(-,root,root) %endif - +%_libdir/valgrind/lib*.a /usr/include/valgrind /usr/%_lib/pkgconfig/valgrind.pc ++++++ valgrind_r12002.diff ++++++ ------------------------------------------------------------------------ r12002 | dirk | 2011-08-23 22:29:10 +0200 (Tue, 23 Aug 2011) | 2 lines Changed paths: M /trunk/glibc-2.X.supp.in fix the suppressions to also match libc-2.XX.y.so ------------------------------------------------------------------------ Index: glibc-2.X.supp.in =================================================================== --- glibc-2.X.supp.in (revision 12001) +++ glibc-2.X.supp.in (revision 12002) @@ -168,9 +168,9 @@ Memcheck:Param socketcall.sendto(msg) fun:__sendto_nocancel - obj:/*libc-@[email protected] - obj:/*libc-@[email protected] - obj:/*libc-@[email protected] + obj:/*libc-@GLIBC_VERSION@*.so + obj:/*libc-@GLIBC_VERSION@*.so + obj:/*libc-@GLIBC_VERSION@*.so } { glibc24-64bit-padding-1c @@ -180,7 +180,7 @@ fun:__nscd_get_map_ref fun:nscd_get*_r fun:*nscd* - obj:/*libc-@[email protected] + obj:/*libc-@GLIBC_VERSION@*.so } @@ -199,18 +199,18 @@ Memcheck:Param socketcall.sendto(msg) fun:send - obj:/*libc-@[email protected] - obj:/*libc-@[email protected] - obj:/*libc-@[email protected] + obj:/*libc-@GLIBC_VERSION@*.so + obj:/*libc-@GLIBC_VERSION@*.so + obj:/*libc-@GLIBC_VERSION@*.so } { X11-64bit-padding-4b Memcheck:Param socketcall.send(msg) fun:send - obj:/*libc-@[email protected] - obj:/*libc-@[email protected] - obj:/*libc-@[email protected] + obj:/*libc-@GLIBC_VERSION@*.so + obj:/*libc-@GLIBC_VERSION@*.so + obj:/*libc-@GLIBC_VERSION@*.so } ##----------------------------------------------------------------------## continue with "q"... Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
