1681 support for BUILD64=# no longer works

          --- old/usr/src/pkg/manifests/system-library-storage-fibre-channel-hbaapi.mf
          +++ new/usr/src/pkg/manifests/system-library-storage-fibre-channel-hbaapi.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 \
  27   28      value=pkg:/system/library/storage/fibre-channel/hbaapi@$(PKGVERS)
  28   29  set name=pkg.description \
  29   30      value="Common Fibre Channel HBA API Library based on the T11 FC-MI specification"
  30   31  set name=pkg.summary value="Common Fibre Channel HBA API Library"
  31   32  set name=info.classification \
  32   33      value=org.opensolaris.category.2008:System/Libraries
  33   34  set name=variant.arch value=$(ARCH)
  34   35  dir path=etc group=sys
  35   36  dir path=usr group=sys
  36   37  dir path=usr/include
  37   38  dir path=usr/lib
  38      -dir path=usr/lib/$(ARCH64)
       39 +$(BUILD64)dir path=usr/lib/$(ARCH64)
  39   40  dir path=usr/share/man
  40   41  dir path=usr/share/man/man4
  41   42  file path=etc/hba.conf original_name=SUNWcfcl:etc/hba.conf preserve=true
  42   43  file path=usr/include/hbaapi.h
  43      -file path=usr/lib/$(ARCH64)/libHBAAPI.so.1
       44 +$(BUILD64)file path=usr/lib/$(ARCH64)/libHBAAPI.so.1
  44   45  file path=usr/lib/libHBAAPI.so.1
  45   46  file path=usr/share/man/man4/hba.conf.4
  46   47  legacy pkg=SUNWcfcl \
  47   48      desc="Common Fibre Channel HBA API Library based on the T11 FC-MI specification" \
  48   49      name="Common Fibre Channel HBA API Library (Usr)"
  49   50  legacy pkg=SUNWcfclr \
  50   51      desc="Common Fibre Channel HBA API Library based on the T11 FC-MI specification" \
  51   52      name="Common Fibre Channel HBA API Library (Root)"
  52   53  license cr_Sun license=cr_Sun
  53   54  license lic_CDDL license=lic_CDDL
  54   55  license usr/src/lib/hbaapi/THIRDPARTYLICENSE \
  55   56      license=usr/src/lib/hbaapi/THIRDPARTYLICENSE
  56      -link path=usr/lib/$(ARCH64)/libHBAAPI.so target=libHBAAPI.so.1
       57 +$(BUILD64)link path=usr/lib/$(ARCH64)/libHBAAPI.so target=libHBAAPI.so.1
  57   58  link path=usr/lib/libHBAAPI.so target=libHBAAPI.so.1
  58   59  depend fmri=system/library/storage/fibre-channel/libsun_fc type=require
    

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX