Attachment #185522 for bug #221587

Lines 1-7 Link Here

(-)b/head/databases/libcouchbase/Makefile (-1 / +1 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= libcouchbase	3	PORTNAME= libcouchbase
4	DISTVERSION= 2.7.6	4	DISTVERSION= 2.7.7
5	CATEGORIES= databases	5	CATEGORIES= databases
6	MASTER_SITES= http://packages.couchbase.com/clients/c/	6	MASTER_SITES= http://packages.couchbase.com/clients/c/
7		7

Lines 1-3 Link Here

(-)b/head/databases/libcouchbase/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1499972390	1	TIMESTAMP = 1502963775
2	SHA256 (libcouchbase-2.7.6.tar.gz) = 9b0c2a4de38963ec3314d19e50d63cc34a5990a4f6e0a81973c019d5ad83c411	2	SHA256 (libcouchbase-2.7.7.tar.gz) = 2d4a912efde1c96e7361cd374ae18e7e25c892a2d53a55d25602cd97e6d5de3c
3	SIZE (libcouchbase-2.7.6.tar.gz) = 1149912	3	SIZE (libcouchbase-2.7.7.tar.gz) = 1178826




--- cmake/dtrace-instr-link.pl.orig	2016-08-05 21:38:44 UTC
+++ cmake/dtrace-instr-link.pl
@@ -3,7 +3,7 @@ use strict;
 use warnings;
 use Digest::MD5 qw(md5_hex);
 
-my $HDR = "** $0:";
+my $HDR = "** $0 ($$):";
 $\="\n";
 
 my $DT_SRC = shift @ARGV;
@@ -16,23 +16,36 @@ if (!scalar @O_FILES) {
     exec($CMD,@ARGV);
 }
 
+# Copy .o files to a temporary location before DTrace messes with them
+chomp(my $tmpdir = `mktemp -d -t $$`);
+if (system("tar cf - @O_FILES | tar xf - -C $tmpdir") != 0) {
+    system("rm -r $tmpdir");
+    exit(1);
+}
+
 my $ss = join('_', @O_FILES);
 my $hexstr = md5_hex($ss);
 
-my $INSTRUMENTED = "generated/probes_${hexstr}.o";
+# From now, we work with files in the temporary location, update @ARGV
+map { $_ =~ s,.+\.o$,$tmpdir/$&, } @ARGV;
+
+my $INSTRUMENTED = "generated/probes_${hexstr}_$$.o";
 # Run DTrace instrumentation. Assuming running from build directory:
 my @args = (
     'dtrace', '-C', '-G',
     '-s', $DT_SRC,
     '-o', $INSTRUMENTED,
-    @O_FILES);
+    grep { $_ =~ /\.o$/ } @ARGV);
 
 print "$HDR: Creating instrumented DTrace object: @args";
 if (system(@args) != 0) {
+    system("rm -r $tmpdir");
     exit(1);
 }
 
 unshift @ARGV, $CMD;
 push @ARGV, $INSTRUMENTED;
 print "$HDR: Linking with instrumented DTrace object: @ARGV";
-exit(system(@ARGV));
+my $rc = system(@ARGV);
+system("rm -r $tmpdir");
+exit($rc);




bin/cbc-observe
bin/cbc-observe-seqno
bin/cbc-pillowfight
bin/cbc-ping
bin/cbc-rm
bin/cbc-role-list
bin/cbc-stats
bin/cbc-strerror
bin/cbc-subdoc
bin/cbc-touch
bin/cbc-unlock
bin/cbc-user-delete
bin/cbc-user-list
bin/cbc-user-upsert
bin/cbc-verbosity
bin/cbc-version
bin/cbc-view
bin/cbc-write-config
bin/cbc-role-list
bin/cbc-user-delete
bin/cbc-user-list
bin/cbc-user-upsert
include/libcouchbase/_cxxwrap.h
include/libcouchbase/api-legacy.h
include/libcouchbase/api3.h

include/libcouchbase/visibility.h
lib/libcouchbase.so
lib/libcouchbase.so.2
lib/libcouchbase.so.2.0.47
lib/libcouchbase_libev.so
lib/libcouchbase_libevent.so
lib/libcouchbase_libuv.so

man/man1/cbc-n1qlback.1.gz
man/man1/cbc-observe.1.gz
man/man1/cbc-pillowfight.1.gz
man/man1/cbc-ping.1.gz
man/man1/cbc-rm.1.gz
man/man1/cbc-role-list.1.gz
man/man1/cbc-stats.1.gz
man/man1/cbc-subdoc.1.gz
man/man1/cbc-unlock.1.gz
man/man1/cbc-user-delete.1.gz
man/man1/cbc-user-list.1.gz
man/man1/cbc-user-upsert.1.gz
man/man1/cbc-verbosity.1.gz
man/man1/cbc-version.1.gz
man/man1/cbc-view.1.gz
man/man1/cbc.1.gz
man/man1/cbc-role-list.1.gz
man/man1/cbc-user-delete.1.gz
man/man1/cbc-user-list.1.gz
man/man1/cbc-user-upsert.1.gz
man/man4/cbcrc.4.gz

Return to bug 221587

Removed Link Here

