# HG changeset patch
# User Ivo Raisr <ivo.raisr@oracle.com>
# Date 1480123000 28800
# Node ID 688f73f0b72dd2a4ecf0c1b1bbc419f41ed9c27c
# Parent  a9c2f3d5948541beda2363964506fefdd636edc7
PSARC/2016/232 CACkey Smartcard PKCS#11 provider
24657593 cackey needs to deliver 32-bit libraries

diff -r a9c2f3d59485 -r 688f73f0b72d components/cackey/Makefile
--- a/components/cackey/Makefile	Mon Dec 05 07:07:58 2016 -0800
+++ b/components/cackey/Makefile	Fri Nov 25 17:16:40 2016 -0800
@@ -42,7 +42,6 @@
 
 include ../../make-rules/shared-macros.mk
 
-BITS=			64
 COMPONENT_NAME=		CACKey
 COMPONENT_VERSION=	0.7.4
 COMPONENT_PROJECT_URL=	http://www.rkeene.org/projects/info/wiki/161
@@ -76,11 +75,11 @@
 COMPONENT_PREP_ACTION +=(cd $(@D); autoreconf);
 
 # common targets
-configure:	$(CONFIGURE_64)
+configure:	$(CONFIGURE_32_and_64)
 
-build:		$(BUILD_64)
+build:		$(BUILD_32_and_64)
 
-install:	$(INSTALL_64)
+install:	$(INSTALL_32_and_64)
 
 test:		$(NO_TEST)
 
diff -r a9c2f3d59485 -r 688f73f0b72d components/cackey/cackey.p5m
--- a/components/cackey/cackey.p5m	Mon Dec 05 07:07:58 2016 -0800
+++ b/components/cackey/cackey.p5m	Fri Nov 25 17:16:40 2016 -0800
@@ -40,5 +40,7 @@
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 file path=usr/lib/$(MACH64)/libcackey.so
 link path=usr/lib/$(MACH64)/libcackey.so.1 target=libcackey.so
+file path=usr/lib/libcackey.so
+link path=usr/lib/libcackey.so.1 target=libcackey.so
 license cackey.license \
     license="MIT, X11, GPLv2, LGPLv2.1, MPLv2, Lockheed, RSA, Internet Society"