summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrichard <richard@pkgsrc.org>2014-06-04 14:24:37 +0000
committerrichard <richard@pkgsrc.org>2014-06-04 14:24:37 +0000
commit3c282ffaac8e79e1b0026642f8d1287f6938ac59 (patch)
treed013a939766795b61f7ca9a34006ed9482a57152
parentd952ad300ade5adb0196926ee5c722354418a5e3 (diff)
downloadpkgsrc-3c282ffaac8e79e1b0026642f8d1287f6938ac59.tar.gz
Workaround perldtrace.h dependency problem
-rw-r--r--lang/perl5/distinfo4
-rw-r--r--lang/perl5/options.mk4
-rw-r--r--lang/perl5/patches/patch-Makefile.SH18
3 files changed, 18 insertions, 8 deletions
diff --git a/lang/perl5/distinfo b/lang/perl5/distinfo
index 49687515c41..61bf0b41848 100644
--- a/lang/perl5/distinfo
+++ b/lang/perl5/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.118 2014/06/04 00:21:33 dsainty Exp $
+$NetBSD: distinfo,v 1.119 2014/06/04 14:24:37 richard Exp $
SHA1 (perl-5.20.0.tar.bz2) = e925e4fc36e90eace19a1ca850f912618ba6788f
RMD160 (perl-5.20.0.tar.bz2) = a14fa854f2d50aa5f16ff3a982244dd6cd0c4730
Size (perl-5.20.0.tar.bz2) = 13770469 bytes
-SHA1 (patch-Makefile.SH) = 4fceb8bc225ea784ecda3920e888f0ddb1aad997
+SHA1 (patch-Makefile.SH) = 623f32eca930ccb7c5eaa47f28df87ae15149cad
SHA1 (patch-aa) = 441ad4f0d27d9be0fcdce31c9d35d35d98958518
SHA1 (patch-ab) = c899b7221a78e74cc9b1480834baba047dd19f38
SHA1 (patch-ac) = 4baa8f80695687abb53d4f4e1830cf86db5b2bf7
diff --git a/lang/perl5/options.mk b/lang/perl5/options.mk
index 8e1f499e00c..11803bc1074 100644
--- a/lang/perl5/options.mk
+++ b/lang/perl5/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.8 2014/06/04 09:19:56 obache Exp $
+# $NetBSD: options.mk,v 1.9 2014/06/04 14:24:37 richard Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.perl
PKG_OPTIONS_REQUIRED_GROUPS= perlbits
@@ -70,8 +70,6 @@ CFLAGS+= -DDEBUGGING
.if !empty(PKG_OPTIONS:Mdtrace)
CONFIGURE_ARGS+= -Dusedtrace
-# perldtrace.h has incorrect dependencies, needs to be built first.
-BUILD_TARGET= perldtrace.h all
.endif
.if !empty(PKG_OPTIONS:Mmstats)
diff --git a/lang/perl5/patches/patch-Makefile.SH b/lang/perl5/patches/patch-Makefile.SH
index 50f379cfef3..c6493640375 100644
--- a/lang/perl5/patches/patch-Makefile.SH
+++ b/lang/perl5/patches/patch-Makefile.SH
@@ -1,10 +1,13 @@
-$NetBSD: patch-Makefile.SH,v 1.1 2014/01/04 15:10:05 richard Exp $
+$NetBSD: patch-Makefile.SH,v 1.2 2014/06/04 14:24:37 richard Exp $
due to bloody backward incompatible changes in recent dtrace on SunOS
postpone invocation of dtrace to later with the actual probe objects.
---- Makefile.SH.orig 2013-08-12 02:44:47.000000000 +0000
+Ensure perldtrace.h is generated during makedepends in order to avoid
+compilation problems
+
+--- Makefile.SH.orig 2014-05-26 13:34:18.000000000 +0000
+++ Makefile.SH
-@@ -234,10 +234,9 @@ dtrace_o=''
+@@ -225,10 +225,9 @@ dtrace_o=''
minidtrace_o=''
case "$usedtrace" in
define|true)
@@ -18,3 +21,12 @@ postpone invocation of dtrace to later with the actual probe objects.
;;
esac
+@@ -1579,7 +1578,7 @@ nokfilenack: utilities
+
+ .PHONY: clist hlist
+
+-clist: $(c)
++clist: $(c) $(DTRACE_H)
+ echo $(c) | tr ' ' $(TRNL) >.clist
+
+ hlist: $(h)