(-)a/head/databases/libcouchbase/files/patch-cmake_dtrace-instr-link.pl (-51 lines)
1	--- cmake/dtrace-instr-link.pl.orig 2016-08-05 21:38:44 UTC
2	+++ cmake/dtrace-instr-link.pl
3	@@ -3,7 +3,7 @@ use strict;
4	use warnings;
5	use Digest::MD5 qw(md5_hex);
6
7	-my $HDR = "** $0:";
8	+my $HDR = "** $0 ($$):";
9	$\="\n";
10
11	my $DT_SRC = shift @ARGV;
12	@@ -16,23 +16,36 @@ if (!scalar @O_FILES) {
13	exec($CMD,@ARGV);
14	}
15
16	+# Copy .o files to a temporary location before DTrace messes with them
17	+chomp(my $tmpdir = `mktemp -d -t $$`);
18	+if (system("tar cf - @O_FILES \| tar xf - -C $tmpdir") != 0) {
19	+ system("rm -r $tmpdir");
20	+ exit(1);
21	+}
22	+
23	my $ss = join('_', @O_FILES);
24	my $hexstr = md5_hex($ss);
25
26	-my $INSTRUMENTED = "generated/probes_${hexstr}.o";
27	+# From now, we work with files in the temporary location, update @ARGV
28	+map { $_ =~ s,.+\.o$,$tmpdir/$&, } @ARGV;
29	+
30	+my $INSTRUMENTED = "generated/probes_${hexstr}_$$.o";
31	# Run DTrace instrumentation. Assuming running from build directory:
32	my @args = (
33	'dtrace', '-C', '-G',
34	'-s', $DT_SRC,
35	'-o', $INSTRUMENTED,
36	- @O_FILES);
37	+ grep { $_ =~ /\.o$/ } @ARGV);
38
39	print "$HDR: Creating instrumented DTrace object: @args";
40	if (system(@args) != 0) {
41	+ system("rm -r $tmpdir");
42	exit(1);
43	}
44
45	unshift @ARGV, $CMD;
46	push @ARGV, $INSTRUMENTED;
47	print "$HDR: Linking with instrumented DTrace object: @ARGV";
48	-exit(system(@ARGV));
49	+my $rc = system(@ARGV);
50	+system("rm -r $tmpdir");
51	+exit($rc);

Lines 16-34 Link Here

(-)b/head/databases/libcouchbase/pkg-plist (-9 / +13 lines)
16	bin/cbc-observe	16	bin/cbc-observe
17	bin/cbc-observe-seqno	17	bin/cbc-observe-seqno
18	bin/cbc-pillowfight	18	bin/cbc-pillowfight
		19	bin/cbc-ping
19	bin/cbc-rm	20	bin/cbc-rm
		21	bin/cbc-role-list
20	bin/cbc-stats	22	bin/cbc-stats
21	bin/cbc-strerror	23	bin/cbc-strerror
		24	bin/cbc-subdoc
22	bin/cbc-touch	25	bin/cbc-touch
23	bin/cbc-unlock	26	bin/cbc-unlock
		27	bin/cbc-user-delete
		28	bin/cbc-user-list
		29	bin/cbc-user-upsert
24	bin/cbc-verbosity	30	bin/cbc-verbosity
25	bin/cbc-version	31	bin/cbc-version
26	bin/cbc-view	32	bin/cbc-view
27	bin/cbc-write-config	33	bin/cbc-write-config
28	bin/cbc-role-list
29	bin/cbc-user-delete
30	bin/cbc-user-list
31	bin/cbc-user-upsert
32	include/libcouchbase/_cxxwrap.h	34	include/libcouchbase/_cxxwrap.h
33	include/libcouchbase/api-legacy.h	35	include/libcouchbase/api-legacy.h
34	include/libcouchbase/api3.h	36	include/libcouchbase/api3.h
Lines 64-70 Link Here
64	include/libcouchbase/visibility.h	66	include/libcouchbase/visibility.h
65	lib/libcouchbase.so	67	lib/libcouchbase.so
66	lib/libcouchbase.so.2	68	lib/libcouchbase.so.2
67	lib/libcouchbase.so.2.0.46	69	lib/libcouchbase.so.2.0.47
68	lib/libcouchbase_libev.so	70	lib/libcouchbase_libev.so
69	lib/libcouchbase_libevent.so	71	lib/libcouchbase_libevent.so
70	lib/libcouchbase_libuv.so	72	lib/libcouchbase_libuv.so
Lines 83-97 Link Here
83	man/man1/cbc-n1qlback.1.gz	85	man/man1/cbc-n1qlback.1.gz
84	man/man1/cbc-observe.1.gz	86	man/man1/cbc-observe.1.gz
85	man/man1/cbc-pillowfight.1.gz	87	man/man1/cbc-pillowfight.1.gz
		88	man/man1/cbc-ping.1.gz
86	man/man1/cbc-rm.1.gz	89	man/man1/cbc-rm.1.gz
		90	man/man1/cbc-role-list.1.gz
87	man/man1/cbc-stats.1.gz	91	man/man1/cbc-stats.1.gz
		92	man/man1/cbc-subdoc.1.gz
88	man/man1/cbc-unlock.1.gz	93	man/man1/cbc-unlock.1.gz
		94	man/man1/cbc-user-delete.1.gz
		95	man/man1/cbc-user-list.1.gz
		96	man/man1/cbc-user-upsert.1.gz
89	man/man1/cbc-verbosity.1.gz	97	man/man1/cbc-verbosity.1.gz
90	man/man1/cbc-version.1.gz	98	man/man1/cbc-version.1.gz
91	man/man1/cbc-view.1.gz	99	man/man1/cbc-view.1.gz
92	man/man1/cbc.1.gz	100	man/man1/cbc.1.gz
93	man/man1/cbc-role-list.1.gz
94	man/man1/cbc-user-delete.1.gz
95	man/man1/cbc-user-list.1.gz
96	man/man1/cbc-user-upsert.1.gz
97	man/man4/cbcrc.4.gz	101	man/man4/cbcrc.4.gz