illumos-gate-1681 Udiff usr/src/pkg/manifests/diagnostic-cpu-counters.mf

Print this page

1681 support for BUILD64=# no longer works

@@ -20,10 +20,11 @@
 #
 
 #
 # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
 # Copyright 2012 Nexenta Systems, Inc. All rights reserved.
+# Copyright 2014 Andrew Stormont.
 #
 
 set name=pkg.fmri value=pkg:/diagnostic/cpu-counters@$(PKGVERS)
 set name=pkg.description \
     value="CPU Performance Counter libraries and utilities"

@@ -31,25 +32,25 @@
 set name=info.classification value=org.opensolaris.category.2008:System/Core
 set name=variant.arch value=$(ARCH)
 dir path=usr group=sys
 dir path=usr/bin
 $(i386_ONLY)dir path=usr/bin/$(ARCH32)
-dir path=usr/bin/$(ARCH64)
+$(BUILD64)dir path=usr/bin/$(ARCH64)
 dir path=usr/include
 dir path=usr/include/sys
 dir path=usr/kernel group=sys
 dir path=usr/kernel/pcbe group=sys
 dir path=usr/kernel/pcbe/$(ARCH64) group=sys
 dir path=usr/lib
-dir path=usr/lib/$(ARCH64)
+$(BUILD64)dir path=usr/lib/$(ARCH64)
 dir path=usr/sbin
 dir path=usr/share/man/man1
 dir path=usr/share/man/man1m
 dir path=usr/share/man/man3cpc
 dir path=usr/share/man/man3lib
 $(i386_ONLY)file path=usr/bin/$(ARCH32)/cputrack mode=0555
-file path=usr/bin/$(ARCH64)/cputrack mode=0555
+$(BUILD64)file path=usr/bin/$(ARCH64)/cputrack mode=0555
 file path=usr/include/libcpc.h
 file path=usr/include/libpctx.h
 $(sparc_ONLY)file path=usr/kernel/pcbe/$(ARCH64)/pcbe.4.6 group=sys mode=0755
 $(sparc_ONLY)file path=usr/kernel/pcbe/$(ARCH64)/pcbe.62 group=sys mode=0755
 $(i386_ONLY)file path=usr/kernel/pcbe/$(ARCH64)/pcbe.AuthenticAMD group=sys \

@@ -63,14 +64,14 @@
 $(i386_ONLY)file path=usr/kernel/pcbe/pcbe.AuthenticAMD group=sys mode=0755
 $(i386_ONLY)file path=usr/kernel/pcbe/pcbe.GenuineIntel.15 group=sys mode=0755
 $(i386_ONLY)file path=usr/kernel/pcbe/pcbe.GenuineIntel.6 group=sys mode=0755
 $(i386_ONLY)file path=usr/kernel/pcbe/pcbe.GenuineIntel.6.15 group=sys \
     mode=0755
-file path=usr/lib/$(ARCH64)/libcpc.so.1
-file path=usr/lib/$(ARCH64)/libpctx.so.1
-file path=usr/lib/$(ARCH64)/llib-lcpc.ln
-file path=usr/lib/$(ARCH64)/llib-lpctx.ln
+$(BUILD64)file path=usr/lib/$(ARCH64)/libcpc.so.1
+$(BUILD64)file path=usr/lib/$(ARCH64)/libpctx.so.1
+$(BUILD64)file path=usr/lib/$(ARCH64)/llib-lcpc.ln
+$(BUILD64)file path=usr/lib/$(ARCH64)/llib-lpctx.ln
 file path=usr/lib/libcpc.so.1
 file path=usr/lib/libpctx.so.1
 file path=usr/lib/llib-lcpc
 file path=usr/lib/llib-lcpc.ln
 file path=usr/lib/llib-lpctx

@@ -155,12 +156,12 @@
     target=pcbe.GenuineIntel.6.15
 $(i386_ONLY)link path=usr/kernel/pcbe/pcbe.GenuineIntel.6.46 \
     target=pcbe.GenuineIntel.6.15
 $(i386_ONLY)link path=usr/kernel/pcbe/pcbe.GenuineIntel.6.47 \
     target=pcbe.GenuineIntel.6.15
-link path=usr/lib/$(ARCH64)/libcpc.so target=./libcpc.so.1
-link path=usr/lib/$(ARCH64)/libpctx.so target=./libpctx.so.1
+$(BUILD64)link path=usr/lib/$(ARCH64)/libcpc.so target=./libcpc.so.1
+$(BUILD64)link path=usr/lib/$(ARCH64)/libpctx.so target=./libpctx.so.1
 link path=usr/lib/libcpc.so target=./libcpc.so.1
 link path=usr/lib/libpctx.so target=./libpctx.so.1
 link path=usr/share/man/man3cpc/cpc_bind_cpu.3cpc target=cpc_bind_curlwp.3cpc
 link path=usr/share/man/man3cpc/cpc_bind_pctx.3cpc target=cpc_bind_curlwp.3cpc
 link path=usr/share/man/man3cpc/cpc_buf_add.3cpc target=cpc_buf_create.3cpc