3.2.3-2

valgrind-3.2.3-pkg-config.patch

@@ -0,0 +1,63 @@
+--- valgrind-3.2.3/configure.in.jj	2007-01-29 14:42:52.000000000 -0500
++++ valgrind-3.2.3/configure.in	2007-02-13 08:02:26.000000000 -0500
+@@ -251,6 +251,7 @@ AC_MSG_CHECKING([for a supported CPU/OS 
+ 
+ AC_SUBST(VG_PLATFORM_PRI)
+ AC_SUBST(VG_PLATFORM_SEC)
++AC_SUBST(VG_PLATFORM)
+ 
+ case "$VG_ARCH-$VG_OS" in
+      x86-linux)
+@@ -296,6 +297,7 @@ case "$VG_ARCH-$VG_OS" in
+         AC_MSG_ERROR([Valgrind is platform specific. Sorry. Please consider doing a port.])
+         ;;
+ esac
++VG_PLATFORM=`echo "$VG_PLATFORM_PRI" | LC_ALL=C tr A-Z_ a-z-`
+ 
+ # Set up VG_<platform>.  Either one or two of these become defined.
+ #
+--- valgrind-3.2.3/configure.jj	2007-01-29 14:45:30.000000000 -0500
++++ valgrind-3.2.3/configure	2007-02-13 08:04:33.000000000 -0500
+@@ -311,7 +311,7 @@ ac_includes_default="\
+ # include <unistd.h>
+ #endif"
+ 
+-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT VEX_DIR DISTCHECK_CONFIGURE_FLAGS LN_S CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE RANLIB ac_ct_RANLIB PERL GDB CCAS CCASFLAGS build build_cpu build_vendor build_os host host_cpu host_vendor host_os VG_ARCH VG_ARCH_ALL VALT_LOAD_ADDRESS VG_OS VG_PLATFORM_PRI VG_PLATFORM_SEC VG_X86_LINUX_TRUE VG_X86_LINUX_FALSE VG_AMD64_LINUX_TRUE VG_AMD64_LINUX_FALSE VG_PPC32_LINUX_TRUE VG_PPC32_LINUX_FALSE VG_PPC64_LINUX_TRUE VG_PPC64_LINUX_FALSE DEFAULT_SUPP EGREP FLAG_M32 FLAG_M64 FLAG_MMMX FLAG_MSSE PREFERRED_STACK_BOUNDARY FLAG_WDECL_AFTER_STMT LIBOBJS BUILD_MPIWRAP_TRUE BUILD_MPIWRAP_FALSE MPI_CC LTLIBOBJS'
++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT VEX_DIR DISTCHECK_CONFIGURE_FLAGS LN_S CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE RANLIB ac_ct_RANLIB PERL GDB CCAS CCASFLAGS build build_cpu build_vendor build_os host host_cpu host_vendor host_os VG_ARCH VG_ARCH_ALL VALT_LOAD_ADDRESS VG_OS VG_PLATFORM_PRI VG_PLATFORM_SEC VG_PLATFORM VG_X86_LINUX_TRUE VG_X86_LINUX_FALSE VG_AMD64_LINUX_TRUE VG_AMD64_LINUX_FALSE VG_PPC32_LINUX_TRUE VG_PPC32_LINUX_FALSE VG_PPC64_LINUX_TRUE VG_PPC64_LINUX_FALSE DEFAULT_SUPP EGREP FLAG_M32 FLAG_M64 FLAG_MMMX FLAG_MSSE PREFERRED_STACK_BOUNDARY FLAG_WDECL_AFTER_STMT LIBOBJS BUILD_MPIWRAP_TRUE BUILD_MPIWRAP_FALSE MPI_CC LTLIBOBJS'
+ ac_subst_files=''
+ 
+ # Initialize some variables set by options.
+@@ -4230,6 +4230,7 @@ echo "$as_me: error: Valgrind is platfor
+    { (exit 1); exit 1; }; }
+         ;;
+ esac
++VG_PLATFORM=`echo "$VG_PLATFORM_PRI" | LC_ALL=C tr A-Z_ a-z-`
+ 
+ # Set up VG_<platform>.  Either one or two of these become defined.
+ #
+@@ -7615,6 +7616,7 @@ s,@VALT_LOAD_ADDRESS@,$VALT_LOAD_ADDRESS
+ s,@VG_OS@,$VG_OS,;t t
+ s,@VG_PLATFORM_PRI@,$VG_PLATFORM_PRI,;t t
+ s,@VG_PLATFORM_SEC@,$VG_PLATFORM_SEC,;t t
++s,@VG_PLATFORM@,$VG_PLATFORM,;t t
+ s,@VG_X86_LINUX_TRUE@,$VG_X86_LINUX_TRUE,;t t
+ s,@VG_X86_LINUX_FALSE@,$VG_X86_LINUX_FALSE,;t t
+ s,@VG_AMD64_LINUX_TRUE@,$VG_AMD64_LINUX_TRUE,;t t
+--- valgrind-3.2.3/valgrind.pc.in.jj	2007-01-02 09:52:30.000000000 -0500
++++ valgrind-3.2.3/valgrind.pc.in	2007-02-13 08:04:57.000000000 -0500
+@@ -4,13 +4,13 @@ libdir=@libdir@
+ includedir=@includedir@/valgrind
+ arch=@VG_ARCH@
+ os=@VG_OS@
+-platform=@VG_PLATFORM_PRI@
++platform=@VG_PLATFORM@
+ valt_load_address=@VALT_LOAD_ADDRESS@
+ 
+ Name: Valgrind
+ Description: A dynamic binary instrumentation framework
+ Version: @VERSION@
+ Requires:
+-Libs: -L${libdir}/valgrind/@VG_PLATFORM_PRI@ -lcoregrind -lvex -lgcc
++Libs: -L${libdir}/valgrind/@VG_PLATFORM@ -lcoregrind -lvex -lgcc
+ Cflags: -I${includedir}
+ 

valgrind.spec

@@ -1,11 +1,12 @@
 Summary: Tool for finding memory management bugs in programs
 Name: valgrind
 Version: 3.2.3
-Release: 1
+Release: 2
 Epoch: 1
 Source0: http://www.valgrind.org/downloads/valgrind-%{version}.tar.bz2
 Patch1: valgrind-3.2.3-openat.patch
 Patch2: valgrind-3.2.3-cachegrind-improvements.patch
+Patch3: valgrind-3.2.3-pkg-config.patch
 License: GPL
 URL: http://www.valgrind.org/
 Group: Development/Debuggers
@@ -36,6 +37,7 @@ find/diagnose.
 %setup -q
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 %ifarch x86_64 ppc64
@@ -119,6 +121,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/valgrind*
 
 %changelog
+* Tue Feb 13 2007 Jakub Jelinek <jakub@redhat.com> 3.2.3-2
+- fix valgrind.pc again
+
 * Tue Feb 13 2007 Jakub Jelinek <jakub@redhat.com> 3.2.3-1
 - update to 3.2.3