illumos-gate-1681 Udiff usr/src/pkg/manifests/system-zones-internal.mf

Print this page

1681 support for BUILD64=# no longer works

@@ -19,10 +19,11 @@
 # CDDL HEADER END
 #
 
 #
 # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright 2014 Andrew Stormont.
 #
 
 set name=pkg.fmri value=pkg:/system/zones/internal@$(PKGVERS)
 set name=pkg.description value="Solaris Zones internal files"
 set name=pkg.summary value="Solaris Zones Internal Files"

@@ -30,29 +31,29 @@
     value=org.opensolaris.category.2008:Development/System
 set name=variant.arch value=$(ARCH)
 dir path=usr group=sys
 dir path=usr/include
 dir path=usr/lib
-dir path=usr/lib/$(ARCH64)
+$(BUILD64)dir path=usr/lib/$(ARCH64)
 file path=usr/include/libbrand.h
 file path=usr/include/libuutil.h
 file path=usr/include/libzonecfg.h
 file path=usr/include/zonestat_impl.h
-file path=usr/lib/$(ARCH64)/llib-lbrand.ln
-file path=usr/lib/$(ARCH64)/llib-lzonecfg.ln
-file path=usr/lib/$(ARCH64)/llib-lzonestat.ln
+$(BUILD64)file path=usr/lib/$(ARCH64)/llib-lbrand.ln
+$(BUILD64)file path=usr/lib/$(ARCH64)/llib-lzonecfg.ln
+$(BUILD64)file path=usr/lib/$(ARCH64)/llib-lzonestat.ln
 file path=usr/lib/llib-lbrand
 file path=usr/lib/llib-lbrand.ln
 file path=usr/lib/llib-lzonecfg
 file path=usr/lib/llib-lzonecfg.ln
 file path=usr/lib/llib-lzonestat
 file path=usr/lib/llib-lzonestat.ln
 legacy pkg=SUNWzoneint desc="Solaris Zones internal files" \
     name="Solaris Zones Internal Files" version=11.11,REV=2009.10.13
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL
-link path=usr/lib/$(ARCH64)/libbrand.so target=./libbrand.so.1
-link path=usr/lib/$(ARCH64)/libzonecfg.so target=./libzonecfg.so.1
-link path=usr/lib/$(ARCH64)/libzonestat.so target=./libzonestat.so.1
+$(BUILD64)link path=usr/lib/$(ARCH64)/libbrand.so target=./libbrand.so.1
+$(BUILD64)link path=usr/lib/$(ARCH64)/libzonecfg.so target=./libzonecfg.so.1
+$(BUILD64)link path=usr/lib/$(ARCH64)/libzonestat.so target=./libzonestat.so.1
 link path=usr/lib/libbrand.so target=./libbrand.so.1
 link path=usr/lib/libzonecfg.so target=./libzonecfg.so.1
 link path=usr/lib/libzonestat.so target=./libzonestat.so.1