[prev in list] [next in list] [prev in thread] [next in thread] 

List:       fink-commits
Subject:    [cvs] dists/10.4/unstable/main/finkinfo/devel valgrind.patch, NONE,
From:       Daniel Johnson <danielj7 () users ! sourceforge ! net>
Date:       2009-05-29 16:04:31
Message-ID: E1MA4ZM-0003Fy-0E () fdv4jf1 ! ch3 ! sourceforge ! com
[Download RAW message or body]

Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/devel
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv12253

Modified Files:
	valgrind.info 
Added Files:
	valgrind.patch 
Log Message:
New upstream from svn. Now with -64bit variant and support for x86_64 arch.

Index: valgrind.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/devel/valgrind.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- valgrind.info	20 Apr 2009 22:40:24 -0000	1.4
+++ valgrind.info	29 May 2009 16:04:29 -0000	1.5
@@ -1,6 +1,8 @@
-Package: valgrind
+Info2: <<
+Package: valgrind%type_pkg[-64bit]
 Version: 3.5.0
-Revision: 0.9576.1
+Revision: 0.10167.1
+Type: -64bit (boolean)
 Description: Debugging and profiling tool
 DescDetail: <<
 	Valgrind is an award-winning instrumentation framework for building
@@ -14,17 +16,33 @@
 	a heap profiler. It also includes one experimental tool, which detects
 	out of bounds reads and writes of stack, global and heap arrays.
 <<
+DescUsage: <<
+	For Architecture i386, valgrind is 32-bit only, and valgrind-64bit is both
+	32 and 64-bit. On Architecture x86_64, valgrind is always both 32 and 64.
+<<
 DescPackaging: <<
-	Based on revision 9576 from svn://svn.valgrind.org/valgrind/branches/DARWIN
+	Based on revision 10167 from svn://svn.valgrind.org/valgrind/trunk
 	This is an experimental version and not all features are working on OS X yet.
+	
+	Patched configure.in because it forgets to define VGCONF_ARCH_SEC on x86_64.
 <<
-Architecture: i386
+Architecture: ( %type_raw[-64bit] = -64bit ) i386, ( %type_raw[-64bit] = . ) i386, ( \
%type_raw[-64bit] = . ) x86_64  Distribution: 10.5
-Source: http://homepage.mac.com/danielj7/%n-%v.9576.tar.bz2
-Source-MD5: 373c588512bf3e9dee9d7c2b5838f99b
-BuildDepends: sed, autoconf, automake1.10, fink (>= 0.28)
-ConfigureParams: --disable-dependency-tracking
+Source: http://homepage.mac.com/danielj7/%{ni}-%v.10167.tar.bz2
+Source-MD5: f2965de1860ab2c9fe03860ecf938b5b
+SourceDirectory: %{ni}
+Depends: ( %type_raw[-64bit] = -64bit ) 64bit-cpu
+BuildDepends: sed, autoconf, automake1.11, fink (>= 0.28)
+Conflicts: valgrind, valgrind-64bit
+Replaces: valgrind, valgrind-64bit
+PatchFile: %{ni}.patch
+PatchFile-MD5: 3aadc002853b8d52457a7f92f4cc1786
+ConfigureParams: --disable-dependency-tracking ( %type_raw[-64bit] = -64bit ) \
--build=amd64-darwin ( %m = x86_64 ) --build=amd64-darwin  CompileScript: <<
+	#!/bin/bash -ev
+	# We have to avoid fink's compiler_wrapper on x86_64 or we get build errors
+	# since we have to build both 32 and 64 bit code.
+	export PATH="%p/bin:%p/sbin:/usr/bin:/usr/sbin:/bin:/sbin"
 	./autogen.sh
 	%{default_script}
 <<
@@ -38,6 +56,20 @@
 	!vgpreload_helgrind-x86-darwin.so
 	!vgpreload_massif-x86-darwin.so
 	!vgpreload_memcheck-x86-darwin.so
