[601] trunk

15 Oct 2009

Revision: 601
          http://trac.macosforge.org/projects/darwinbuild/changeset/601
Author:   wsiegrist@apple.com
Date:     2009-10-15 13:31:31 -0700 (Thu, 15 Oct 2009)
Log Message:
-----------
Add patch for perl to add dtrace header

Modified Paths:
--------------
    trunk/plists/10A432.plist

Added Paths:
-----------
    trunk/patches/perl-63.pldtrace.patch

Added: trunk/patches/perl-63.pldtrace.patch
===================================================================

--- trunk/patches/perl-63.pldtrace.patch	                        (rev 0)
+++ trunk/patches/perl-63.pldtrace.patch	2009-10-15 20:31:31 UTC (rev 601)
@@ -0,0 +1,122 @@
+diff -ruN ../perl-63.orig/5.10/GNUmakefile ./5.10/GNUmakefile
+--- ../perl-63.orig/5.10/GNUmakefile	2009-10-15 13:21:53.000000000 -0700
++++ ./5.10/GNUmakefile	2009-10-15 13:27:18.000000000 -0700
+@@ -169,7 +169,7 @@
+ 	    -e 's/@VERSION5_10@/$(ENV_VERSION5_10)/g' \
+ 	    fix/README.macosx.ed | ed - $(PROJECT)/README.macosx && \
+ 	ed - $(PROJECT)/t/op/groups.t < fix/t_op_groups.t.ed
+-	dtrace -h -s $(SRCROOT)/$(FIX)/pldtrace.d -o '$(OBJROOT)/$(PLDTRACE_H)'
++	cp '$(SRCROOT)/$(FIX)/pldtrace.h' '$(OBJROOT)/$(PLDTRACE_H)'
+ 	@set -x && \
+ 	cd '$(OBJROOT)' && \
+ 	ed - $(PROJECT)/hints/darwin.sh < fix/darwin42.sh.ed && \
+diff -ruN ../perl-63.orig/5.10/fix/pldtrace.h ./5.10/fix/pldtrace.h
+--- ../perl-63.orig/5.10/fix/pldtrace.h	1969-12-31 16:00:00.000000000 -0800
++++ ./5.10/fix/pldtrace.h	2009-10-15 13:25:29.000000000 -0700
+@@ -0,0 +1,45 @@
++/*
++ * Generated by dtrace(1M).
++ */
++
++#ifndef	_PLDTRACE_H
++#define	_PLDTRACE_H
++
++#include <unistd.h>
++
++#ifdef	__cplusplus
++extern "C" {
++#endif
++
++#define PERL_STABILITY "___dtrace_stability$perl$v1$4_4_5_4_4_5_4_4_5_4_4_5_4_4_5"
++
++#define PERL_TYPEDEFS "___dtrace_typedefs$perl$v2"
++
++#define	PERL_SUB_ENTRY(arg0, arg1, arg2) \
++do { \
++	__asm__ volatile(".reference " PERL_TYPEDEFS); \
++	__dtrace_probe$perl$sub__entry$v1$63686172202a$63686172202a$696e74(arg0, arg1, arg2); \
++	__asm__ volatile(".reference " PERL_STABILITY); \
++} while (0)
++#define	PERL_SUB_ENTRY_ENABLED() \
++	__dtrace_isenabled$perl$sub__entry$v1()
++#define	PERL_SUB_RETURN(arg0, arg1, arg2) \
++do { \
++	__asm__ volatile(".reference " PERL_TYPEDEFS); \
++	__dtrace_probe$perl$sub__return$v1$63686172202a$63686172202a$696e74(arg0, arg1, arg2); \
++	__asm__ volatile(".reference " PERL_STABILITY); \
++} while (0)
++#define	PERL_SUB_RETURN_ENABLED() \
++	__dtrace_isenabled$perl$sub__return$v1()
++
++
++extern void __dtrace_probe$perl$sub__entry$v1$63686172202a$63686172202a$696e74(char *, char *, int);
++extern int __dtrace_isenabled$perl$sub__entry$v1(void);
++extern void __dtrace_probe$perl$sub__return$v1$63686172202a$63686172202a$696e74(char *, char *, int);
++extern int __dtrace_isenabled$perl$sub__return$v1(void);
++
++#ifdef	__cplusplus
++}
++#endif
++
++#endif	/* _PLDTRACE_H */
+diff -ruN ../perl-63.orig/5.8/GNUmakefile ./5.8/GNUmakefile
+--- ../perl-63.orig/5.8/GNUmakefile	2009-10-15 13:21:53.000000000 -0700
++++ ./5.8/GNUmakefile	2009-10-15 13:26:39.000000000 -0700
+@@ -165,7 +165,7 @@
+ 	    -e 's/@VERSION5_8@/$(ENV_VERSION5_8)/g' \
+ 	    -e 's/@VERSION5_10@/$(ENV_VERSION5_10)/g' \
+ 	    fix/README.macosx.ed | ed - $(PROJECT)/README.macosx
+-	dtrace -h -s $(SRCROOT)/$(FIX)/pldtrace.d -o '$(OBJROOT)/$(PLDTRACE_H)'
++	cp '$(SRCROOT)/$(FIX)/pldtrace.h' '$(OBJROOT)/$(PLDTRACE_H)'
+ 	@set -x && \
+ 	cd '$(OBJROOT)' && \
+ 	ed - $(PROJECT)/hints/darwin.sh < fix/darwin42.sh.ed
+diff -ruN ../perl-63.orig/5.8/fix/pldtrace.h ./5.8/fix/pldtrace.h
+--- ../perl-63.orig/5.8/fix/pldtrace.h	1969-12-31 16:00:00.000000000 -0800
++++ ./5.8/fix/pldtrace.h	2009-10-15 13:25:43.000000000 -0700
+@@ -0,0 +1,45 @@
++/*
++ * Generated by dtrace(1M).
++ */
++
++#ifndef	_PLDTRACE_H
++#define	_PLDTRACE_H
++
++#include <unistd.h>
++
++#ifdef	__cplusplus
++extern "C" {
++#endif
++
++#define PERL_STABILITY "___dtrace_stability$perl$v1$4_4_5_4_4_5_4_4_5_4_4_5_4_4_5"
++
++#define PERL_TYPEDEFS "___dtrace_typedefs$perl$v2"
++
++#define	PERL_SUB_ENTRY(arg0, arg1, arg2) \
++do { \
++	__asm__ volatile(".reference " PERL_TYPEDEFS); \
++	__dtrace_probe$perl$sub__entry$v1$63686172202a$63686172202a$696e74(arg0, arg1, arg2); \
++	__asm__ volatile(".reference " PERL_STABILITY); \
++} while (0)
++#define	PERL_SUB_ENTRY_ENABLED() \
++	__dtrace_isenabled$perl$sub__entry$v1()
++#define	PERL_SUB_RETURN(arg0, arg1, arg2) \
++do { \
++	__asm__ volatile(".reference " PERL_TYPEDEFS); \
++	__dtrace_probe$perl$sub__return$v1$63686172202a$63686172202a$696e74(arg0, arg1, arg2); \
++	__asm__ volatile(".reference " PERL_STABILITY); \
++} while (0)
++#define	PERL_SUB_RETURN_ENABLED() \
++	__dtrace_isenabled$perl$sub__return$v1()
++
++
++extern void __dtrace_probe$perl$sub__entry$v1$63686172202a$63686172202a$696e74(char *, char *, int);
++extern int __dtrace_isenabled$perl$sub__entry$v1(void);
++extern void __dtrace_probe$perl$sub__return$v1$63686172202a$63686172202a$696e74(char *, char *, int);
++extern int __dtrace_isenabled$perl$sub__return$v1(void);
++
++#ifdef	__cplusplus
++}
++#endif
++
++#endif	/* _PLDTRACE_H */

Modified: trunk/plists/10A432.plist
===================================================================
--- trunk/plists/10A432.plist	2009-10-15 20:07:07 UTC (rev 600)
+++ trunk/plists/10A432.plist	2009-10-15 20:31:31 UTC (rev 601)
@@ -11651,6 +11651,9 @@
 					gcc,
 				);
 			};
+			patchfiles = (
+				"perl-63.pldtrace.patch",
+			);
 			version = 63;
 		};
 		portmap = {

    

source_changes＠macosforge.org

tags

participants (1)