This commit is contained in:
OBS User unknown
Git OBS Bridge
parent
8211b33f55
commit
d40f9bc73f
254
glibc-2.6.diff
Normal file
254
glibc-2.6.diff
Normal file
@ -0,0 +1,254 @@
|
||||
--- configure.in
|
||||
+++ configure.in
|
||||
@@ -359,6 +359,16 @@
|
||||
],
|
||||
glibc="2.5")
|
||||
|
||||
+AC_EGREP_CPP([GLIBC_26], [
|
||||
+#include <features.h>
|
||||
+#ifdef __GNU_LIBRARY__
|
||||
+ #if (__GLIBC__ == 2 && __GLIBC_MINOR__ == 6)
|
||||
+ GLIBC_26
|
||||
+ #endif
|
||||
+#endif
|
||||
+],
|
||||
+glibc="2.6")
|
||||
+
|
||||
AC_MSG_CHECKING([the glibc version])
|
||||
|
||||
case "${glibc}" in
|
||||
@@ -386,9 +396,15 @@
|
||||
DEFAULT_SUPP="glibc-2.5.supp ${DEFAULT_SUPP}"
|
||||
;;
|
||||
|
||||
+ 2.6)
|
||||
+ AC_MSG_RESULT(2.5 family)
|
||||
+ AC_DEFINE([GLIBC_2_5], 1, [Define to 1 if you're using glibc 2.5.x])
|
||||
+ DEFAULT_SUPP="glibc-2.6.supp ${DEFAULT_SUPP}"
|
||||
+ ;;
|
||||
+
|
||||
*)
|
||||
AC_MSG_RESULT(unsupported version)
|
||||
- AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.5])
|
||||
+ AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.6])
|
||||
;;
|
||||
esac
|
||||
|
||||
--- glibc-2.6.supp
|
||||
+++ glibc-2.6.supp
|
||||
@@ -0,0 +1,215 @@
|
||||
+
|
||||
+##----------------------------------------------------------------------##
|
||||
+
|
||||
+# Errors to suppress by default with glibc 2.4.x
|
||||
+
|
||||
+# Format of this file is:
|
||||
+# {
|
||||
+# name_of_suppression
|
||||
+# tool_name:supp_kind
|
||||
+# (optional extra info for some suppression types)
|
||||
+# caller0 name, or /name/of/so/file.so
|
||||
+# caller1 name, or ditto
|
||||
+# (optionally: caller2 name)
|
||||
+# (optionally: caller3 name)
|
||||
+# }
|
||||
+#
|
||||
+# For Memcheck, the supp_kinds are:
|
||||
+#
|
||||
+# Param Value1 Value2 Value4 Value8 Value16 Jump
|
||||
+# Free Addr1 Addr2 Addr4 Addr8 Addr16
|
||||
+# Cond (previously known as Value0)
|
||||
+#
|
||||
+# and the optional extra info is:
|
||||
+# if Param: name of system call param
|
||||
+
|
||||
+{
|
||||
+ dl-hack1
|
||||
+ Memcheck:Cond
|
||||
+ fun:_dl_start
|
||||
+ fun:_start
|
||||
+}
|
||||
+
|
||||
+{
|
||||
+ dl-hack2
|
||||
+ Memcheck:Cond
|
||||
+ obj:/lib*/ld-2.5*.so
|
||||
+ obj:/lib*/ld-2.5*.so
|
||||
+ obj:/lib*/ld-2.5*.so
|
||||
+ obj:/lib*/ld-2.5*.so
|
||||
+}
|
||||
+
|
||||
+{
|
||||
+ dl-hack3
|
||||
+ Memcheck:Cond
|
||||
+ obj:/lib*/ld-2.5*so*
|
||||
+ obj:/lib*/ld-2.5*so*
|
||||
+ obj:/lib*/ld-2.5*so*
|
||||
+}
|
||||
+
|
||||
+##----------------------------------------------------------------------##
|
||||
+{
|
||||
+ glibc-2.5.x-on-SUSE-10.2-(PPC)-1
|
||||
+ Memcheck:Cond
|
||||
+ fun:_dl_start_final
|
||||
+ fun:_dl_start
|
||||
+ fun:_start
|
||||
+}
|
||||
+{
|
||||
+ glibc-2.5.x-on-SUSE-10.2-(PPC)-2a
|
||||
+ Memcheck:Cond
|
||||
+ fun:index
|
||||
+ obj:*ld-2.5.*.so
|
||||
+}
|
||||
+{
|
||||
+ glibc-2.5.x-on-SuSE-10.2-(PPC)-2b
|
||||
+ Memcheck:Addr4
|
||||
+ fun:index
|
||||
+ fun:expand_dynamic_string_token
|
||||
+}
|
||||
+{
|
||||
+ glibc-2.5.5-on-SuSE-10.2-(PPC)-2c
|
||||
+ Memcheck:Addr4
|
||||
+ fun:index
|
||||
+ obj:*ld-2.5.*.so
|
||||
+}
|
||||
+{
|
||||
+ glibc-2.3.5-on-SuSE-10.1-(PPC)-3
|
||||
+ Memcheck:Addr4
|
||||
+ fun:*wordcopy_fwd_dest_aligned*
|
||||
+ fun:mem*cpy
|
||||
+ obj:*lib*2.5.*.so
|
||||
+}
|
||||
+
|
||||
+##----------------------------------------------------------------------##
|
||||
+## Various structure padding things on SUSE 10.2
|
||||
+##
|
||||
+{
|
||||
+ X11-64bit-padding-1a
|
||||
+ Memcheck:Param
|
||||
+ write(buf)
|
||||
+ fun:__write_nocancel
|
||||
+ obj:/usr/lib*/libX11.so*
|
||||
+ obj:/usr/lib*/libX11.so*
|
||||
+ fun:X*
|
||||
+}
|
||||
+{
|
||||
+ X11-64bit-padding-1b
|
||||
+ Memcheck:Param
|
||||
+ write(buf)
|
||||
+ fun:__write_nocancel
|
||||
+ obj:/usr/lib*/libX11.so*
|
||||
+ obj:/usr/lib*/libX11.so*
|
||||
+ fun:_X*
|
||||
+}
|
||||
+{
|
||||
+ X11-64bit-padding-1c
|
||||
+ Memcheck:Param
|
||||
+ write(buf)
|
||||
+ fun:__write_nocancel
|
||||
+ obj:/usr/lib*/libX11.so*
|
||||
+ obj:/usr/lib*/libX11.so*
|
||||
+ obj:/usr/lib*/libX11.so*
|
||||
+}
|
||||
+{
|
||||
+ X11-64bit-padding-1d
|
||||
+ Memcheck:Param
|
||||
+ write(buf)
|
||||
+ fun:__write_nocancel
|
||||
+ obj:/usr/lib*/libICE.so*
|
||||
+ obj:/usr/lib*/libICE.so*
|
||||
+ obj:/usr/lib*/libICE.so*
|
||||
+}
|
||||
+{
|
||||
+ X11-64bit-padding-2a
|
||||
+ Memcheck:Param
|
||||
+ writev(vector[...])
|
||||
+ fun:do_writev
|
||||
+ obj:/usr/lib*/libX11.so*
|
||||
+ obj:/usr/lib*/libX11.so*
|
||||
+ obj:/usr/lib*/libX11.so*
|
||||
+}
|
||||
+{
|
||||
+ X11-64bit-padding-2b
|
||||
+ Memcheck:Param
|
||||
+ writev(vector[...])
|
||||
+ fun:do_writev
|
||||
+ fun:writev
|
||||
+ obj:/usr/lib*/libX11.so*
|
||||
+ obj:/usr/lib*/libX11.so*
|
||||
+}
|
||||
+
|
||||
+{
|
||||
+ glibc24-64bit-padding-1a
|
||||
+ Memcheck:Param
|
||||
+ socketcall.sendto(msg)
|
||||
+ fun:send
|
||||
+ fun:get_mapping
|
||||
+ fun:__nscd_get_map_ref
|
||||
+ fun:nscd*
|
||||
+}
|
||||
+{
|
||||
+ glibc24-64bit-padding-1b
|
||||
+ Memcheck:Param
|
||||
+ socketcall.sendto(msg)
|
||||
+ fun:__sendto_nocancel
|
||||
+ obj:/*libc-2.5.so
|
||||
+ obj:/*libc-2.5.so
|
||||
+ obj:/*libc-2.5.so
|
||||
+}
|
||||
+{
|
||||
+ glibc24-64bit-padding-1c
|
||||
+ Memcheck:Param
|
||||
+ socketcall.send(msg)
|
||||
+ fun:send
|
||||
+ fun:__nscd_get_map_ref
|
||||
+ fun:nscd_get*_r
|
||||
+ fun:*nscd*
|
||||
+ obj:/*libc-2.5.so
|
||||
+}
|
||||
+
|
||||
+
|
||||
+{
|
||||
+ X11-64bit-padding-3a
|
||||
+ Memcheck:Param
|
||||
+ write(buf)
|
||||
+ obj:/*libpthread-2.4.so*
|
||||
+ obj:/usr/lib*/libX11.so*
|
||||
+ obj:/usr/lib*/libX11.so*
|
||||
+ obj:/usr/lib*/libX11.so*
|
||||
+}
|
||||
+
|
||||
+{
|
||||
+ X11-64bit-padding-4a
|
||||
+ Memcheck:Param
|
||||
+ socketcall.sendto(msg)
|
||||
+ fun:send
|
||||
+ obj:/*libc-2.5.so
|
||||
+ obj:/*libc-2.5.so
|
||||
+ obj:/*libc-2.5.so
|
||||
+}
|
||||
+{
|
||||
+ X11-64bit-padding-4b
|
||||
+ Memcheck:Param
|
||||
+ socketcall.send(msg)
|
||||
+ fun:send
|
||||
+ obj:/*libc-2.5.so
|
||||
+ obj:/*libc-2.5.so
|
||||
+ obj:/*libc-2.5.so
|
||||
+}
|
||||
+
|
||||
+##----------------------------------------------------------------------##
|
||||
+# MontaVista Linux 4.0.1 on ppc32
|
||||
+{
|
||||
+ MVL-401-linuxthreads-pthread_create
|
||||
+ Memcheck:Param
|
||||
+ write(buf)
|
||||
+ fun:pthread_create
|
||||
+}
|
||||
+{
|
||||
+ MVL-401-linuxthreads-pthread_create
|
||||
+ Memcheck:Param
|
||||
+ write(buf)
|
||||
+ obj:/lib/libpthread-0.10.so
|
||||
+ fun:pthread_create
|
||||
+}
|
||||
@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed May 23 19:34:13 CEST 2007 - dmueller@suse.de
|
||||
|
||||
- build against glibc 2.6
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Apr 5 16:09:51 CEST 2007 - dmueller@suse.de
|
||||
|
||||
|
||||
@ -26,7 +26,7 @@ Group: Development/Tools/Debuggers
|
||||
Summary: Memory Management Debugger
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
Version: 3.2.3
|
||||
Release: 10
|
||||
Release: 22
|
||||
Source0: %{name}-%{version}.tar.bz2
|
||||
# svn di svn://svn.valgrind.org/valgrind/tags/VALGRIND_3_2_1 svn://svn.valgrind.org/valgrind/branches/VALGRIND_3_2_BRANCH > 3_2_BRANCH.diff
|
||||
# svn di svn://svn.valgrind.org/vex/tags/VEX_3_2_1 svn://svn.valgrind.org/vex/branches/VEX_3_2_BRANCH > VEX_3_2_BRANCH.diff
|
||||
@ -34,6 +34,7 @@ Patch3: valgrind-6012.patch
|
||||
Patch4: openat-handling.diff
|
||||
Patch5: omega_RC_01.patch
|
||||
Patch6: putenv-wrapper.diff
|
||||
Patch7: glibc-2.6.diff
|
||||
Provides: callgrind
|
||||
Obsoletes: callgrind
|
||||
ExclusiveArch: %ix86 x86_64 ppc ppc64
|
||||
@ -118,6 +119,7 @@ cd ..
|
||||
%endif
|
||||
%patch4
|
||||
%patch6
|
||||
%patch7
|
||||
|
||||
%build
|
||||
export CFLAGS="$RPM_OPT_FLAGS"
|
||||
@ -147,6 +149,8 @@ mv $RPM_BUILD_ROOT/usr/share/doc/valgrind $RPM_BUILD_ROOT/usr/share/doc/packages
|
||||
%_libdir/valgrind/*/*.a
|
||||
|
||||
%changelog
|
||||
* Wed May 23 2007 - dmueller@suse.de
|
||||
- build against glibc 2.6
|
||||
* Thu Apr 05 2007 - dmueller@suse.de
|
||||
- split into -devel subpackage
|
||||
* Fri Mar 30 2007 - dmueller@suse.de
|
||||
|
||||
Loading…
Reference in New Issue
Block a user