1681 support for BUILD64=# no longer works

          --- old/usr/src/pkg/manifests/system-tnf.mf
          +++ new/usr/src/pkg/manifests/system-tnf.mf

   1    1  #
   2    2  # CDDL HEADER START
   3    3  #
   4    4  # The contents of this file are subject to the terms of the
   5    5  # Common Development and Distribution License (the "License").
   6    6  # You may not use this file except in compliance with the License.
   7    7  #
   8    8  # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
   9    9  # or http://www.opensolaris.org/os/licensing.
  10   10  # See the License for the specific language governing permissions
  11   11  # and limitations under the License.
  12   12  #
  13   13  # When distributing Covered Code, include this CDDL HEADER in each

  14   14  # file and include the License file at usr/src/OPENSOLARIS.LICENSE.
  15   15  # If applicable, add the following below this CDDL HEADER, with the
  16   16  # fields enclosed by brackets "[]" replaced with your own identifying
  17   17  # information: Portions Copyright [yyyy] [name of copyright owner]
  18   18  #
  19   19  # CDDL HEADER END
  20   20  #
  21   21  
  22   22  #
  23   23  # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
       24 +# Copyright 2014 Andrew Stormont.
  24   25  #
  25   26  
  26   27  set name=pkg.fmri value=pkg:/system/tnf@$(PKGVERS)
  27   28  set name=pkg.description \
  28   29      value="utilities needed to enable probe points, in the kernel and in applications, that can generate Trace Normal Format (TNF) records in a trace file"
  29   30  set name=pkg.summary value="TNF Core Components"
  30   31  set name=info.classification \
  31   32      value=org.opensolaris.category.2008:Development/System
  32   33  set name=variant.arch value=$(ARCH)
  33   34  dir path=usr group=sys
  34   35  dir path=usr/bin
  35   36  dir path=usr/bin/$(ARCH32)
  36      -dir path=usr/bin/$(ARCH64)
       37 +$(BUILD64)dir path=usr/bin/$(ARCH64)
  37   38  dir path=usr/include
  38   39  dir path=usr/include/tnf
  39   40  dir path=usr/kernel group=sys
  40   41  dir path=usr/kernel/drv group=sys
  41   42  dir path=usr/kernel/drv/$(ARCH64) group=sys
  42   43  dir path=usr/lib
  43      -dir path=usr/lib/$(ARCH64)
       44 +$(BUILD64)dir path=usr/lib/$(ARCH64)
  44   45  dir path=usr/share/man/man1
  45   46  dir path=usr/share/man/man3lib
  46   47  driver name=tnf perms="tnfctl 0600 root sys" perms="tnfmap 0600 root sys"
  47   48  file path=usr/bin/$(ARCH32)/prex mode=0555
  48   49  $(i386_ONLY)file path=usr/bin/$(ARCH32)/tnfxtract mode=0555
  49      -file path=usr/bin/$(ARCH64)/prex mode=0555
  50      -file path=usr/bin/$(ARCH64)/tnfxtract mode=0555
       50 +$(BUILD64)file path=usr/bin/$(ARCH64)/prex mode=0555
       51 +$(BUILD64)file path=usr/bin/$(ARCH64)/tnfxtract mode=0555
  51   52  file path=usr/include/tnf/tnfctl.h
  52   53  file path=usr/kernel/drv/$(ARCH64)/tnf group=sys
  53   54  $(i386_ONLY)file path=usr/kernel/drv/tnf group=sys
  54   55  file path=usr/kernel/drv/tnf.conf group=sys
  55      -file path=usr/lib/$(ARCH64)/libtnfctl.so.1
  56      -file path=usr/lib/$(ARCH64)/libtnfprobe.so.1
       56 +$(BUILD64)file path=usr/lib/$(ARCH64)/libtnfctl.so.1
       57 +$(BUILD64)file path=usr/lib/$(ARCH64)/libtnfprobe.so.1
  57   58  file path=usr/lib/libtnfctl.so.1
  58   59  file path=usr/lib/libtnfprobe.so.1
  59   60  file path=usr/share/man/man1/prex.1
  60   61  file path=usr/share/man/man1/tnfxtract.1
  61   62  file path=usr/share/man/man3lib/libtnfctl.3lib
  62   63  hardlink path=usr/bin/prex target=../lib/isaexec
  63   64  hardlink path=usr/bin/tnfxtract target=../lib/isaexec
  64   65  legacy pkg=SUNWtnfc \
  65   66      desc="utilities needed to enable probe points, in the kernel and in applications, that can generate Trace Normal Format (TNF) records in a trace file" \
  66   67      name="TNF Core Components"
  67   68  license cr_Sun license=cr_Sun
  68   69  license lic_CDDL license=lic_CDDL
  69      -link path=usr/lib/$(ARCH64)/libtnfctl.so target=libtnfctl.so.1
  70      -link path=usr/lib/$(ARCH64)/libtnfprobe.so target=libtnfprobe.so.1
       70 +$(BUILD64)link path=usr/lib/$(ARCH64)/libtnfctl.so target=libtnfctl.so.1
       71 +$(BUILD64)link path=usr/lib/$(ARCH64)/libtnfprobe.so target=libtnfprobe.so.1
  71   72  link path=usr/lib/libtnfctl.so target=./libtnfctl.so.1
  72   73  link path=usr/lib/libtnfprobe.so target=./libtnfprobe.so.1
    

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX