illumos-gate-1681 Udiff usr/src/pkg/manifests/service-security-kerberos-5.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:/service/security/kerberos-5@$(PKGVERS)
 set name=pkg.description value="Kerberos version 5 support"
 set name=pkg.summary value="Kerberos version 5 support"

@@ -37,19 +38,19 @@
 dir path=lib/svc/manifest/network group=sys
 dir path=lib/svc/manifest/network/security group=sys
 dir path=usr group=sys
 dir path=usr/bin
 dir path=usr/lib
-dir path=usr/lib/$(ARCH64)
-dir path=usr/lib/$(ARCH64)/gss
+$(BUILD64)dir path=usr/lib/$(ARCH64)
+$(BUILD64)dir path=usr/lib/$(ARCH64)/gss
 dir path=usr/lib/gss
 dir path=usr/lib/krb5
-dir path=usr/lib/krb5/$(ARCH64)
+$(BUILD64)dir path=usr/lib/krb5/$(ARCH64)
 dir path=usr/lib/krb5/plugins
 dir path=usr/lib/krb5/plugins/preauth
 dir path=usr/lib/security
-dir path=usr/lib/security/$(ARCH64)
+$(BUILD64)dir path=usr/lib/security/$(ARCH64)
 dir path=usr/share/man
 dir path=usr/share/man/man1
 dir path=usr/share/man/man1m
 dir path=usr/share/man/man3lib
 dir path=usr/share/man/man5

@@ -68,21 +69,21 @@
 file path=usr/bin/kinit mode=0555
 file path=usr/bin/klist mode=0555
 file path=usr/bin/kpasswd mode=0555
 file path=usr/bin/krb5-config mode=0555
 file path=usr/bin/ktutil mode=0555
-file path=usr/lib/$(ARCH64)/gss/mech_krb5.so.1
-file path=usr/lib/$(ARCH64)/libkrb5.so.1
+$(BUILD64)file path=usr/lib/$(ARCH64)/gss/mech_krb5.so.1
+$(BUILD64)file path=usr/lib/$(ARCH64)/libkrb5.so.1
 file path=usr/lib/gss/mech_krb5.so.1
-file path=usr/lib/krb5/$(ARCH64)/libkadm5clnt.so.1
+$(BUILD64)file path=usr/lib/krb5/$(ARCH64)/libkadm5clnt.so.1
 file path=usr/lib/krb5/ktkt_warnd mode=0555
 file path=usr/lib/krb5/libkadm5clnt.so.1
 file path=usr/lib/krb5/libss.so.1
 file path=usr/lib/krb5/plugins/preauth/pkinit.so.1
 file path=usr/lib/libkrb5.so.1
-file path=usr/lib/security/$(ARCH64)/pam_krb5.so.1
-file path=usr/lib/security/$(ARCH64)/pam_krb5_migrate.so.1
+$(BUILD64)file path=usr/lib/security/$(ARCH64)/pam_krb5.so.1
+$(BUILD64)file path=usr/lib/security/$(ARCH64)/pam_krb5_migrate.so.1
 file path=usr/lib/security/pam_krb5.so.1
 file path=usr/lib/security/pam_krb5_migrate.so.1
 file path=usr/share/man/man1/kdestroy.1
 file path=usr/share/man/man1/kinit.1
 file path=usr/share/man/man1/klist.1

@@ -99,19 +100,21 @@
     name="Kerberos version 5 support (Usr)"
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL
 license usr/src/lib/gss_mechs/mech_krb5/THIRDPARTYLICENSE \
     license=usr/src/lib/gss_mechs/mech_krb5/THIRDPARTYLICENSE
-link path=usr/lib/$(ARCH64)/gss/mech_krb5.so target=./mech_krb5.so.1
-link path=usr/lib/$(ARCH64)/libkrb5.so target=./libkrb5.so.1
+$(BUILD64)link path=usr/lib/$(ARCH64)/gss/mech_krb5.so target=./mech_krb5.so.1
+$(BUILD64)link path=usr/lib/$(ARCH64)/libkrb5.so target=./libkrb5.so.1
 link path=usr/lib/gss/mech_krb5.so target=./mech_krb5.so.1
-link path=usr/lib/krb5/$(ARCH64)/libkadm5clnt.so target=./libkadm5clnt.so.1
+$(BUILD64)link path=usr/lib/krb5/$(ARCH64)/libkadm5clnt.so \
+    target=./libkadm5clnt.so.1
 link path=usr/lib/krb5/libkadm5clnt.so target=./libkadm5clnt.so.1
 link path=usr/lib/krb5/libss.so target=libss.so.1
 link path=usr/lib/krb5/plugins/preauth/pkinit.so target=pkinit.so.1
 link path=usr/lib/libkrb5.so target=./libkrb5.so.1
-link path=usr/lib/security/$(ARCH64)/pam_krb5.so target=./pam_krb5.so.1
-link path=usr/lib/security/$(ARCH64)/pam_krb5_migrate.so \
+$(BUILD64)link path=usr/lib/security/$(ARCH64)/pam_krb5.so \
+    target=./pam_krb5.so.1
+$(BUILD64)link path=usr/lib/security/$(ARCH64)/pam_krb5_migrate.so \
     target=./pam_krb5_migrate.so.1
 link path=usr/lib/security/pam_krb5.so target=./pam_krb5.so.1
 link path=usr/lib/security/pam_krb5_migrate.so target=./pam_krb5_migrate.so.1
 depend fmri=service/security/gss type=require