+	( %type_raw[-64bit] = -64bit ) !libmpiwrap-amd64-darwin.so
+	( %type_raw[-64bit] = -64bit ) !vgpreload_core-amd64-darwin.so
+	( %type_raw[-64bit] = -64bit ) !vgpreload_drd-amd64-darwin.so
+	( %type_raw[-64bit] = -64bit ) !vgpreload_exp-ptrcheck-amd64-darwin.so
+	( %type_raw[-64bit] = -64bit ) !vgpreload_helgrind-amd64-darwin.so
+	( %type_raw[-64bit] = -64bit ) !vgpreload_massif-amd64-darwin.so
+	( %type_raw[-64bit] = -64bit ) !vgpreload_memcheck-amd64-darwin.so
+	( %m = x86_64 ) !libmpiwrap-amd64-darwin.so
+	( %m = x86_64 ) !vgpreload_core-amd64-darwin.so
+	( %m = x86_64 ) !vgpreload_drd-amd64-darwin.so
+	( %m = x86_64 ) !vgpreload_exp-ptrcheck-amd64-darwin.so
+	( %m = x86_64 ) !vgpreload_helgrind-amd64-darwin.so
+	( %m = x86_64 ) !vgpreload_massif-amd64-darwin.so
+	( %m = x86_64 ) !vgpreload_memcheck-amd64-darwin.so
 <<
 DocFiles: ACKNOWLEDGEMENTS AUTHORS COPYING* NEWS README*
 License: GPL
@@ -49,9 +81,11 @@
 	
 	Depends: %N (= %v-%r)
 	BuildDependsOnly: true
-	Replaces: %N (<< 3.5.0-0.9511.2)
+	Conflicts: valgrind-dev, valgrind-64bit-dev
+	Replaces: valgrind-dev, valgrind-64bit-dev, %N (<< 3.5.0-0.9511.2)
 	
 	Files: include lib/pkgconfig lib/valgrind/*.a
 	
 	DocFiles: ACKNOWLEDGEMENTS AUTHORS COPYING* NEWS README*
 <<
+<<

--- NEW FILE: valgrind.patch ---
diff -ru valgrind.orig/configure.in valgrind/configure.in
--- valgrind.orig/configure.in	2009-05-29 09:05:32.000000000 -0400
+++ valgrind/configure.in	2009-05-29 10:08:56.000000000 -0400
@@ -342,6 +342,7 @@
 # passed in to compilation of many C files via -VGA_$(VGCONF_ARCH_PRI) and
 # -VGP_$(VGCONF_ARCH_PRI)_$(VGCONF_OS).
 AC_SUBST(VGCONF_ARCH_PRI)
+AC_SUBST(VGCONF_ARCH_SEC)
 
 # VGCONF_PLATFORM_PRI_CAPS is the primary build target, eg. "AMD64_LINUX".
 # The entire system, including regression and performance tests, will be
@@ -456,6 +457,7 @@
 	   VGCONF_ARCH_PRI_CAPS="x86"
 	else
            VGCONF_ARCH_PRI="amd64"
+           VGCONF_ARCH_SEC="x86"
 	   VGCONF_PLATFORM_PRI_CAPS="AMD64_DARWIN"
 	   VGCONF_PLATFORM_SEC_CAPS="X86_DARWIN"
 	fi


------------------------------------------------------------------------------
Register Now for Creativity and Technology (CaT), June 3rd, NYC. CaT 
is a gathering of tech-side developers & brand creativity professionals. Meet
the minds behind Google Creative Lab, Visual Complexity, Processing, & 
iPhoneDevCamp as they present alongside digital heavyweights like Barbarian 
Group, R/GA, & Big Spaceship. http://p.sf.net/sfu/creativitycat-com 
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs


[prev in list] [next in list] [prev in thread] [next in thread] 

Configure | About | News | Add a list | Sponsored by KoreLogic