From def938dfc8b3a256aeea9958eb1c55fc42eafb36 Mon Sep 17 00:00:00 2001 From: Lauri Tirkkonen Date: Tue, 17 Sep 2019 00:14:14 +0300 Subject: [PATCH] move 32-bit libs to lib/i386 subdirs & 64-bit libs to lib/ the most important exception: /lib/ld.so.1 and /lib/amd64/ld.so.1 remain, since they are special (PT_INTERP path is hardcoded in executables). however, this diff moves the actual files into /usr/libexec/ld.so and /usr/libexec/i386/ld.so, leaving symlinks in the old locations, for transition. only libraries in paths that are part of the runtime linker configuration are affected by this diff, ie. programs specifically dlopen()ing or otherwise interacting with libraries in subdirectories, such as /usr/lib/security, are mostly unmodified and still using the amd64 subdir for 64-bit libs. they can be dealt with on a case-by-case basis later. exceptions already converted are: - /usr/lib/scsi/plugins/* - /usr/lib/smedia some dirs are switched to 64-bit only as part of this diff, including: - cmd/fm - cmd/passwd - cmd/prtdiag - cmd/abi - cmd/hal - cmd/policykit - lib/policykit --- share/mk/config.mk | 5 +- usr/src/Makefile.master | 19 +- usr/src/Makefile.master.64 | 2 +- usr/src/Targetdirs | 724 ++++++++-------- usr/src/cmd/Makefile.cmd | 12 +- usr/src/cmd/abi/appcert/scripts/Makefile | 2 +- usr/src/cmd/abi/spectrans/Makefile.cmd | 3 +- usr/src/cmd/abi/spectrans/parser/Makefile.targ | 1 + usr/src/cmd/ahciem/Makefile | 2 +- usr/src/cmd/bc/Makefile | 2 +- usr/src/cmd/cmd-inet/lib/ipmgmtd/Makefile | 2 +- usr/src/cmd/cmd-inet/lib/nwamd/Makefile | 2 +- usr/src/cmd/cmd-inet/usr.bin/telnet/Makefile | 2 +- usr/src/cmd/cmd-inet/usr.lib/Makefile.lib | 2 +- usr/src/cmd/cmd-inet/usr.sbin/Makefile | 2 +- usr/src/cmd/cmd-inet/usr.sbin/ipqosconf/Makefile | 2 +- usr/src/cmd/devfsadm/Makefile.com | 2 +- usr/src/cmd/diff/Makefile | 2 +- usr/src/cmd/diskinfo/Makefile | 1 + usr/src/cmd/dlutil/Makefile | 4 +- usr/src/cmd/fm/dicts/Makefile | 10 +- usr/src/cmd/fm/fmadm/Makefile.com | 8 +- usr/src/cmd/fm/fmadm/i386/Makefile | 1 + usr/src/cmd/fm/fmd/Makefile.fmd | 10 +- usr/src/cmd/fm/fmd/i386/Makefile | 1 + usr/src/cmd/fm/fmdump/Makefile.com | 6 +- usr/src/cmd/fm/fmdump/i386/Makefile | 1 + usr/src/cmd/fm/fminject/Makefile.com | 6 +- usr/src/cmd/fm/fminject/i386/Makefile | 1 + usr/src/cmd/fm/fmstat/Makefile.com | 4 +- usr/src/cmd/fm/fmstat/i386/Makefile | 1 + usr/src/cmd/fm/fmtopo/Makefile.com | 6 +- usr/src/cmd/fm/fmtopo/i386/Makefile | 1 + usr/src/cmd/fm/ipmitopo/Makefile.com | 4 +- usr/src/cmd/fm/ipmitopo/i386/Makefile | 1 + usr/src/cmd/fm/modules/Makefile.plugin | 11 +- .../cmd/fm/modules/common/cpumem-retire/Makefile | 2 +- .../cmd/fm/modules/common/disk-monitor/Makefile | 2 +- .../cmd/fm/modules/common/disk-transport/Makefile | 6 +- usr/src/cmd/fm/modules/common/eversholt/Makefile | 2 +- .../fm/modules/common/ext-event-transport/Makefile | 6 +- .../fm/modules/common/sensor-transport/Makefile | 6 +- .../fm/modules/common/ses-log-transport/Makefile | 6 +- .../sw-diag-response/software-diagnosis/Makefile | 6 +- .../sw-diag-response/software-response/Makefile | 6 +- .../cmd/fm/modules/common/zfs-diagnosis/Makefile | 2 +- usr/src/cmd/fm/modules/common/zfs-retire/Makefile | 2 +- usr/src/cmd/fm/notify/smtp-notify/Makefile.com | 2 +- usr/src/cmd/fm/notify/smtp-notify/i386/Makefile | 1 + usr/src/cmd/fm/schemes/Makefile.com | 4 +- usr/src/cmd/fm/schemes/Makefile.targ | 2 +- usr/src/cmd/fm/schemes/cpu/amd64/Makefile | 4 +- usr/src/cmd/fm/schemes/cpu/i386/Makefile | 4 +- usr/src/cmd/fm/schemes/dev/amd64/Makefile | 2 +- usr/src/cmd/fm/schemes/dev/i386/Makefile | 2 +- usr/src/cmd/fm/schemes/hc/amd64/Makefile | 2 +- usr/src/cmd/fm/schemes/hc/i386/Makefile | 2 +- usr/src/cmd/fm/schemes/mem/amd64/Makefile | 4 +- usr/src/cmd/fm/schemes/mem/i386/Makefile | 4 +- usr/src/cmd/fm/schemes/mod/amd64/Makefile | 4 +- usr/src/cmd/fm/schemes/mod/i386/Makefile | 4 +- usr/src/cmd/fm/schemes/pkg/amd64/Makefile | 4 +- usr/src/cmd/fm/schemes/pkg/i386/Makefile | 4 +- usr/src/cmd/fm/schemes/svc/amd64/Makefile | 2 +- usr/src/cmd/fm/schemes/svc/i386/Makefile | 2 +- usr/src/cmd/fm/schemes/sw/amd64/Makefile | 2 +- usr/src/cmd/fm/schemes/sw/i386/Makefile | 2 +- usr/src/cmd/fs.d/Makefile.fstype | 4 +- .../cmd/fwflash/plugins/transport/Makefile.targ | 8 +- usr/src/cmd/geniconvtbl/Makefile.com | 8 +- usr/src/cmd/geniconvtbl/samples/Makefile | 2 +- usr/src/cmd/gss/gsscred_clean/Makefile | 1 + usr/src/cmd/gss/gssd/Makefile | 1 + usr/src/cmd/hal/Makefile | 1 + usr/src/cmd/hal/Makefile.hal | 4 +- usr/src/cmd/hal/addons/acpi/Makefile | 1 + usr/src/cmd/hal/addons/cpufreq/Makefile | 1 + usr/src/cmd/hal/addons/storage/Makefile | 1 + usr/src/cmd/hal/fdi/Makefile | 1 + usr/src/cmd/hal/hald-runner/Makefile | 1 + usr/src/cmd/hal/hald/Makefile | 1 + usr/src/cmd/hal/hald/solaris/Makefile | 1 + usr/src/cmd/hal/probing/acpi/Makefile | 1 + usr/src/cmd/hal/probing/printer/Makefile | 1 + usr/src/cmd/hal/probing/storage/Makefile | 1 + usr/src/cmd/hal/probing/volume/Makefile | 1 + usr/src/cmd/hal/probing/xkb/Makefile | 1 + usr/src/cmd/hal/tools/Makefile | 1 + usr/src/cmd/hal/tools/illumos/Makefile | 1 + usr/src/cmd/hotplugd/Makefile | 2 +- usr/src/cmd/intrd/Makefile | 2 +- usr/src/cmd/ipf/tools/Makefile | 2 +- usr/src/cmd/ipf/tools/Makefile.tools | 2 +- usr/src/cmd/krb5/kadmin/server/Makefile | 2 +- usr/src/cmd/krb5/slave/Makefile | 2 +- usr/src/cmd/listen/Makefile | 2 +- usr/src/cmd/loadkeys/Makefile | 4 +- usr/src/cmd/mdb/intel/amd64/kmdb/Makefile | 4 +- usr/src/cmd/msgfmt/Makefile | 2 +- usr/src/cmd/ndmpd/Makefile | 2 +- usr/src/cmd/passwd/Makefile | 1 + usr/src/cmd/pfexecd/Makefile | 2 +- usr/src/cmd/policykit/Makefile | 1 + usr/src/cmd/power/Makefile | 2 +- usr/src/cmd/priocntl/Makefile | 2 +- usr/src/cmd/prtdiag/Makefile.com | 1 + usr/src/cmd/rcm_daemon/Makefile.com | 22 +- usr/src/cmd/rmvolmgr/Makefile | 2 +- usr/src/cmd/rpcsvc/Makefile | 2 +- usr/src/cmd/saf/Makefile | 2 +- usr/src/cmd/savecore/amd64/Makefile | 4 +- usr/src/cmd/savecore/i386/Makefile | 4 +- usr/src/cmd/scsi/sestopo/Makefile.com | 4 +- usr/src/cmd/scsi/smp/Makefile.com | 4 +- usr/src/cmd/sgs/Makefile.var | 6 +- usr/src/cmd/sgs/crle/common/crle.msg | 4 +- usr/src/cmd/sgs/lddstub/Makefile.targ | 5 + usr/src/cmd/sgs/lddstub/amd64/Makefile | 2 +- usr/src/cmd/sgs/lddstub/i386/Makefile | 2 +- usr/src/cmd/sgs/ldprof/Makefile.com | 2 +- usr/src/cmd/sgs/ldprof/amd64/Makefile | 2 +- usr/src/cmd/sgs/libconv/common/lddstub.msg | 12 +- usr/src/cmd/sgs/libld/common/globals.c | 4 +- usr/src/cmd/sgs/libld/common/ldmain.c | 4 +- usr/src/cmd/sgs/libldstab/amd64/Makefile | 2 +- usr/src/cmd/sgs/libldstab/i386/Makefile | 2 + usr/src/cmd/sgs/rtld/Makefile.com | 9 +- usr/src/cmd/sgs/rtld/Makefile.targ | 4 + usr/src/cmd/sgs/rtld/common/config_elf.c | 6 +- usr/src/cmd/sgs/rtld/common/elf.c | 4 +- usr/src/cmd/smbsrv/bind-helper/Makefile | 2 +- usr/src/cmd/smbsrv/dtrace/Makefile | 2 +- usr/src/cmd/smbsrv/smbd/Makefile | 2 +- usr/src/cmd/smserverd/Makefile | 2 +- usr/src/cmd/spell/Makefile | 2 +- usr/src/cmd/svc/configd/Makefile | 2 +- usr/src/cmd/svc/startd/Makefile | 4 +- usr/src/cmd/syslogd/Makefile.com | 4 +- usr/src/cmd/ttymon/Makefile | 2 +- usr/src/cmd/vscan/vscand/Makefile | 2 +- usr/src/cmd/xhci/Makefile | 2 +- usr/src/cmd/ypcmd/Makefile | 4 +- usr/src/cmd/ypcmd/yp2lscripts/Makefile | 2 +- usr/src/cmd/ypcmd/yppasswd/Makefile | 2 +- usr/src/cmd/ypcmd/ypupdated/Makefile | 2 +- usr/src/cmd/zfs/Makefile | 2 +- usr/src/cmd/zoneadmd/Makefile | 2 +- usr/src/cmd/zonestat/zonestatd/Makefile | 2 +- usr/src/common/mapfiles/amd64/Makefile | 55 +- usr/src/common/mapfiles/i386/Makefile | 16 +- usr/src/lib/Makefile.lib | 8 +- usr/src/lib/crt/Makefile.com | 4 +- usr/src/lib/fm/Makefile.lib | 8 +- usr/src/lib/fm/libfmd_msg/Makefile.com | 4 +- usr/src/lib/fm/libfmevent/Makefile | 4 +- usr/src/lib/fm/libfmevent/Makefile.com | 8 +- usr/src/lib/fm/libfmevent/amd64/Makefile | 2 +- usr/src/lib/fm/libfmevent/i386/Makefile | 2 +- usr/src/lib/fm/libfmnotify/amd64/Makefile | 4 +- usr/src/lib/fm/libfmnotify/i386/Makefile | 4 +- usr/src/lib/fm/topo/modules/Makefile.plugin | 4 +- usr/src/lib/fm/topo/modules/common/ses/Makefile | 2 +- usr/src/lib/gss_mechs/mech_dh/backend/Makefile.com | 4 +- usr/src/lib/gss_mechs/mech_dh/dh1024/Makefile.com | 4 +- usr/src/lib/gss_mechs/mech_dh/dh192/Makefile.com | 4 +- usr/src/lib/gss_mechs/mech_dh/dh640/Makefile.com | 4 +- usr/src/lib/gss_mechs/mech_krb5/Makefile | 2 +- usr/src/lib/gss_mechs/mech_krb5/Makefile.com | 4 +- usr/src/lib/gss_mechs/mech_krb5/Makefile.mech_krb5 | 6 +- usr/src/lib/gss_mechs/mech_spnego/Makefile.com | 4 +- usr/src/lib/hal/Makefile.com | 4 +- usr/src/lib/krb5/kadm5/srv/Makefile.com | 2 +- usr/src/lib/krb5/plugins/kdb/ldap/Makefile.com | 4 +- usr/src/lib/libc/Makefile | 8 +- .../lib/libkmf/mappers/kmf_mapper_cn/Makefile.com | 4 +- usr/src/lib/libkmf/plugins/kmf_nss/Makefile.com | 4 +- .../lib/libkmf/plugins/kmf_openssl/Makefile.com | 4 +- usr/src/lib/libkmf/plugins/kmf_pkcs11/Makefile.com | 4 +- usr/src/lib/libsmedia/library/common/l_misc.c | 4 +- usr/src/lib/libsmedia/plugins/Makefile.com | 4 +- usr/src/lib/pam_modules/Makefile.pam_modules | 3 + .../lib/pam_modules/authtok_check/amd64/Makefile | 2 +- .../lib/pam_modules/authtok_check/i386/Makefile | 2 +- usr/src/lib/pam_modules/authtok_get/amd64/Makefile | 2 +- usr/src/lib/pam_modules/authtok_get/i386/Makefile | 2 +- .../lib/pam_modules/authtok_store/amd64/Makefile | 2 +- .../lib/pam_modules/authtok_store/i386/Makefile | 2 +- usr/src/lib/pam_modules/dhkeys/amd64/Makefile | 2 +- usr/src/lib/pam_modules/dhkeys/i386/Makefile | 2 +- usr/src/lib/pam_modules/passwd_auth/amd64/Makefile | 2 +- usr/src/lib/pam_modules/passwd_auth/i386/Makefile | 2 +- usr/src/lib/pam_modules/smb/amd64/Makefile | 2 +- usr/src/lib/pam_modules/smb/i386/Makefile | 2 +- .../lib/pam_modules/unix_account/amd64/Makefile | 2 +- usr/src/lib/pam_modules/unix_account/i386/Makefile | 2 +- usr/src/lib/pam_modules/unix_auth/amd64/Makefile | 2 +- usr/src/lib/pam_modules/unix_auth/i386/Makefile | 2 +- usr/src/lib/policykit/Makefile | 1 + usr/src/lib/policykit/libpolkit/Makefile | 2 +- usr/src/lib/policykit/libpolkit/Makefile.com | 2 +- .../policykit/libpolkit/{i386 => amd64}/Makefile | 3 +- usr/src/lib/scsi/Makefile.rootdirs | 12 +- usr/src/lib/scsi/libscsi/Makefile.com | 4 +- usr/src/lib/scsi/libscsi/common/scsi_engine.c | 5 +- usr/src/lib/scsi/libses/Makefile.defs | 12 +- usr/src/lib/scsi/libses/Makefile.defs.64 | 2 +- usr/src/lib/scsi/libses/common/ses_plugin.c | 5 +- usr/src/lib/scsi/libsmp/Makefile.com | 4 +- usr/src/lib/scsi/libsmp/common/smp_engine.c | 5 +- usr/src/lib/scsi/libsmp/common/smp_plugin.c | 5 +- .../lib/scsi/plugins/scsi/engines/Makefile.engine | 8 +- usr/src/lib/scsi/plugins/ses/Makefile.lib | 8 +- usr/src/lib/scsi/plugins/smp/Makefile.lib | 8 +- usr/src/pkg/manifests/developer-build-make.mf | 2 +- usr/src/pkg/manifests/developer-dtrace.inc | 8 +- usr/src/pkg/manifests/developer-linker.mf | 16 +- usr/src/pkg/manifests/diagnostic-cpu-counters.mf | 10 +- usr/src/pkg/manifests/driver-network-srpt.inc | 6 +- usr/src/pkg/manifests/install-beadm.inc | 6 +- usr/src/pkg/manifests/library-libedit.inc | 8 +- usr/src/pkg/manifests/library-libressl.inc | 20 +- usr/src/pkg/manifests/library-libtecla.inc | 6 +- usr/src/pkg/manifests/library-ncurses.inc | 30 +- usr/src/pkg/manifests/library-pcap.mf | 6 +- usr/src/pkg/manifests/network-bridging.mf | 2 +- usr/src/pkg/manifests/network-ipd.mf | 6 +- usr/src/pkg/manifests/network-iscsi-target.mf | 6 +- usr/src/pkg/manifests/service-fault-management.mf | 80 +- usr/src/pkg/manifests/service-file-system-smb.inc | 2 +- usr/src/pkg/manifests/service-hal.mf | 20 +- usr/src/pkg/manifests/service-network-dns-mdns.mf | 8 +- .../manifests/service-network-load-balancer-ilb.mf | 6 +- usr/src/pkg/manifests/service-resource-pools.inc | 6 +- .../pkg/manifests/service-security-kerberos-5.inc | 16 +- usr/src/pkg/manifests/service-storage-ndmp.mf | 6 +- .../manifests/service-storage-removable-media.mf | 14 +- usr/src/pkg/manifests/storage-stmf.mf | 6 +- usr/src/pkg/manifests/system-core-os.mf | 8 +- .../manifests/system-extended-system-utilities.mf | 6 +- usr/src/pkg/manifests/system-ficl.inc | 6 +- usr/src/pkg/manifests/system-file-system-smb.inc | 8 +- usr/src/pkg/manifests/system-file-system-zfs.inc | 36 +- ...system-kernel-dynamic-reconfiguration-i86pc.inc | 2 +- usr/src/pkg/manifests/system-kernel-platform.inc | 2 +- usr/src/pkg/manifests/system-library-c-runtime.mf | 20 +- .../pkg/manifests/system-library-libdiskmgt.inc | 6 +- usr/src/pkg/manifests/system-library-libfcoe.mf | 6 +- usr/src/pkg/manifests/system-library-math.inc | 28 +- .../system-library-security-gss-diffie-hellman.inc | 16 +- .../system-library-security-gss-spnego.inc | 6 +- .../pkg/manifests/system-library-security-gss.inc | 10 +- .../manifests/system-library-security-libsasl.inc | 8 +- .../manifests/system-library-security-rpcsec.mf | 6 +- .../system-library-storage-fibre-channel-hbaapi.mf | 6 +- ...stem-library-storage-fibre-channel-libsun_fc.mf | 6 +- .../system-library-storage-ima-header-ima.mf | 6 +- .../pkg/manifests/system-library-storage-ima.mf | 6 +- .../manifests/system-library-storage-libmpapi.mf | 6 +- .../system-library-storage-libmpscsi_vhci.mf | 6 +- .../system-library-storage-scsi-plugins.inc | 14 +- usr/src/pkg/manifests/system-library.inc | 954 +++++++++++---------- .../system-management-wbem-data-management.mf | 5 +- usr/src/pkg/manifests/system-network-nis.mf | 4 +- .../pkg/manifests/system-network-routing-vrrp.mf | 4 +- .../manifests/system-network-udapl-udapl-tavor.mf | 4 +- usr/src/pkg/manifests/system-network-udapl.mf | 6 +- .../pkg/manifests/system-remote-shared-memory.mf | 6 +- usr/src/pkg/manifests/system-storage-sasinfo.mf | 10 +- usr/src/pkg/manifests/system-zones-brand-sn1.mf | 4 +- usr/src/pkg/manifests/system-zones.inc | 8 +- 270 files changed, 1529 insertions(+), 1518 deletions(-) rewrite usr/src/common/mapfiles/amd64/Makefile (100%) rename usr/src/lib/policykit/libpolkit/{i386 => amd64}/Makefile (90%) diff --git a/share/mk/config.mk b/share/mk/config.mk index e124abde8b..ee693f588b 100644 --- a/share/mk/config.mk +++ b/share/mk/config.mk @@ -2,9 +2,8 @@ MK_ARCHIVE?= no MK_PROFILE?= no MK_PICLIB?= no -.if ${MACHINE} == "amd64" -LIBDIR?= ${libprefix}/lib/amd64 -.elif ${MACHINE} == "i386" +.if ${MACHINE} == "i386" +LIBDIR?= ${libprefix}/lib/i386 CFLAGS+= -m32 LDFLAGS+= -m32 AFLAGS+= -m32 diff --git a/usr/src/Makefile.master b/usr/src/Makefile.master index 4798c36359..c22458e2b3 100644 --- a/usr/src/Makefile.master +++ b/usr/src/Makefile.master @@ -77,8 +77,8 @@ BUILD_TOOLS= /opt ONBLD_TOOLS= $(BUILD_TOOLS)/onbld GNUC_ROOT= /opt/gcc/4.4.4 -GCCLIBDIR= $(GNUC_ROOT)/lib -GCCLIBDIR64= $(GNUC_ROOT)/lib/$(MACH64) +GCCLIBDIR= $(GNUC_ROOT)/lib/$(MACH32) +GCCLIBDIR64= $(GNUC_ROOT)/lib DOCBOOK_XSL_ROOT= /usr/share/sgml/docbook/xsl-stylesheets @@ -527,15 +527,16 @@ MAPFILE.INT = mapfile-intf # LDLIBS32 and LDLIBS64 can be set in the environment to override the following # assignments. # -LDLIBS32 = $(ENVLDLIBS1) $(ENVLDLIBS2) $(ENVLDLIBS3) -LDLIBS32 += $(ADJUNCT_PROTO:%=-L%/usr/lib -L%/lib) +LDLIBS64 = $(ENVLDLIBS1) $(ENVLDLIBS2) $(ENVLDLIBS3) +LDLIBS32 = $(ENVLDLIBS1:%=%/$(MACH32)) \ + $(ENVLDLIBS2:%=%/$(MACH32)) \ + $(ENVLDLIBS3:%=%/$(MACH32)) + +LDLIBS32 += $(ADJUNCT_PROTO:%=-L%/usr/lib/$(MACH32) -L%/lib/$(MACH32)) LDLIBS.cmd = $(LDLIBS32) LDLIBS.lib = $(LDLIBS32) -LDLIBS64 = $(ENVLDLIBS1:%=%/$(MACH64)) \ - $(ENVLDLIBS2:%=%/$(MACH64)) \ - $(ENVLDLIBS3:%=%/$(MACH64)) -LDLIBS64 += $(ADJUNCT_PROTO:%=-L%/usr/lib/$(MACH64) -L%/lib/$(MACH64)) +LDLIBS64 += $(ADJUNCT_PROTO:%=-L%/usr/lib -L%/lib) # # Define compilation macros. @@ -555,7 +556,7 @@ COMPILE64.b= $(ELFWRAP) $(ELFWRAP_FLAGS$(CLASS)) # # Link time macros # -CCNEEDED = -L$(GCCLIBDIR) -lstdc++ -lgcc +CCNEEDED = -L$(GCCLIBDIR) -lstdc++ -lgcc -R$(GCCLIBDIR) CCEXTNEEDED = $(CCNEEDED) LINK.c= $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) diff --git a/usr/src/Makefile.master.64 b/usr/src/Makefile.master.64 index 3f6e9cdcaf..89b066b557 100644 --- a/usr/src/Makefile.master.64 +++ b/usr/src/Makefile.master.64 @@ -69,7 +69,7 @@ BUILD.SO= $(CC) $(CFLAGS) -o $@ $(GSHARED) $(DYNFLAGS) \ # MAPFILECLASS= -64 -CCNEEDED = -L$(GCCLIBDIR) -lstdc++ -lgcc +CCNEEDED = -L$(GCCLIBDIR) -lstdc++ -lgcc -R$(GCCLIBDIR) BUILDCCC.SO= $(CCC) $(CCFLAGS) -o $@ $(GSHARED) $(DYNFLAGS) \ $(PICS) $(EXTPICS) $(LDLIBS) $(CCNEEDED) diff --git a/usr/src/Targetdirs b/usr/src/Targetdirs index fe37300fe2..1fa31d5c04 100644 --- a/usr/src/Targetdirs +++ b/usr/src/Targetdirs @@ -153,7 +153,6 @@ DIRS= \ /lib \ /lib/crypto \ /lib/inet \ - /lib/fm \ /lib/secure \ /lib/svc \ /lib/svc/bin \ @@ -240,17 +239,18 @@ DIRS= \ /usr/lib/inet \ /usr/lib/inet/ilb \ /usr/lib/krb5 \ - /usr/lib/link_audit \ + /usr/lib/link_audit/$(MACH32) \ /usr/lib/lwp \ /usr/lib/mdb \ /usr/lib/mdb/kvm \ /usr/lib/mdb/proc \ /usr/lib/nfs \ + /usr/libexec \ + /usr/libexec/$(MACH32) \ /usr/net \ /usr/net/servers \ $(PYTHON2_DIRS) \ /usr/lib/rcap \ - /usr/lib/rcap/$(MACH32) \ /usr/lib/saf \ /usr/lib/sasl \ /usr/lib/scsi \ @@ -334,7 +334,16 @@ DIRS= \ /var/svc/manifest/platform \ /var/svc/manifest/site \ /var/svc/profile \ - /var/tmp + /var/tmp \ + /lib/fm/$(MACH32) \ + /lib/secure/$(MACH32) \ + /lib/crypto/$(MACH32) \ + /usr/lib/$(MACH32) \ + /usr/lib/$(MACH32)/gss \ + /usr/lib/$(MACH64) \ + /usr/lib/fm/$(MACH32) \ + /usr/lib/rcap/$(MACH32) \ + /usr/lib/scsi/$(MACH32) amd64_DIRS64= \ /platform/amd64 @@ -343,15 +352,8 @@ DIRS64= \ $($(MACH64)_DIRS64) \ /lib/$(MACH32) \ /lib/$(MACH64) \ - /lib/crypto/$(MACH32) \ - /lib/crypto/$(MACH64) \ /lib/fm/$(MACH64) \ - /lib/secure/$(MACH32) \ - /lib/secure/$(MACH64) \ /usr/bin/$(MACH64) \ - /usr/lib/$(MACH32) \ - /usr/lib/$(MACH64) \ - /usr/lib/$(MACH64)/gss \ /usr/lib/brand/sn1/$(MACH64) \ /usr/lib/elfedit/$(MACH32) \ /usr/lib/elfedit/$(MACH64) \ @@ -360,7 +362,7 @@ DIRS64= \ /usr/lib/fs/smb/$(MACH64) \ /usr/lib/inet/$(MACH64) \ /usr/lib/krb5/$(MACH64) \ - /usr/lib/link_audit/$(MACH64) \ + /usr/lib/link_audit \ /usr/lib/lwp/$(MACH32) \ /usr/lib/lwp/$(MACH64) \ /usr/lib/mdb/kvm/$(MACH64) \ @@ -477,7 +479,7 @@ $(ROOT)/lib/secure/32:= LINKDEST=i386 $(ROOT)/dev/stdin:= LINKDEST=fd/0 $(ROOT)/dev/stdout:= LINKDEST=fd/1 $(ROOT)/dev/stderr:= LINKDEST=fd/2 -$(ROOT)/etc/lib/ld.so.1:= LINKDEST=../../lib/ld.so.1 +$(ROOT)/etc/lib/ld.so.1:= LINKDEST=../../usr/libexec/$(MACH32)/ld.so $(ROOT)/etc/lib/libdl.so.1:= LINKDEST=../../lib/libdl.so.1 $(ROOT)/etc/lib/nss_files.so.1:= LINKDEST=../../lib/nss_files.so.1 $(ROOT)/platform/i86pc:= LINKDEST=. @@ -533,7 +535,7 @@ $(ROOT)/lib/libposix4.so.1:= REALPATH=librt.so.1 $(ROOT)/lib/libposix4.so:= REALPATH=libposix4.so.1 $(ROOT)/lib/libthread_db.so.1:= REALPATH=libc_db.so.1 $(ROOT)/lib/libthread_db.so:= REALPATH=libc_db.so.1 -$(ROOT)/usr/lib/ld.so.1:= REALPATH=../../lib/ld.so.1 +$(ROOT)/usr/lib/ld.so.1:= REALPATH=../libexec/$(MACH32)/ld.so $(ROOT)/usr/lib/libadm.so.1:= REALPATH=../../lib/libadm.so.1 $(ROOT)/usr/lib/libadm.so:= REALPATH=../../lib/libadm.so.1 $(ROOT)/usr/lib/libaio.so.1:= REALPATH=../../lib/libaio.so.1 @@ -658,242 +660,242 @@ $(ROOT)/usr/lib/nss_user.so.1:= REALPATH=../../lib/nss_user.so.1 $(ROOT)/usr/lib/fm/libfmevent.so.1:= REALPATH=../../../lib/fm/libfmevent.so.1 $(ROOT)/usr/lib/fm/libfmevent.so:= REALPATH=../../../lib/fm/libfmevent.so.1 -$(ROOT)/lib/$(MACH64)/libposix4.so.1:= \ +$(ROOT)/lib/$(MACH32)/libposix4.so.1:= \ REALPATH=librt.so.1 -$(ROOT)/lib/$(MACH64)/libposix4.so:= \ +$(ROOT)/lib/$(MACH32)/libposix4.so:= \ REALPATH=libposix4.so.1 -$(ROOT)/lib/$(MACH64)/libthread_db.so.1:= \ +$(ROOT)/lib/$(MACH32)/libthread_db.so.1:= \ REALPATH=libc_db.so.1 -$(ROOT)/lib/$(MACH64)/libthread_db.so:= \ +$(ROOT)/lib/$(MACH32)/libthread_db.so:= \ REALPATH=libc_db.so.1 $(ROOT)/usr/lib/$(MACH64)/ld.so.1:= \ - REALPATH=../../../lib/$(MACH64)/ld.so.1 -$(ROOT)/usr/lib/$(MACH64)/libadm.so.1:= \ - REALPATH=../../../lib/$(MACH64)/libadm.so.1 -$(ROOT)/usr/lib/$(MACH64)/libadm.so:= \ - REALPATH=../../../lib/$(MACH64)/libadm.so.1 -$(ROOT)/usr/lib/$(MACH64)/libaio.so.1:= \ - REALPATH=../../../lib/$(MACH64)/libaio.so.1 -$(ROOT)/usr/lib/$(MACH64)/libaio.so:= \ - REALPATH=../../../lib/$(MACH64)/libaio.so.1 -$(ROOT)/usr/lib/$(MACH64)/libavl.so.1:= \ - REALPATH=../../../lib/$(MACH64)/libavl.so.1 -$(ROOT)/usr/lib/$(MACH64)/libavl.so:= \ - REALPATH=../../../lib/$(MACH64)/libavl.so.1 -$(ROOT)/usr/lib/$(MACH64)/libc.so.1:= \ - REALPATH=../../../lib/$(MACH64)/libc.so.1 -$(ROOT)/usr/lib/$(MACH64)/libc.so:= \ - REALPATH=../../../lib/$(MACH64)/libc.so.1 -$(ROOT)/usr/lib/$(MACH64)/libc_db.so.1:= \ - REALPATH=../../../lib/$(MACH64)/libc_db.so.1 -$(ROOT)/usr/lib/$(MACH64)/libc_db.so:= \ - REALPATH=../../../lib/$(MACH64)/libc_db.so.1 -$(ROOT)/usr/lib/$(MACH64)/libcmdutils.so.1:= \ - REALPATH=../../../lib/$(MACH64)/libcmdutils.so.1 -$(ROOT)/usr/lib/$(MACH64)/libcmdutils.so:= \ - REALPATH=../../../lib/$(MACH64)/libcmdutils.so.1 -$(ROOT)/usr/lib/$(MACH64)/libcontract.so.1:= \ - REALPATH=../../../lib/$(MACH64)/libcontract.so.1 -$(ROOT)/usr/lib/$(MACH64)/libcontract.so:= \ - REALPATH=../../../lib/$(MACH64)/libcontract.so.1 -$(ROOT)/usr/lib/$(MACH64)/libctf.so.1:= \ - REALPATH=../../../lib/$(MACH64)/libctf.so.1 -$(ROOT)/usr/lib/$(MACH64)/libctf.so:= \ - REALPATH=../../../lib/$(MACH64)/libctf.so.1 -$(ROOT)/usr/lib/$(MACH64)/libdevice.so.1:= \ - REALPATH=../../../lib/$(MACH64)/libdevice.so.1 -$(ROOT)/usr/lib/$(MACH64)/libdevice.so:= \ - REALPATH=../../../lib/$(MACH64)/libdevice.so.1 -$(ROOT)/usr/lib/$(MACH64)/libdevid.so.1:= \ - REALPATH=../../../lib/$(MACH64)/libdevid.so.1 -$(ROOT)/usr/lib/$(MACH64)/libdevid.so:= \ - REALPATH=../../../lib/$(MACH64)/libdevid.so.1 -$(ROOT)/usr/lib/$(MACH64)/libdevinfo.so.1:= \ - REALPATH=../../../lib/$(MACH64)/libdevinfo.so.1 -$(ROOT)/usr/lib/$(MACH64)/libdevinfo.so:= \ - REALPATH=../../../lib/$(MACH64)/libdevinfo.so.1 -$(ROOT)/usr/lib/$(MACH64)/libdhcputil.so.1:= \ - REALPATH=../../../lib/$(MACH64)/libdhcputil.so.1 -$(ROOT)/usr/lib/$(MACH64)/libdhcputil.so:= \ - REALPATH=../../../lib/$(MACH64)/libdhcputil.so.1 -$(ROOT)/usr/lib/$(MACH64)/libdl.so.1:= \ - REALPATH=../../../lib/$(MACH64)/libdl.so.1 -$(ROOT)/usr/lib/$(MACH64)/libdl.so:= \ - REALPATH=../../../lib/$(MACH64)/libdl.so.1 -$(ROOT)/usr/lib/$(MACH64)/libdlpi.so.1:= \ - REALPATH=../../../lib/$(MACH64)/libdlpi.so.1 -$(ROOT)/usr/lib/$(MACH64)/libdlpi.so:= \ - REALPATH=../../../lib/$(MACH64)/libdlpi.so.1 -$(ROOT)/usr/lib/$(MACH64)/libdoor.so.1:= \ - REALPATH=../../../lib/$(MACH64)/libdoor.so.1 -$(ROOT)/usr/lib/$(MACH64)/libdoor.so:= \ - REALPATH=../../../lib/$(MACH64)/libdoor.so.1 -$(ROOT)/usr/lib/$(MACH64)/libdwarf.so.1:= \ - REALPATH=../../../lib/$(MACH64)/libdwarf.so.1 -$(ROOT)/usr/lib/$(MACH64)/libdwarf.so:= \ - REALPATH=../../../lib/$(MACH64)/libdwarf.so.1 -$(ROOT)/usr/lib/$(MACH64)/libefi.so.1:= \ - REALPATH=../../../lib/$(MACH64)/libefi.so.1 -$(ROOT)/usr/lib/$(MACH64)/libefi.so:= \ - REALPATH=../../../lib/$(MACH64)/libefi.so.1 -$(ROOT)/usr/lib/$(MACH64)/libelf.so.1:= \ - REALPATH=../../../lib/$(MACH64)/libelf.so.1 -$(ROOT)/usr/lib/$(MACH64)/libelf.so:= \ - REALPATH=../../../lib/$(MACH64)/libelf.so.1 -$(ROOT)/usr/lib/$(MACH64)/libgen.so.1:= \ - REALPATH=../../../lib/$(MACH64)/libgen.so.1 -$(ROOT)/usr/lib/$(MACH64)/libgen.so:= \ - REALPATH=../../../lib/$(MACH64)/libgen.so.1 -$(ROOT)/usr/lib/$(MACH64)/libinetutil.so.1:= \ - REALPATH=../../../lib/$(MACH64)/libinetutil.so.1 -$(ROOT)/usr/lib/$(MACH64)/libinetutil.so:= \ - REALPATH=../../../lib/$(MACH64)/libinetutil.so.1 -$(ROOT)/usr/lib/$(MACH64)/libintl.so.1:= \ - REALPATH=../../../lib/$(MACH64)/libintl.so.1 -$(ROOT)/usr/lib/$(MACH64)/libintl.so:= \ - REALPATH=../../../lib/$(MACH64)/libintl.so.1 -$(ROOT)/usr/lib/$(MACH64)/libkstat.so.1:= \ - REALPATH=../../../lib/$(MACH64)/libkstat.so.1 -$(ROOT)/usr/lib/$(MACH64)/libkstat.so:= \ - REALPATH=../../../lib/$(MACH64)/libkstat.so.1 -$(ROOT)/usr/lib/$(MACH64)/liblddbg.so.4:= \ - REALPATH=../../../lib/$(MACH64)/liblddbg.so.4 -$(ROOT)/usr/lib/$(MACH64)/libm.so.2:= \ - REALPATH=../../../lib/$(MACH64)/libm.so.2 -$(ROOT)/usr/lib/$(MACH64)/libm.so:= \ - REALPATH=../../../lib/$(MACH64)/libm.so.2 -$(ROOT)/usr/lib/$(MACH64)/libmd.so.1:= \ - REALPATH=../../../lib/$(MACH64)/libmd.so.1 -$(ROOT)/usr/lib/$(MACH64)/libmd.so:= \ - REALPATH=../../../lib/$(MACH64)/libmd.so.1 -$(ROOT)/usr/lib/$(MACH64)/libmd5.so.1:= \ - REALPATH=../../../lib/$(MACH64)/libmd5.so.1 -$(ROOT)/usr/lib/$(MACH64)/libmd5.so:= \ - REALPATH=../../../lib/$(MACH64)/libmd5.so.1 -$(ROOT)/usr/lib/$(MACH64)/libmp.so.2:= \ - REALPATH=../../../lib/$(MACH64)/libmp.so.2 -$(ROOT)/usr/lib/$(MACH64)/libmp.so:= \ - REALPATH=../../../lib/$(MACH64)/libmp.so.2 -$(ROOT)/usr/lib/$(MACH64)/libmvec.so.1:= \ - REALPATH=../../../lib/$(MACH64)/libmvec.so.1 -$(ROOT)/usr/lib/$(MACH64)/libmvec.so:= \ - REALPATH=../../../lib/$(MACH64)/libmvec.so.1 -$(ROOT)/usr/lib/$(MACH64)/libnsl.so.1:= \ - REALPATH=../../../lib/$(MACH64)/libnsl.so.1 -$(ROOT)/usr/lib/$(MACH64)/libnsl.so:= \ - REALPATH=../../../lib/$(MACH64)/libnsl.so.1 -$(ROOT)/usr/lib/$(MACH64)/libnvpair.so.1:= \ - REALPATH=../../../lib/$(MACH64)/libnvpair.so.1 -$(ROOT)/usr/lib/$(MACH64)/libnvpair.so:= \ - REALPATH=../../../lib/$(MACH64)/libnvpair.so.1 -$(ROOT)/usr/lib/$(MACH64)/libpam.so.1:= \ - REALPATH=../../../lib/$(MACH64)/libpam.so.1 -$(ROOT)/usr/lib/$(MACH64)/libpam.so:= \ - REALPATH=../../../lib/$(MACH64)/libpam.so.1 -$(ROOT)/usr/lib/$(MACH64)/libposix4.so.1:= \ - REALPATH=../../../lib/$(MACH64)/librt.so.1 -$(ROOT)/usr/lib/$(MACH64)/libposix4.so:= \ - REALPATH=../../../lib/$(MACH64)/librt.so.1 -$(ROOT)/usr/lib/$(MACH64)/libproc.so.1:= \ - REALPATH=../../../lib/$(MACH64)/libproc.so.1 -$(ROOT)/usr/lib/$(MACH64)/libproc.so:= \ - REALPATH=../../../lib/$(MACH64)/libproc.so.1 -$(ROOT)/usr/lib/$(MACH64)/libpthread.so.1:= \ - REALPATH=../../../lib/$(MACH64)/libpthread.so.1 -$(ROOT)/usr/lib/$(MACH64)/libpthread.so:= \ - REALPATH=../../../lib/$(MACH64)/libpthread.so.1 -$(ROOT)/usr/lib/$(MACH64)/librcm.so.1:= \ - REALPATH=../../../lib/$(MACH64)/librcm.so.1 -$(ROOT)/usr/lib/$(MACH64)/librcm.so:= \ - REALPATH=../../../lib/$(MACH64)/librcm.so.1 -$(ROOT)/usr/lib/$(MACH64)/libresolv.so.2:= \ - REALPATH=../../../lib/$(MACH64)/libresolv.so.2 -$(ROOT)/usr/lib/$(MACH64)/libresolv.so:= \ - REALPATH=../../../lib/$(MACH64)/libresolv.so.2 -$(ROOT)/usr/lib/$(MACH64)/librestart.so.1:= \ - REALPATH=../../../lib/$(MACH64)/librestart.so.1 -$(ROOT)/usr/lib/$(MACH64)/librestart.so:= \ - REALPATH=../../../lib/$(MACH64)/librestart.so.1 -$(ROOT)/usr/lib/$(MACH64)/librpcsvc.so.1:= \ - REALPATH=../../../lib/$(MACH64)/librpcsvc.so.1 -$(ROOT)/usr/lib/$(MACH64)/librpcsvc.so:= \ - REALPATH=../../../lib/$(MACH64)/librpcsvc.so.1 -$(ROOT)/usr/lib/$(MACH64)/librt.so.1:= \ - REALPATH=../../../lib/$(MACH64)/librt.so.1 -$(ROOT)/usr/lib/$(MACH64)/librt.so:= \ - REALPATH=../../../lib/$(MACH64)/librt.so.1 -$(ROOT)/usr/lib/$(MACH64)/librtld.so.1:= \ - REALPATH=../../../lib/$(MACH64)/librtld.so.1 -$(ROOT)/usr/lib/$(MACH64)/librtld_db.so.1:= \ - REALPATH=../../../lib/$(MACH64)/librtld_db.so.1 -$(ROOT)/usr/lib/$(MACH64)/librtld_db.so:= \ - REALPATH=../../../lib/$(MACH64)/librtld_db.so.1 -$(ROOT)/usr/lib/$(MACH64)/libscf.so.1:= \ - REALPATH=../../../lib/$(MACH64)/libscf.so.1 -$(ROOT)/usr/lib/$(MACH64)/libscf.so:= \ - REALPATH=../../../lib/$(MACH64)/libscf.so.1 -$(ROOT)/usr/lib/$(MACH64)/libsec.so.1:= \ - REALPATH=../../../lib/$(MACH64)/libsec.so.1 -$(ROOT)/usr/lib/$(MACH64)/libsec.so:= \ - REALPATH=../../../lib/$(MACH64)/libsec.so.1 -$(ROOT)/usr/lib/$(MACH64)/libsecdb.so.1:= \ - REALPATH=../../../lib/$(MACH64)/libsecdb.so.1 -$(ROOT)/usr/lib/$(MACH64)/libsecdb.so:= \ - REALPATH=../../../lib/$(MACH64)/libsecdb.so.1 -$(ROOT)/usr/lib/$(MACH64)/libsendfile.so.1:= \ - REALPATH=../../../lib/$(MACH64)/libsendfile.so.1 -$(ROOT)/usr/lib/$(MACH64)/libsendfile.so:= \ - REALPATH=../../../lib/$(MACH64)/libsendfile.so.1 -$(ROOT)/usr/lib/$(MACH64)/libsysevent.so.1:= \ - REALPATH=../../../lib/$(MACH64)/libsysevent.so.1 -$(ROOT)/usr/lib/$(MACH64)/libsysevent.so:= \ - REALPATH=../../../lib/$(MACH64)/libsysevent.so.1 -$(ROOT)/usr/lib/$(MACH64)/libthread.so.1:= \ - REALPATH=../../../lib/$(MACH64)/libthread.so.1 -$(ROOT)/usr/lib/$(MACH64)/libthread.so:= \ - REALPATH=../../../lib/$(MACH64)/libthread.so.1 -$(ROOT)/usr/lib/$(MACH64)/libthread_db.so.1:= \ - REALPATH=../../../lib/$(MACH64)/libc_db.so.1 -$(ROOT)/usr/lib/$(MACH64)/libthread_db.so:= \ - REALPATH=../../../lib/$(MACH64)/libc_db.so.1 -$(ROOT)/usr/lib/$(MACH64)/libumem.so.1:= \ - REALPATH=../../../lib/$(MACH64)/libumem.so.1 -$(ROOT)/usr/lib/$(MACH64)/libumem.so:= \ - REALPATH=../../../lib/$(MACH64)/libumem.so.1 -$(ROOT)/usr/lib/$(MACH64)/libuuid.so.1:= \ - REALPATH=../../../lib/$(MACH64)/libuuid.so.1 -$(ROOT)/usr/lib/$(MACH64)/libuuid.so:= \ - REALPATH=../../../lib/$(MACH64)/libuuid.so.1 -$(ROOT)/usr/lib/$(MACH64)/libw.so.1:= \ - REALPATH=../../../lib/$(MACH64)/libw.so.1 -$(ROOT)/usr/lib/$(MACH64)/libw.so:= \ - REALPATH=../../../lib/$(MACH64)/libw.so.1 -$(ROOT)/usr/lib/$(MACH64)/libzfs.so:= \ - REALPATH=../../../lib/$(MACH64)/libzfs.so.1 -$(ROOT)/usr/lib/$(MACH64)/libzfs.so.1:= \ - REALPATH=../../../lib/$(MACH64)/libzfs.so.1 -$(ROOT)/usr/lib/$(MACH64)/libzfs_core.so:= \ - REALPATH=../../../lib/$(MACH64)/libzfs_core.so.1 -$(ROOT)/usr/lib/$(MACH64)/libzfs_core.so.1:= \ - REALPATH=../../../lib/$(MACH64)/libzfs_core.so.1 -$(ROOT)/usr/lib/$(MACH64)/libfdisk.so.1:= \ - REALPATH=../../../lib/$(MACH64)/libfdisk.so.1 -$(ROOT)/usr/lib/$(MACH64)/libfdisk.so:= \ - REALPATH=../../../lib/$(MACH64)/libfdisk.so.1 -$(ROOT)/usr/lib/$(MACH64)/nss_compat.so.1:= \ - REALPATH=../../../lib/$(MACH64)/nss_compat.so.1 -$(ROOT)/usr/lib/$(MACH64)/nss_dns.so.1:= \ - REALPATH=../../../lib/$(MACH64)/nss_dns.so.1 -$(ROOT)/usr/lib/$(MACH64)/nss_files.so.1:= \ - REALPATH=../../../lib/$(MACH64)/nss_files.so.1 -$(ROOT)/usr/lib/$(MACH64)/nss_nis.so.1:= \ - REALPATH=../../../lib/$(MACH64)/nss_nis.so.1 -$(ROOT)/usr/lib/$(MACH64)/nss_user.so.1:= \ - REALPATH=../../../lib/$(MACH64)/nss_user.so.1 -$(ROOT)/usr/lib/fm/$(MACH64)/libfmevent.so.1:= \ - REALPATH=../../../../lib/fm/$(MACH64)/libfmevent.so.1 -$(ROOT)/usr/lib/fm/$(MACH64)/libfmevent.so:= \ - REALPATH=../../../../lib/fm/$(MACH64)/libfmevent.so.1 + REALPATH=../../libexec/ld.so +$(ROOT)/usr/lib/$(MACH32)/libadm.so.1:= \ + REALPATH=../../../lib/$(MACH32)/libadm.so.1 +$(ROOT)/usr/lib/$(MACH32)/libadm.so:= \ + REALPATH=../../../lib/$(MACH32)/libadm.so.1 +$(ROOT)/usr/lib/$(MACH32)/libaio.so.1:= \ + REALPATH=../../../lib/$(MACH32)/libaio.so.1 +$(ROOT)/usr/lib/$(MACH32)/libaio.so:= \ + REALPATH=../../../lib/$(MACH32)/libaio.so.1 +$(ROOT)/usr/lib/$(MACH32)/libavl.so.1:= \ + REALPATH=../../../lib/$(MACH32)/libavl.so.1 +$(ROOT)/usr/lib/$(MACH32)/libavl.so:= \ + REALPATH=../../../lib/$(MACH32)/libavl.so.1 +$(ROOT)/usr/lib/$(MACH32)/libc.so.1:= \ + REALPATH=../../../lib/$(MACH32)/libc.so.1 +$(ROOT)/usr/lib/$(MACH32)/libc.so:= \ + REALPATH=../../../lib/$(MACH32)/libc.so.1 +$(ROOT)/usr/lib/$(MACH32)/libc_db.so.1:= \ + REALPATH=../../../lib/$(MACH32)/libc_db.so.1 +$(ROOT)/usr/lib/$(MACH32)/libc_db.so:= \ + REALPATH=../../../lib/$(MACH32)/libc_db.so.1 +$(ROOT)/usr/lib/$(MACH32)/libcmdutils.so.1:= \ + REALPATH=../../../lib/$(MACH32)/libcmdutils.so.1 +$(ROOT)/usr/lib/$(MACH32)/libcmdutils.so:= \ + REALPATH=../../../lib/$(MACH32)/libcmdutils.so.1 +$(ROOT)/usr/lib/$(MACH32)/libcontract.so.1:= \ + REALPATH=../../../lib/$(MACH32)/libcontract.so.1 +$(ROOT)/usr/lib/$(MACH32)/libcontract.so:= \ + REALPATH=../../../lib/$(MACH32)/libcontract.so.1 +$(ROOT)/usr/lib/$(MACH32)/libctf.so.1:= \ + REALPATH=../../../lib/$(MACH32)/libctf.so.1 +$(ROOT)/usr/lib/$(MACH32)/libctf.so:= \ + REALPATH=../../../lib/$(MACH32)/libctf.so.1 +$(ROOT)/usr/lib/$(MACH32)/libdevice.so.1:= \ + REALPATH=../../../lib/$(MACH32)/libdevice.so.1 +$(ROOT)/usr/lib/$(MACH32)/libdevice.so:= \ + REALPATH=../../../lib/$(MACH32)/libdevice.so.1 +$(ROOT)/usr/lib/$(MACH32)/libdevid.so.1:= \ + REALPATH=../../../lib/$(MACH32)/libdevid.so.1 +$(ROOT)/usr/lib/$(MACH32)/libdevid.so:= \ + REALPATH=../../../lib/$(MACH32)/libdevid.so.1 +$(ROOT)/usr/lib/$(MACH32)/libdevinfo.so.1:= \ + REALPATH=../../../lib/$(MACH32)/libdevinfo.so.1 +$(ROOT)/usr/lib/$(MACH32)/libdevinfo.so:= \ + REALPATH=../../../lib/$(MACH32)/libdevinfo.so.1 +$(ROOT)/usr/lib/$(MACH32)/libdhcputil.so.1:= \ + REALPATH=../../../lib/$(MACH32)/libdhcputil.so.1 +$(ROOT)/usr/lib/$(MACH32)/libdhcputil.so:= \ + REALPATH=../../../lib/$(MACH32)/libdhcputil.so.1 +$(ROOT)/usr/lib/$(MACH32)/libdl.so.1:= \ + REALPATH=../../../lib/$(MACH32)/libdl.so.1 +$(ROOT)/usr/lib/$(MACH32)/libdl.so:= \ + REALPATH=../../../lib/$(MACH32)/libdl.so.1 +$(ROOT)/usr/lib/$(MACH32)/libdlpi.so.1:= \ + REALPATH=../../../lib/$(MACH32)/libdlpi.so.1 +$(ROOT)/usr/lib/$(MACH32)/libdlpi.so:= \ + REALPATH=../../../lib/$(MACH32)/libdlpi.so.1 +$(ROOT)/usr/lib/$(MACH32)/libdoor.so.1:= \ + REALPATH=../../../lib/$(MACH32)/libdoor.so.1 +$(ROOT)/usr/lib/$(MACH32)/libdoor.so:= \ + REALPATH=../../../lib/$(MACH32)/libdoor.so.1 +$(ROOT)/usr/lib/$(MACH32)/libdwarf.so.1:= \ + REALPATH=../../../lib/$(MACH32)/libdwarf.so.1 +$(ROOT)/usr/lib/$(MACH32)/libdwarf.so:= \ + REALPATH=../../../lib/$(MACH32)/libdwarf.so.1 +$(ROOT)/usr/lib/$(MACH32)/libefi.so.1:= \ + REALPATH=../../../lib/$(MACH32)/libefi.so.1 +$(ROOT)/usr/lib/$(MACH32)/libefi.so:= \ + REALPATH=../../../lib/$(MACH32)/libefi.so.1 +$(ROOT)/usr/lib/$(MACH32)/libelf.so.1:= \ + REALPATH=../../../lib/$(MACH32)/libelf.so.1 +$(ROOT)/usr/lib/$(MACH32)/libelf.so:= \ + REALPATH=../../../lib/$(MACH32)/libelf.so.1 +$(ROOT)/usr/lib/$(MACH32)/libgen.so.1:= \ + REALPATH=../../../lib/$(MACH32)/libgen.so.1 +$(ROOT)/usr/lib/$(MACH32)/libgen.so:= \ + REALPATH=../../../lib/$(MACH32)/libgen.so.1 +$(ROOT)/usr/lib/$(MACH32)/libinetutil.so.1:= \ + REALPATH=../../../lib/$(MACH32)/libinetutil.so.1 +$(ROOT)/usr/lib/$(MACH32)/libinetutil.so:= \ + REALPATH=../../../lib/$(MACH32)/libinetutil.so.1 +$(ROOT)/usr/lib/$(MACH32)/libintl.so.1:= \ + REALPATH=../../../lib/$(MACH32)/libintl.so.1 +$(ROOT)/usr/lib/$(MACH32)/libintl.so:= \ + REALPATH=../../../lib/$(MACH32)/libintl.so.1 +$(ROOT)/usr/lib/$(MACH32)/libkstat.so.1:= \ + REALPATH=../../../lib/$(MACH32)/libkstat.so.1 +$(ROOT)/usr/lib/$(MACH32)/libkstat.so:= \ + REALPATH=../../../lib/$(MACH32)/libkstat.so.1 +$(ROOT)/usr/lib/$(MACH32)/liblddbg.so.4:= \ + REALPATH=../../../lib/$(MACH32)/liblddbg.so.4 +$(ROOT)/usr/lib/$(MACH32)/libm.so.2:= \ + REALPATH=../../../lib/$(MACH32)/libm.so.2 +$(ROOT)/usr/lib/$(MACH32)/libm.so:= \ + REALPATH=../../../lib/$(MACH32)/libm.so.2 +$(ROOT)/usr/lib/$(MACH32)/libmd.so.1:= \ + REALPATH=../../../lib/$(MACH32)/libmd.so.1 +$(ROOT)/usr/lib/$(MACH32)/libmd.so:= \ + REALPATH=../../../lib/$(MACH32)/libmd.so.1 +$(ROOT)/usr/lib/$(MACH32)/libmd5.so.1:= \ + REALPATH=../../../lib/$(MACH32)/libmd5.so.1 +$(ROOT)/usr/lib/$(MACH32)/libmd5.so:= \ + REALPATH=../../../lib/$(MACH32)/libmd5.so.1 +$(ROOT)/usr/lib/$(MACH32)/libmp.so.2:= \ + REALPATH=../../../lib/$(MACH32)/libmp.so.2 +$(ROOT)/usr/lib/$(MACH32)/libmp.so:= \ + REALPATH=../../../lib/$(MACH32)/libmp.so.2 +$(ROOT)/usr/lib/$(MACH32)/libmvec.so.1:= \ + REALPATH=../../../lib/$(MACH32)/libmvec.so.1 +$(ROOT)/usr/lib/$(MACH32)/libmvec.so:= \ + REALPATH=../../../lib/$(MACH32)/libmvec.so.1 +$(ROOT)/usr/lib/$(MACH32)/libnsl.so.1:= \ + REALPATH=../../../lib/$(MACH32)/libnsl.so.1 +$(ROOT)/usr/lib/$(MACH32)/libnsl.so:= \ + REALPATH=../../../lib/$(MACH32)/libnsl.so.1 +$(ROOT)/usr/lib/$(MACH32)/libnvpair.so.1:= \ + REALPATH=../../../lib/$(MACH32)/libnvpair.so.1 +$(ROOT)/usr/lib/$(MACH32)/libnvpair.so:= \ + REALPATH=../../../lib/$(MACH32)/libnvpair.so.1 +$(ROOT)/usr/lib/$(MACH32)/libpam.so.1:= \ + REALPATH=../../../lib/$(MACH32)/libpam.so.1 +$(ROOT)/usr/lib/$(MACH32)/libpam.so:= \ + REALPATH=../../../lib/$(MACH32)/libpam.so.1 +$(ROOT)/usr/lib/$(MACH32)/libposix4.so.1:= \ + REALPATH=../../../lib/$(MACH32)/librt.so.1 +$(ROOT)/usr/lib/$(MACH32)/libposix4.so:= \ + REALPATH=../../../lib/$(MACH32)/librt.so.1 +$(ROOT)/usr/lib/$(MACH32)/libproc.so.1:= \ + REALPATH=../../../lib/$(MACH32)/libproc.so.1 +$(ROOT)/usr/lib/$(MACH32)/libproc.so:= \ + REALPATH=../../../lib/$(MACH32)/libproc.so.1 +$(ROOT)/usr/lib/$(MACH32)/libpthread.so.1:= \ + REALPATH=../../../lib/$(MACH32)/libpthread.so.1 +$(ROOT)/usr/lib/$(MACH32)/libpthread.so:= \ + REALPATH=../../../lib/$(MACH32)/libpthread.so.1 +$(ROOT)/usr/lib/$(MACH32)/librcm.so.1:= \ + REALPATH=../../../lib/$(MACH32)/librcm.so.1 +$(ROOT)/usr/lib/$(MACH32)/librcm.so:= \ + REALPATH=../../../lib/$(MACH32)/librcm.so.1 +$(ROOT)/usr/lib/$(MACH32)/libresolv.so.2:= \ + REALPATH=../../../lib/$(MACH32)/libresolv.so.2 +$(ROOT)/usr/lib/$(MACH32)/libresolv.so:= \ + REALPATH=../../../lib/$(MACH32)/libresolv.so.2 +$(ROOT)/usr/lib/$(MACH32)/librestart.so.1:= \ + REALPATH=../../../lib/$(MACH32)/librestart.so.1 +$(ROOT)/usr/lib/$(MACH32)/librestart.so:= \ + REALPATH=../../../lib/$(MACH32)/librestart.so.1 +$(ROOT)/usr/lib/$(MACH32)/librpcsvc.so.1:= \ + REALPATH=../../../lib/$(MACH32)/librpcsvc.so.1 +$(ROOT)/usr/lib/$(MACH32)/librpcsvc.so:= \ + REALPATH=../../../lib/$(MACH32)/librpcsvc.so.1 +$(ROOT)/usr/lib/$(MACH32)/librt.so.1:= \ + REALPATH=../../../lib/$(MACH32)/librt.so.1 +$(ROOT)/usr/lib/$(MACH32)/librt.so:= \ + REALPATH=../../../lib/$(MACH32)/librt.so.1 +$(ROOT)/usr/lib/$(MACH32)/librtld.so.1:= \ + REALPATH=../../../lib/$(MACH32)/librtld.so.1 +$(ROOT)/usr/lib/$(MACH32)/librtld_db.so.1:= \ + REALPATH=../../../lib/$(MACH32)/librtld_db.so.1 +$(ROOT)/usr/lib/$(MACH32)/librtld_db.so:= \ + REALPATH=../../../lib/$(MACH32)/librtld_db.so.1 +$(ROOT)/usr/lib/$(MACH32)/libscf.so.1:= \ + REALPATH=../../../lib/$(MACH32)/libscf.so.1 +$(ROOT)/usr/lib/$(MACH32)/libscf.so:= \ + REALPATH=../../../lib/$(MACH32)/libscf.so.1 +$(ROOT)/usr/lib/$(MACH32)/libsec.so.1:= \ + REALPATH=../../../lib/$(MACH32)/libsec.so.1 +$(ROOT)/usr/lib/$(MACH32)/libsec.so:= \ + REALPATH=../../../lib/$(MACH32)/libsec.so.1 +$(ROOT)/usr/lib/$(MACH32)/libsecdb.so.1:= \ + REALPATH=../../../lib/$(MACH32)/libsecdb.so.1 +$(ROOT)/usr/lib/$(MACH32)/libsecdb.so:= \ + REALPATH=../../../lib/$(MACH32)/libsecdb.so.1 +$(ROOT)/usr/lib/$(MACH32)/libsendfile.so.1:= \ + REALPATH=../../../lib/$(MACH32)/libsendfile.so.1 +$(ROOT)/usr/lib/$(MACH32)/libsendfile.so:= \ + REALPATH=../../../lib/$(MACH32)/libsendfile.so.1 +$(ROOT)/usr/lib/$(MACH32)/libsysevent.so.1:= \ + REALPATH=../../../lib/$(MACH32)/libsysevent.so.1 +$(ROOT)/usr/lib/$(MACH32)/libsysevent.so:= \ + REALPATH=../../../lib/$(MACH32)/libsysevent.so.1 +$(ROOT)/usr/lib/$(MACH32)/libthread.so.1:= \ + REALPATH=../../../lib/$(MACH32)/libthread.so.1 +$(ROOT)/usr/lib/$(MACH32)/libthread.so:= \ + REALPATH=../../../lib/$(MACH32)/libthread.so.1 +$(ROOT)/usr/lib/$(MACH32)/libthread_db.so.1:= \ + REALPATH=../../../lib/$(MACH32)/libc_db.so.1 +$(ROOT)/usr/lib/$(MACH32)/libthread_db.so:= \ + REALPATH=../../../lib/$(MACH32)/libc_db.so.1 +$(ROOT)/usr/lib/$(MACH32)/libumem.so.1:= \ + REALPATH=../../../lib/$(MACH32)/libumem.so.1 +$(ROOT)/usr/lib/$(MACH32)/libumem.so:= \ + REALPATH=../../../lib/$(MACH32)/libumem.so.1 +$(ROOT)/usr/lib/$(MACH32)/libuuid.so.1:= \ + REALPATH=../../../lib/$(MACH32)/libuuid.so.1 +$(ROOT)/usr/lib/$(MACH32)/libuuid.so:= \ + REALPATH=../../../lib/$(MACH32)/libuuid.so.1 +$(ROOT)/usr/lib/$(MACH32)/libw.so.1:= \ + REALPATH=../../../lib/$(MACH32)/libw.so.1 +$(ROOT)/usr/lib/$(MACH32)/libw.so:= \ + REALPATH=../../../lib/$(MACH32)/libw.so.1 +$(ROOT)/usr/lib/$(MACH32)/libzfs.so:= \ + REALPATH=../../../lib/$(MACH32)/libzfs.so.1 +$(ROOT)/usr/lib/$(MACH32)/libzfs.so.1:= \ + REALPATH=../../../lib/$(MACH32)/libzfs.so.1 +$(ROOT)/usr/lib/$(MACH32)/libzfs_core.so:= \ + REALPATH=../../../lib/$(MACH32)/libzfs_core.so.1 +$(ROOT)/usr/lib/$(MACH32)/libzfs_core.so.1:= \ + REALPATH=../../../lib/$(MACH32)/libzfs_core.so.1 +$(ROOT)/usr/lib/$(MACH32)/libfdisk.so.1:= \ + REALPATH=../../../lib/$(MACH32)/libfdisk.so.1 +$(ROOT)/usr/lib/$(MACH32)/libfdisk.so:= \ + REALPATH=../../../lib/$(MACH32)/libfdisk.so.1 +$(ROOT)/usr/lib/$(MACH32)/nss_compat.so.1:= \ + REALPATH=../../../lib/$(MACH32)/nss_compat.so.1 +$(ROOT)/usr/lib/$(MACH32)/nss_dns.so.1:= \ + REALPATH=../../../lib/$(MACH32)/nss_dns.so.1 +$(ROOT)/usr/lib/$(MACH32)/nss_files.so.1:= \ + REALPATH=../../../lib/$(MACH32)/nss_files.so.1 +$(ROOT)/usr/lib/$(MACH32)/nss_nis.so.1:= \ + REALPATH=../../../lib/$(MACH32)/nss_nis.so.1 +$(ROOT)/usr/lib/$(MACH32)/nss_user.so.1:= \ + REALPATH=../../../lib/$(MACH32)/nss_user.so.1 +$(ROOT)/usr/lib/fm/$(MACH32)/libfmevent.so.1:= \ + REALPATH=../../../../lib/fm/$(MACH32)/libfmevent.so.1 +$(ROOT)/usr/lib/fm/$(MACH32)/libfmevent.so:= \ + REALPATH=../../../../lib/fm/$(MACH32)/libfmevent.so.1 i386_SYM.USRLIB= \ /usr/lib/libfdisk.so \ @@ -1028,123 +1030,123 @@ amd64_SYM.USRLIB64= \ SYM.USRLIB64= \ - $($(MACH64)_SYM.USRLIB64) \ - /lib/$(MACH64)/libposix4.so \ - /lib/$(MACH64)/libposix4.so.1 \ - /lib/$(MACH64)/libthread_db.so \ - /lib/$(MACH64)/libthread_db.so.1 \ + $($(MACH32)_SYM.USRLIB64) \ + /lib/$(MACH32)/libposix4.so \ + /lib/$(MACH32)/libposix4.so.1 \ + /lib/$(MACH32)/libthread_db.so \ + /lib/$(MACH32)/libthread_db.so.1 \ /usr/lib/$(MACH64)/ld.so.1 \ - /usr/lib/$(MACH64)/libadm.so \ - /usr/lib/$(MACH64)/libadm.so.1 \ - /usr/lib/$(MACH64)/libaio.so \ - /usr/lib/$(MACH64)/libaio.so.1 \ - /usr/lib/$(MACH64)/libavl.so \ - /usr/lib/$(MACH64)/libavl.so.1 \ - /usr/lib/$(MACH64)/libc.so \ - /usr/lib/$(MACH64)/libc.so.1 \ - /usr/lib/$(MACH64)/libc_db.so \ - /usr/lib/$(MACH64)/libc_db.so.1 \ - /usr/lib/$(MACH64)/libcmdutils.so \ - /usr/lib/$(MACH64)/libcmdutils.so.1 \ - /usr/lib/$(MACH64)/libcontract.so \ - /usr/lib/$(MACH64)/libcontract.so.1 \ - /usr/lib/$(MACH64)/libctf.so \ - /usr/lib/$(MACH64)/libctf.so.1 \ - /usr/lib/$(MACH64)/libdevice.so \ - /usr/lib/$(MACH64)/libdevice.so.1 \ - /usr/lib/$(MACH64)/libdevid.so \ - /usr/lib/$(MACH64)/libdevid.so.1 \ - /usr/lib/$(MACH64)/libdevinfo.so \ - /usr/lib/$(MACH64)/libdevinfo.so.1 \ - /usr/lib/$(MACH64)/libdhcputil.so \ - /usr/lib/$(MACH64)/libdhcputil.so.1 \ - /usr/lib/$(MACH64)/libdl.so \ - /usr/lib/$(MACH64)/libdl.so.1 \ - /usr/lib/$(MACH64)/libdlpi.so \ - /usr/lib/$(MACH64)/libdlpi.so.1 \ - /usr/lib/$(MACH64)/libdoor.so \ - /usr/lib/$(MACH64)/libdoor.so.1 \ - /usr/lib/$(MACH64)/libdwarf.so \ - /usr/lib/$(MACH64)/libdwarf.so.1 \ - /usr/lib/$(MACH64)/libefi.so \ - /usr/lib/$(MACH64)/libefi.so.1 \ - /usr/lib/$(MACH64)/libelf.so \ - /usr/lib/$(MACH64)/libelf.so.1 \ - /usr/lib/$(MACH64)/libgen.so \ - /usr/lib/$(MACH64)/libgen.so.1 \ - /usr/lib/$(MACH64)/libinetutil.so \ - /usr/lib/$(MACH64)/libinetutil.so.1 \ - /usr/lib/$(MACH64)/libintl.so \ - /usr/lib/$(MACH64)/libintl.so.1 \ - /usr/lib/$(MACH64)/libkstat.so \ - /usr/lib/$(MACH64)/libkstat.so.1 \ - /usr/lib/$(MACH64)/liblddbg.so.4 \ - /usr/lib/$(MACH64)/libm.so.2 \ - /usr/lib/$(MACH64)/libm.so \ - /usr/lib/$(MACH64)/libmd.so \ - /usr/lib/$(MACH64)/libmd.so.1 \ - /usr/lib/$(MACH64)/libmd5.so \ - /usr/lib/$(MACH64)/libmd5.so.1 \ - /usr/lib/$(MACH64)/libmp.so \ - /usr/lib/$(MACH64)/libmp.so.2 \ - /usr/lib/$(MACH64)/libmvec.so.1 \ - /usr/lib/$(MACH64)/libmvec.so \ - /usr/lib/$(MACH64)/libnsl.so \ - /usr/lib/$(MACH64)/libnsl.so.1 \ - /usr/lib/$(MACH64)/libnvpair.so \ - /usr/lib/$(MACH64)/libnvpair.so.1 \ - /usr/lib/$(MACH64)/libpam.so \ - /usr/lib/$(MACH64)/libpam.so.1 \ - /usr/lib/$(MACH64)/libposix4.so \ - /usr/lib/$(MACH64)/libposix4.so.1 \ - /usr/lib/$(MACH64)/libproc.so \ - /usr/lib/$(MACH64)/libproc.so.1 \ - /usr/lib/$(MACH64)/libpthread.so \ - /usr/lib/$(MACH64)/libpthread.so.1 \ - /usr/lib/$(MACH64)/librcm.so \ - /usr/lib/$(MACH64)/librcm.so.1 \ - /usr/lib/$(MACH64)/libresolv.so \ - /usr/lib/$(MACH64)/libresolv.so.2 \ - /usr/lib/$(MACH64)/librestart.so \ - /usr/lib/$(MACH64)/librestart.so.1 \ - /usr/lib/$(MACH64)/librpcsvc.so \ - /usr/lib/$(MACH64)/librpcsvc.so.1 \ - /usr/lib/$(MACH64)/librt.so \ - /usr/lib/$(MACH64)/librt.so.1 \ - /usr/lib/$(MACH64)/librtld.so.1 \ - /usr/lib/$(MACH64)/librtld_db.so \ - /usr/lib/$(MACH64)/librtld_db.so.1 \ - /usr/lib/$(MACH64)/libscf.so \ - /usr/lib/$(MACH64)/libscf.so.1 \ - /usr/lib/$(MACH64)/libsec.so \ - /usr/lib/$(MACH64)/libsec.so.1 \ - /usr/lib/$(MACH64)/libsecdb.so \ - /usr/lib/$(MACH64)/libsecdb.so.1 \ - /usr/lib/$(MACH64)/libsendfile.so \ - /usr/lib/$(MACH64)/libsendfile.so.1 \ - /usr/lib/$(MACH64)/libsysevent.so \ - /usr/lib/$(MACH64)/libsysevent.so.1 \ - /usr/lib/$(MACH64)/libthread.so \ - /usr/lib/$(MACH64)/libthread.so.1 \ - /usr/lib/$(MACH64)/libthread_db.so \ - /usr/lib/$(MACH64)/libthread_db.so.1 \ - /usr/lib/$(MACH64)/libumem.so \ - /usr/lib/$(MACH64)/libumem.so.1 \ - /usr/lib/$(MACH64)/libuuid.so \ - /usr/lib/$(MACH64)/libuuid.so.1 \ - /usr/lib/$(MACH64)/libw.so \ - /usr/lib/$(MACH64)/libw.so.1 \ - /usr/lib/$(MACH64)/libzfs.so \ - /usr/lib/$(MACH64)/libzfs.so.1 \ - /usr/lib/$(MACH64)/libzfs_core.so \ - /usr/lib/$(MACH64)/libzfs_core.so.1 \ - /usr/lib/$(MACH64)/nss_compat.so.1 \ - /usr/lib/$(MACH64)/nss_dns.so.1 \ - /usr/lib/$(MACH64)/nss_files.so.1 \ - /usr/lib/$(MACH64)/nss_nis.so.1 \ - /usr/lib/$(MACH64)/nss_user.so.1 \ - /usr/lib/fm/$(MACH64)/libfmevent.so \ - /usr/lib/fm/$(MACH64)/libfmevent.so.1 + /usr/lib/$(MACH32)/libadm.so \ + /usr/lib/$(MACH32)/libadm.so.1 \ + /usr/lib/$(MACH32)/libaio.so \ + /usr/lib/$(MACH32)/libaio.so.1 \ + /usr/lib/$(MACH32)/libavl.so \ + /usr/lib/$(MACH32)/libavl.so.1 \ + /usr/lib/$(MACH32)/libc.so \ + /usr/lib/$(MACH32)/libc.so.1 \ + /usr/lib/$(MACH32)/libc_db.so \ + /usr/lib/$(MACH32)/libc_db.so.1 \ + /usr/lib/$(MACH32)/libcmdutils.so \ + /usr/lib/$(MACH32)/libcmdutils.so.1 \ + /usr/lib/$(MACH32)/libcontract.so \ + /usr/lib/$(MACH32)/libcontract.so.1 \ + /usr/lib/$(MACH32)/libctf.so \ + /usr/lib/$(MACH32)/libctf.so.1 \ + /usr/lib/$(MACH32)/libdevice.so \ + /usr/lib/$(MACH32)/libdevice.so.1 \ + /usr/lib/$(MACH32)/libdevid.so \ + /usr/lib/$(MACH32)/libdevid.so.1 \ + /usr/lib/$(MACH32)/libdevinfo.so \ + /usr/lib/$(MACH32)/libdevinfo.so.1 \ + /usr/lib/$(MACH32)/libdhcputil.so \ + /usr/lib/$(MACH32)/libdhcputil.so.1 \ + /usr/lib/$(MACH32)/libdl.so \ + /usr/lib/$(MACH32)/libdl.so.1 \ + /usr/lib/$(MACH32)/libdlpi.so \ + /usr/lib/$(MACH32)/libdlpi.so.1 \ + /usr/lib/$(MACH32)/libdoor.so \ + /usr/lib/$(MACH32)/libdoor.so.1 \ + /usr/lib/$(MACH32)/libdwarf.so \ + /usr/lib/$(MACH32)/libdwarf.so.1 \ + /usr/lib/$(MACH32)/libefi.so \ + /usr/lib/$(MACH32)/libefi.so.1 \ + /usr/lib/$(MACH32)/libelf.so \ + /usr/lib/$(MACH32)/libelf.so.1 \ + /usr/lib/$(MACH32)/libgen.so \ + /usr/lib/$(MACH32)/libgen.so.1 \ + /usr/lib/$(MACH32)/libinetutil.so \ + /usr/lib/$(MACH32)/libinetutil.so.1 \ + /usr/lib/$(MACH32)/libintl.so \ + /usr/lib/$(MACH32)/libintl.so.1 \ + /usr/lib/$(MACH32)/libkstat.so \ + /usr/lib/$(MACH32)/libkstat.so.1 \ + /usr/lib/$(MACH32)/liblddbg.so.4 \ + /usr/lib/$(MACH32)/libm.so.2 \ + /usr/lib/$(MACH32)/libm.so \ + /usr/lib/$(MACH32)/libmd.so \ + /usr/lib/$(MACH32)/libmd.so.1 \ + /usr/lib/$(MACH32)/libmd5.so \ + /usr/lib/$(MACH32)/libmd5.so.1 \ + /usr/lib/$(MACH32)/libmp.so \ + /usr/lib/$(MACH32)/libmp.so.2 \ + /usr/lib/$(MACH32)/libmvec.so.1 \ + /usr/lib/$(MACH32)/libmvec.so \ + /usr/lib/$(MACH32)/libnsl.so \ + /usr/lib/$(MACH32)/libnsl.so.1 \ + /usr/lib/$(MACH32)/libnvpair.so \ + /usr/lib/$(MACH32)/libnvpair.so.1 \ + /usr/lib/$(MACH32)/libpam.so \ + /usr/lib/$(MACH32)/libpam.so.1 \ + /usr/lib/$(MACH32)/libposix4.so \ + /usr/lib/$(MACH32)/libposix4.so.1 \ + /usr/lib/$(MACH32)/libproc.so \ + /usr/lib/$(MACH32)/libproc.so.1 \ + /usr/lib/$(MACH32)/libpthread.so \ + /usr/lib/$(MACH32)/libpthread.so.1 \ + /usr/lib/$(MACH32)/librcm.so \ + /usr/lib/$(MACH32)/librcm.so.1 \ + /usr/lib/$(MACH32)/libresolv.so \ + /usr/lib/$(MACH32)/libresolv.so.2 \ + /usr/lib/$(MACH32)/librestart.so \ + /usr/lib/$(MACH32)/librestart.so.1 \ + /usr/lib/$(MACH32)/librpcsvc.so \ + /usr/lib/$(MACH32)/librpcsvc.so.1 \ + /usr/lib/$(MACH32)/librt.so \ + /usr/lib/$(MACH32)/librt.so.1 \ + /usr/lib/$(MACH32)/librtld.so.1 \ + /usr/lib/$(MACH32)/librtld_db.so \ + /usr/lib/$(MACH32)/librtld_db.so.1 \ + /usr/lib/$(MACH32)/libscf.so \ + /usr/lib/$(MACH32)/libscf.so.1 \ + /usr/lib/$(MACH32)/libsec.so \ + /usr/lib/$(MACH32)/libsec.so.1 \ + /usr/lib/$(MACH32)/libsecdb.so \ + /usr/lib/$(MACH32)/libsecdb.so.1 \ + /usr/lib/$(MACH32)/libsendfile.so \ + /usr/lib/$(MACH32)/libsendfile.so.1 \ + /usr/lib/$(MACH32)/libsysevent.so \ + /usr/lib/$(MACH32)/libsysevent.so.1 \ + /usr/lib/$(MACH32)/libthread.so \ + /usr/lib/$(MACH32)/libthread.so.1 \ + /usr/lib/$(MACH32)/libthread_db.so \ + /usr/lib/$(MACH32)/libthread_db.so.1 \ + /usr/lib/$(MACH32)/libumem.so \ + /usr/lib/$(MACH32)/libumem.so.1 \ + /usr/lib/$(MACH32)/libuuid.so \ + /usr/lib/$(MACH32)/libuuid.so.1 \ + /usr/lib/$(MACH32)/libw.so \ + /usr/lib/$(MACH32)/libw.so.1 \ + /usr/lib/$(MACH32)/libzfs.so \ + /usr/lib/$(MACH32)/libzfs.so.1 \ + /usr/lib/$(MACH32)/libzfs_core.so \ + /usr/lib/$(MACH32)/libzfs_core.so.1 \ + /usr/lib/$(MACH32)/nss_compat.so.1 \ + /usr/lib/$(MACH32)/nss_dns.so.1 \ + /usr/lib/$(MACH32)/nss_files.so.1 \ + /usr/lib/$(MACH32)/nss_nis.so.1 \ + /usr/lib/$(MACH32)/nss_user.so.1 \ + /usr/lib/fm/$(MACH32)/libfmevent.so \ + /usr/lib/fm/$(MACH32)/libfmevent.so.1 # # usr/src/Makefile uses INS.dir for any member of ROOTDIRS, the fact diff --git a/usr/src/cmd/Makefile.cmd b/usr/src/cmd/Makefile.cmd index c9b8e547bf..3e2e7f0a81 100644 --- a/usr/src/cmd/Makefile.cmd +++ b/usr/src/cmd/Makefile.cmd @@ -43,11 +43,11 @@ KRB5BIN= $(KRB5DIR)/bin KRB5SBIN= $(KRB5DIR)/sbin KRB5LIB= $(KRB5DIR)/lib/krb5 KRB5RUNPATH= /usr/lib/krb5 -GSSRUNPATH= /usr/lib/gss - ROOTBIN= $(ROOT)/usr/bin -ROOTLIB= $(ROOT)/usr/lib +ROOTLIB= $(ROOT)/usr/lib/$(MACH32) +ROOTLIBEXEC= $(ROOT)/usr/libexec +ROOTLIBEXEC32= $(ROOT)/usr/libexec/$(MACH32) ROOTLIBSVCBIN= $(ROOT)/lib/svc/bin ROOTLIBSVCMETHOD= $(ROOT)/lib/svc/method ROOTLIBZONES= $(ROOT)/lib/zones @@ -68,7 +68,7 @@ ROOTETCINET= $(ROOT)/etc/inet ROOTBIN32= $(ROOTBIN)/$(MACH32) ROOTBIN64= $(ROOTBIN)/$(MACH64) ROOTCMDDIR64= $(ROOTCMDDIR)/$(MACH64) -ROOTLIB64= $(ROOTLIB)/$(MACH64) +ROOTLIB64= $(ROOT)/usr/lib ROOTUSRSBIN32= $(ROOTUSRSBIN)/$(MACH32) ROOTUSRSBIN64= $(ROOTUSRSBIN)/$(MACH64) ROOTVARSMB= $(ROOT)/var/smb @@ -102,8 +102,8 @@ KRB5LIBPROG= $(PROG:%=$(KRB5LIB)/%) ROOTPROG= $(PROG:%=$(ROOTBIN)/%) ROOTCMD= $(PROG:%=$(ROOTCMDDIR)/%) ROOTSHFILES= $(SHFILES:%=$(ROOTBIN)/%) -ROOTLIBPROG= $(PROG:%=$(ROOTLIB)/%) -ROOTLIBSHFILES= $(SHFILES:%=$(ROOTLIB)/%) +ROOTLIBPROG= $(PROG:%=$(ROOTLIB64)/%) +ROOTLIBSHFILES= $(SHFILES:%=$(ROOTLIB64)/%) ROOTSHLIBPROG= $(PROG:%=$(ROOTSHLIB)/%) ROOTSBINPROG= $(PROG:%=$(ROOTSBIN)/%) ROOTUSRSBINPROG=$(PROG:%=$(ROOTUSRSBIN)/%) diff --git a/usr/src/cmd/abi/appcert/scripts/Makefile b/usr/src/cmd/abi/appcert/scripts/Makefile index 6441e3de0a..8aa0091818 100644 --- a/usr/src/cmd/abi/appcert/scripts/Makefile +++ b/usr/src/cmd/abi/appcert/scripts/Makefile @@ -40,7 +40,7 @@ CLOBBERFILES= $(SCRIPTS) $(MESSAGES) include $(SRC)/cmd/Makefile.cmd -ROOTLIBABIDIR = $(ROOTLIB)/abi/appcert +ROOTLIBABIDIR = $(ROOTLIB64)/abi/appcert ROOTLIBABIFILES = $(APPCERT_SUBCMDS:%=$(ROOTLIBABIDIR)/%) \ $(MODULES:%=$(ROOTLIBABIDIR)/%) diff --git a/usr/src/cmd/abi/spectrans/Makefile.cmd b/usr/src/cmd/abi/spectrans/Makefile.cmd index df6403c6f1..dbe4a73da8 100644 --- a/usr/src/cmd/abi/spectrans/Makefile.cmd +++ b/usr/src/cmd/abi/spectrans/Makefile.cmd @@ -25,8 +25,9 @@ # Copyright (c) 2018, Joyent, Inc. include $(SRC)/cmd/Makefile.cmd +include $(SRC)/cmd/Makefile.cmd.64 -PROG_BIN = $(ROOTLIB)/abi/$(PROG) +PROG_BIN = $(ROOTLIB64)/abi/$(PROG) .PRECIOUS: $(PROG) U_LIB = parse diff --git a/usr/src/cmd/abi/spectrans/parser/Makefile.targ b/usr/src/cmd/abi/spectrans/parser/Makefile.targ index dc65a9e47b..2a3fc5c1dc 100644 --- a/usr/src/cmd/abi/spectrans/parser/Makefile.targ +++ b/usr/src/cmd/abi/spectrans/parser/Makefile.targ @@ -35,6 +35,7 @@ OBJECTS = errlog.o \ main.o include $(SRC)/lib/Makefile.lib +include $(SRC)/lib/Makefile.lib.64 SRCS = $(OBJECTS:%.o=../%.c) diff --git a/usr/src/cmd/ahciem/Makefile b/usr/src/cmd/ahciem/Makefile index ca72972209..6d46a393f3 100644 --- a/usr/src/cmd/ahciem/Makefile +++ b/usr/src/cmd/ahciem/Makefile @@ -17,7 +17,7 @@ PROG= ahciem include ../Makefile.cmd -ROOTCMDDIR = $(ROOTLIB)/ahci +ROOTCMDDIR = $(ROOTLIB64)/ahci CPPFLAGS += -I$(SRCTOP)/include CFLAGS += $(CCVERBOSE) LDLIBS += -ldevinfo diff --git a/usr/src/cmd/bc/Makefile b/usr/src/cmd/bc/Makefile index 16705595ff..84de92598e 100644 --- a/usr/src/cmd/bc/Makefile +++ b/usr/src/cmd/bc/Makefile @@ -41,7 +41,7 @@ CERRWARN += -Wno-unused-label SMATCH=off CFLAGS += -DXPG6 -ROOTLIBB= $(LIBB:%=$(ROOTLIB)/%) +ROOTLIBB= $(LIBB:%=$(ROOTLIB64)/%) $(ROOTLIBB) := FILEMODE = $(LIBFILEMODE) .KEEP_STATE: diff --git a/usr/src/cmd/cmd-inet/lib/ipmgmtd/Makefile b/usr/src/cmd/cmd-inet/lib/ipmgmtd/Makefile index 4cde245311..d71910e822 100644 --- a/usr/src/cmd/cmd-inet/lib/ipmgmtd/Makefile +++ b/usr/src/cmd/cmd-inet/lib/ipmgmtd/Makefile @@ -45,7 +45,7 @@ $(ROOTCFGFILES) := OWNER= ipadm $(ROOTCFGFILES) := GROUP= sys $(ROOTCFGFILES) := FILEMODE= 644 -ROOTCMDDIR= $(ROOTFS_LIBDIR)/inet +ROOTCMDDIR= $(ROOTFS_LIBDIR64)/inet LDLIBS += -lipadm -lnvpair -lsecdb -lumem -lscf diff --git a/usr/src/cmd/cmd-inet/lib/nwamd/Makefile b/usr/src/cmd/cmd-inet/lib/nwamd/Makefile index aaf2ee2e47..5008ef1cea 100644 --- a/usr/src/cmd/cmd-inet/lib/nwamd/Makefile +++ b/usr/src/cmd/cmd-inet/lib/nwamd/Makefile @@ -48,7 +48,7 @@ include ../../../Makefile.cmd $(ROOTCFGFILES) := FILEMODE= 644 -ROOTCMDDIR= $(ROOTFS_LIBDIR)/inet +ROOTCMDDIR= $(ROOTFS_LIBDIR64)/inet LDLIBS += -ldhcpagent -ldhcputil -ldladm -ldlpi -lgen \ -linetutil -lipadm -lkstat -lnvpair -lnwam \ diff --git a/usr/src/cmd/cmd-inet/usr.bin/telnet/Makefile b/usr/src/cmd/cmd-inet/usr.bin/telnet/Makefile index 2862b93d93..11f33f72ee 100644 --- a/usr/src/cmd/cmd-inet/usr.bin/telnet/Makefile +++ b/usr/src/cmd/cmd-inet/usr.bin/telnet/Makefile @@ -53,7 +53,7 @@ CERRWARN += -Wno-implicit-function-declaration CERRWARN += -Wno-unused-label LDLIBS += -lncurses LDLIBS += -lmech_krb5 -LDFLAGS += $(KRUNPATH) -L$(ROOT)$(KLIBDIR_DO) -L$(ROOT)$(KLIBDIR_GL) +LDFLAGS += $(KRUNPATH) -L$(ROOT)$(KLIBDIR) # "missing type for func" SMATCH=off diff --git a/usr/src/cmd/cmd-inet/usr.lib/Makefile.lib b/usr/src/cmd/cmd-inet/usr.lib/Makefile.lib index 3858bcb261..5126ea3e94 100644 --- a/usr/src/cmd/cmd-inet/usr.lib/Makefile.lib +++ b/usr/src/cmd/cmd-inet/usr.lib/Makefile.lib @@ -26,7 +26,7 @@ # cmd/cmd-inet/usr.lib/Makefile.lib -ROOTLIBINET= $(ROOTLIB)/inet +ROOTLIBINET= $(ROOTLIB64)/inet ROOTLIBINET32= $(ROOTLIBINET)/$(MACH32) ROOTLIBINET64= $(ROOTLIBINET)/$(MACH64) ROOTLIBINETPROG= $(PROG:%=$(ROOTLIBINET)/%) diff --git a/usr/src/cmd/cmd-inet/usr.sbin/Makefile b/usr/src/cmd/cmd-inet/usr.sbin/Makefile index 8aebd6abb0..a69af6bfe5 100644 --- a/usr/src/cmd/cmd-inet/usr.sbin/Makefile +++ b/usr/src/cmd/cmd-inet/usr.sbin/Makefile @@ -110,7 +110,7 @@ $(SYNCPROG) := LDLIBS += -ldlpi $(PAMPROG) := LDLIBS += -lpam $(RPCSVCPROG) := LDLIBS += -lrpcsvc $(K5PROGS) := LDFLAGS += $(KRUNPATH) \ - -L$(ROOT)$(KLIBDIR_DO) -L$(ROOT)$(KLIBDIR_GL) + -L$(ROOT)$(KLIBDIR) $(K5PROGS) := K5LIBS= -lmech_krb5 $(K5PROGS) := CPPFLAGS += -I$(SRCTOP)/include \ -I$(SRC)/uts/common/ \ diff --git a/usr/src/cmd/cmd-inet/usr.sbin/ipqosconf/Makefile b/usr/src/cmd/cmd-inet/usr.sbin/ipqosconf/Makefile index accb42df99..938340dafe 100644 --- a/usr/src/cmd/cmd-inet/usr.sbin/ipqosconf/Makefile +++ b/usr/src/cmd/cmd-inet/usr.sbin/ipqosconf/Makefile @@ -38,7 +38,7 @@ MODS= dlcosmk \ TYPES= $(MODS:%=%.types) -ROOTLIBIPQOSCONF= $(ROOTLIB)/ipqosconf +ROOTLIBIPQOSCONF= $(ROOTLIB64)/ipqosconf ROOTLIBIPQOSCONFTYPES = $(TYPES:%=$(ROOTLIBIPQOSCONF)/%) include ../../../Makefile.cmd diff --git a/usr/src/cmd/devfsadm/Makefile.com b/usr/src/cmd/devfsadm/Makefile.com index f4089f2879..1d257c6e92 100644 --- a/usr/src/cmd/devfsadm/Makefile.com +++ b/usr/src/cmd/devfsadm/Makefile.com @@ -117,7 +117,7 @@ POFILE = pdevfsadm.po # install specifics -ROOTLIB_DEVFSADM = $(ROOTLIB)/$(DEVFSADM_DIR) +ROOTLIB_DEVFSADM = $(ROOTLIB64)/$(DEVFSADM_DIR) ROOTLIB_DEVFSADM_LINKMOD = $(ROOTLIB_DEVFSADM)/$(LINKMOD_DIR) ROOTLIB_DEVFSADM_LINK_MODS = $(LINK_MODS:%=$(ROOTLIB_DEVFSADM_LINKMOD)/%) diff --git a/usr/src/cmd/diff/Makefile b/usr/src/cmd/diff/Makefile index cae9f9141d..e5b05c3728 100644 --- a/usr/src/cmd/diff/Makefile +++ b/usr/src/cmd/diff/Makefile @@ -42,7 +42,7 @@ DCFILE= diff.dc #XGETFLAGS += -a -x diff.xcl ROOTBINDIFF = $(BINDIFF:%=$(ROOTBIN)/%) -ROOTLIBDIFFH = $(LIBDIFFH:%=$(ROOTLIB)/%) +ROOTLIBDIFFH = $(LIBDIFFH:%=$(ROOTLIB64)/%) .KEEP_STATE: diff --git a/usr/src/cmd/diskinfo/Makefile b/usr/src/cmd/diskinfo/Makefile index 10cda55ca7..7a5049a76c 100644 --- a/usr/src/cmd/diskinfo/Makefile +++ b/usr/src/cmd/diskinfo/Makefile @@ -18,6 +18,7 @@ OBJS= diskinfo.o SRCS= $(OBJS:%.o=%.c) include $(SRC)/cmd/Makefile.cmd +include $(SRC)/cmd/Makefile.cmd.64 include $(SRC)/cmd/Makefile.ctf CSTD= $(CSTD_GNU99) diff --git a/usr/src/cmd/dlutil/Makefile b/usr/src/cmd/dlutil/Makefile index dde5f1074e..7add643b56 100644 --- a/usr/src/cmd/dlutil/Makefile +++ b/usr/src/cmd/dlutil/Makefile @@ -17,7 +17,7 @@ PROG= dltraninfo dlsend dlrecv dlled include ../Makefile.cmd -ROOTCMDDIR = $(ROOTLIB)/dl +ROOTCMDDIR = $(ROOTLIB64)/dl CFLAGS += $(CCVERBOSE) dltraninfo := LDLIBS += -ldladm -lsff -lnvpair @@ -30,7 +30,7 @@ dlled.ln := LDLIBS += -ldladm dlsend.ln := LDLIBS += -ldlpi dlrecv.ln := LDLIBS += -ldlpi -ROOTLIBDLFILES = $(PROG:%=$(ROOTLIB)/dl/%) +ROOTLIBDLFILES = $(PROG:%=$($(ROOTCMDDIR)/%) .KEEP_STATE: diff --git a/usr/src/cmd/fm/dicts/Makefile b/usr/src/cmd/fm/dicts/Makefile index cb52386e90..6b60b42975 100644 --- a/usr/src/cmd/fm/dicts/Makefile +++ b/usr/src/cmd/fm/dicts/Makefile @@ -64,8 +64,8 @@ DCFILES = $(DCNAMES:%=%.dict) POFILES = $(DCNAMES:%=%.po) MOFILES = $(DCNAMES:%=%.mo) -ROOTDCDIR = $(ROOTLIB)/fm/dict -ROOTLCDIR = $(ROOTLIB)/locale/C/LC_MESSAGES +ROOTDCDIR = $(ROOTLIB64)/fm/dict +ROOTLCDIR = $(ROOTLIB64)/locale/C/LC_MESSAGES ROOTDCFILES = $(DCNAMES:%=$(ROOTDCDIR)/%.dict) ROOTPOFILES = $(DCNAMES:%=$(ROOTLCDIR)/%.po) @@ -85,13 +85,13 @@ _msg: $(ROOTALLPOFILES) $(ROOTDCDIR): $(INS.dir) -$(ROOTLIB)/locale: +$(ROOTLIB64)/locale: $(INS.dir) -$(ROOTLIB)/locale/C: $(ROOTLIB)/locale +$(ROOTLIB64)/locale/C: $(ROOTLIB64)/locale $(INS.dir) -$(ROOTLCDIR): $(ROOTLIB)/locale/C +$(ROOTLCDIR): $(ROOTLIB64)/locale/C $(INS.dir) $(ROOTDCDIR)/%: % diff --git a/usr/src/cmd/fm/fmadm/Makefile.com b/usr/src/cmd/fm/fmadm/Makefile.com index 70f32beb6c..2438aece6d 100644 --- a/usr/src/cmd/fm/fmadm/Makefile.com +++ b/usr/src/cmd/fm/fmadm/Makefile.com @@ -40,10 +40,10 @@ ROOTPROG = $(ROOTUSRSBIN)/$(PROG) $(NOT_RELEASE_BUILD)CPPFLAGS += -DDEBUG CPPFLAGS += -I. -I../common -CFLAGS += $(CTF_FLAGS) -LDLIBS += -L$(ROOT)/usr/lib/fm -lfmd_adm -lfmd_msg -LDLIBS += -lnvpair -ltopo -LDFLAGS += -R/usr/lib/fm +CFLAGS64 += $(CTF_FLAGS) +LDLIBS64 += -L$(ROOT)/usr/lib/fm -lfmd_adm -lfmd_msg +LDLIBS64 += -lnvpair -ltopo +LDFLAGS64 += -R/usr/lib/fm .NO_PARALLEL: .PARALLEL: $(OBJS) diff --git a/usr/src/cmd/fm/fmadm/i386/Makefile b/usr/src/cmd/fm/fmadm/i386/Makefile index 7bca6cefe5..8cd51784b4 100644 --- a/usr/src/cmd/fm/fmadm/i386/Makefile +++ b/usr/src/cmd/fm/fmadm/i386/Makefile @@ -26,4 +26,5 @@ #ident "%Z%%M% %I% %E% SMI" include ../../../Makefile.cmd +include ../../../Makefile.cmd.64 include ../Makefile.com diff --git a/usr/src/cmd/fm/fmd/Makefile.fmd b/usr/src/cmd/fm/fmd/Makefile.fmd index fb95b113ca..fedadfde74 100644 --- a/usr/src/cmd/fm/fmd/Makefile.fmd +++ b/usr/src/cmd/fm/fmd/Makefile.fmd @@ -114,7 +114,7 @@ $(ROOTMANIFEST) := FILEMODE = 0444 $(NOT_RELEASE_BUILD)CPPFLAGS += -DDEBUG CPPFLAGS += -I. -I../common CPPFLAGS += -D_POSIX_PTHREAD_SEMANTICS -CFLAGS += $(CTF_FLAGS) +CFLAGS64 += $(CTF_FLAGS) CERRWARN += -Wno-switch CERRWARN += -Wno-parentheses CERRWARN += -Wno-uninitialized @@ -124,12 +124,12 @@ CERRWARN += -Wno-clobbered # not linted SMATCH=off -$(PROG) := LDFLAGS += -R/usr/lib/fm -$(PROG) := LDLIBS += -L$(ROOTLIB)/fm -ltopo -ldiagcode -lsysevent -lsmbios \ +$(PROG) := LDFLAGS64 += -R/usr/lib/fm +$(PROG) := LDLIBS64 += -L$(ROOTLIB64)/fm -ltopo -ldiagcode -lsysevent -lsmbios \ -luuid -lnvpair -lexacct -lumem -ldevinfo -lfmd_msg -$(DMOD) := CFLAGS += $(CC_PICFLAGS) $(GSHARED) $(XREGSFLAG) -$(DMOD) := LDFLAGS += $(ZTEXT) $(ZDEFS) $(MAPFILE-DMOD:%=-Wl,-M%) +$(DMOD) := CFLAGS64 += $(CC_PICFLAGS) $(GSHARED) $(XREGSFLAG) +$(DMOD) := LDFLAGS64 += $(ZTEXT) $(ZDEFS) $(MAPFILE-DMOD:%=-Wl,-M%) # # rpcgen(1) produces code that wants to be in the foreground if we're compiled diff --git a/usr/src/cmd/fm/fmd/i386/Makefile b/usr/src/cmd/fm/fmd/i386/Makefile index a2e4d5c324..0f1dad3e7c 100644 --- a/usr/src/cmd/fm/fmd/i386/Makefile +++ b/usr/src/cmd/fm/fmd/i386/Makefile @@ -26,4 +26,5 @@ #ident "%Z%%M% %I% %E% SMI" include ../../../Makefile.cmd +include ../../../Makefile.cmd.64 include ../Makefile.fmd diff --git a/usr/src/cmd/fm/fmdump/Makefile.com b/usr/src/cmd/fm/fmdump/Makefile.com index 5458362381..5a8c9e6f7a 100644 --- a/usr/src/cmd/fm/fmdump/Makefile.com +++ b/usr/src/cmd/fm/fmdump/Makefile.com @@ -33,9 +33,9 @@ ROOTPROG = $(ROOTUSRSBIN)/$(PROG) $(NOT_RELEASE_BUILD)CPPFLAGS += -DDEBUG CPPFLAGS += -I. -I../common -I../../include -CFLAGS += $(CTF_FLAGS) -LDLIBS += -L$(ROOT)/usr/lib/fm -lfmd_log -lnvpair -ltopo -lfmd_msg -LDFLAGS += -R/usr/lib/fm +CFLAGS64 += $(CTF_FLAGS) +LDLIBS64 += -L$(ROOT)/usr/lib/fm -lfmd_log -lnvpair -ltopo -lfmd_msg +LDFLAGS64 += -R/usr/lib/fm CERRWARN += -Wno-parentheses CERRWARN += -Wno-uninitialized diff --git a/usr/src/cmd/fm/fmdump/i386/Makefile b/usr/src/cmd/fm/fmdump/i386/Makefile index 7bca6cefe5..8cd51784b4 100644 --- a/usr/src/cmd/fm/fmdump/i386/Makefile +++ b/usr/src/cmd/fm/fmdump/i386/Makefile @@ -26,4 +26,5 @@ #ident "%Z%%M% %I% %E% SMI" include ../../../Makefile.cmd +include ../../../Makefile.cmd.64 include ../Makefile.com diff --git a/usr/src/cmd/fm/fminject/Makefile.com b/usr/src/cmd/fm/fminject/Makefile.com index d1fb32767d..e510092fcb 100644 --- a/usr/src/cmd/fm/fminject/Makefile.com +++ b/usr/src/cmd/fm/fminject/Makefile.com @@ -47,14 +47,14 @@ OBJS = $(SRCS:%.c=%.o) inj_grammar.o inj_lex.o CLEANFILES += inj_grammar.c inj_grammar.h inj_lex.c y.tab.h y.tab.c CPPFLAGS += -I. -I../common -CFLAGS += $(CTF_FLAGS) +CFLAGS64 += $(CTF_FLAGS) CERRWARN += -Wno-switch CERRWARN += -Wno-uninitialized CERRWARN += -Wno-type-limits CERRWARN += -Wno-unused-label CERRWARN += -Wno-unused-variable -LDLIBS += -L$(ROOT)/usr/lib/fm -lfmd_log -lsysevent -lnvpair -lumem -LDFLAGS += -R/usr/lib/fm +LDLIBS64 += -L$(ROOT)/usr/lib/fm -lfmd_log -lsysevent -lnvpair -lumem +LDFLAGS64 += -R/usr/lib/fm STRIPFLAG = LFLAGS += -t diff --git a/usr/src/cmd/fm/fminject/i386/Makefile b/usr/src/cmd/fm/fminject/i386/Makefile index 7bca6cefe5..8cd51784b4 100644 --- a/usr/src/cmd/fm/fminject/i386/Makefile +++ b/usr/src/cmd/fm/fminject/i386/Makefile @@ -26,4 +26,5 @@ #ident "%Z%%M% %I% %E% SMI" include ../../../Makefile.cmd +include ../../../Makefile.cmd.64 include ../Makefile.com diff --git a/usr/src/cmd/fm/fmstat/Makefile.com b/usr/src/cmd/fm/fmstat/Makefile.com index 2ba4eeabec..9ab40c5c4f 100644 --- a/usr/src/cmd/fm/fmstat/Makefile.com +++ b/usr/src/cmd/fm/fmstat/Makefile.com @@ -40,8 +40,8 @@ STAT_COMMON_OBJS = timestamp.o $(NOT_RELEASE_BUILD)CPPFLAGS += -DDEBUG CPPFLAGS += -I. -I../common -I$(STATCOMMONDIR) -CFLAGS += $(CTF_FLAGS) -LDLIBS += -L$(ROOT)/usr/lib/fm -lfmd_adm +CFLAGS64 += $(CTF_FLAGS) +LDLIBS64 += -L$(ROOT)/usr/lib/fm -lfmd_adm LDFLAGS += -R/usr/lib/fm SMOFF += signed diff --git a/usr/src/cmd/fm/fmstat/i386/Makefile b/usr/src/cmd/fm/fmstat/i386/Makefile index 7bca6cefe5..8cd51784b4 100644 --- a/usr/src/cmd/fm/fmstat/i386/Makefile +++ b/usr/src/cmd/fm/fmstat/i386/Makefile @@ -26,4 +26,5 @@ #ident "%Z%%M% %I% %E% SMI" include ../../../Makefile.cmd +include ../../../Makefile.cmd.64 include ../Makefile.com diff --git a/usr/src/cmd/fm/fmtopo/Makefile.com b/usr/src/cmd/fm/fmtopo/Makefile.com index cff575afca..96a40acfbc 100644 --- a/usr/src/cmd/fm/fmtopo/Makefile.com +++ b/usr/src/cmd/fm/fmtopo/Makefile.com @@ -39,9 +39,9 @@ ROOTPROG = $(ROOTLIBFMD)/$(PROG) $(NOT_RELEASE_BUILD)CPPFLAGS += -DDEBUG CPPFLAGS += -I. -I../common -CFLAGS += $(CTF_FLAGS) -LDLIBS += -L$(ROOT)/usr/lib/fm -ltopo -lnvpair -LDFLAGS += -R/usr/lib/fm +CFLAGS64 += $(CTF_FLAGS) +LDLIBS64 += -L$(ROOT)/usr/lib/fm -ltopo -lnvpair +LDFLAGS64 += -R/usr/lib/fm # not linted SMATCH=off diff --git a/usr/src/cmd/fm/fmtopo/i386/Makefile b/usr/src/cmd/fm/fmtopo/i386/Makefile index 719d6803ef..4cd6d9151b 100644 --- a/usr/src/cmd/fm/fmtopo/i386/Makefile +++ b/usr/src/cmd/fm/fmtopo/i386/Makefile @@ -26,4 +26,5 @@ #ident "%Z%%M% %I% %E% SMI" include ../../../Makefile.cmd +include ../../../Makefile.cmd.64 include ../Makefile.com diff --git a/usr/src/cmd/fm/ipmitopo/Makefile.com b/usr/src/cmd/fm/ipmitopo/Makefile.com index abead8f550..4878a49e5d 100644 --- a/usr/src/cmd/fm/ipmitopo/Makefile.com +++ b/usr/src/cmd/fm/ipmitopo/Makefile.com @@ -36,8 +36,8 @@ ROOTPROG = $(ROOTLIBFMD)/$(PROG) $(NOT_RELEASE_BUILD)CPPFLAGS += -DDEBUG CPPFLAGS += -I. -I../common -CFLAGS += $(CTF_FLAGS) -LDLIBS += -lipmi -lnvpair +CFLAGS64 += $(CTF_FLAGS) +LDLIBS64 += -lipmi -lnvpair CERRWARN += -Wno-uninitialized diff --git a/usr/src/cmd/fm/ipmitopo/i386/Makefile b/usr/src/cmd/fm/ipmitopo/i386/Makefile index 16356f9dd8..cc1e47b674 100644 --- a/usr/src/cmd/fm/ipmitopo/i386/Makefile +++ b/usr/src/cmd/fm/ipmitopo/i386/Makefile @@ -25,4 +25,5 @@ #ident "%Z%%M% %I% %E% SMI" include ../../../Makefile.cmd +include ../../../Makefile.cmd.64 include ../Makefile.com diff --git a/usr/src/cmd/fm/modules/Makefile.plugin b/usr/src/cmd/fm/modules/Makefile.plugin index f36192074b..2874a34a99 100644 --- a/usr/src/cmd/fm/modules/Makefile.plugin +++ b/usr/src/cmd/fm/modules/Makefile.plugin @@ -27,6 +27,7 @@ .SUFFIXES: include $(SRC)/cmd/Makefile.cmd +include $(SRC)/cmd/Makefile.cmd.64 MODCLASS = plugins # @@ -73,17 +74,17 @@ ROOTCONF = $($(CLASS)_ROOTCONF) APIMAP = $(SRC)/cmd/fm/fmd/common/fmd_api.map FMRIMAP = $(SRC)/cmd/fm/fmd/common/fmd_fmri.map -CFLAGS += $(CTF_FLAGS) $(CC_PICFLAGS) -CFLAGS += $(GSHARED) $(XREGSFLAG) +CFLAGS64 += $(CTF_FLAGS) $(CC_PICFLAGS) +CFLAGS64 += $(GSHARED) $(XREGSFLAG) CPPFLAGS += -D_POSIX_PTHREAD_SEMANTICS -LDFLAGS += $(ZDEFS) $(ZTEXT) $(ZIGNORE) +LDFLAGS64 += $(ZDEFS) $(ZTEXT) $(ZIGNORE) MAPFILE-DMOD = $(SRC)/cmd/mdb/common/modules/conf/mapfile-extern -$(PROG) := LDFLAGS += -Wl,-M$(APIMAP) -Wl,-M$(FMRIMAP) -$(PROG) := LDLIBS += -lnvpair -lc +$(PROG) := LDFLAGS64 += -Wl,-M$(APIMAP) -Wl,-M$(FMRIMAP) +$(PROG) := LDLIBS64 += -lnvpair -lc all: $(PROG) $(DMODPROG) diff --git a/usr/src/cmd/fm/modules/common/cpumem-retire/Makefile b/usr/src/cmd/fm/modules/common/cpumem-retire/Makefile index e4da8b532d..56a8c3c3c7 100644 --- a/usr/src/cmd/fm/modules/common/cpumem-retire/Makefile +++ b/usr/src/cmd/fm/modules/common/cpumem-retire/Makefile @@ -46,4 +46,4 @@ $(SPARC_BLD)INCDIRS += $(SRC)/uts/sun4u CPPFLAGS += $(INCDIRS:%=-I%) -DCMA_VERSION='$(CMA_VERSION)' LDFLAGS += -R/usr/lib/fm -LDLIBS += -L$(ROOTLIB)/fm -lfmd_agent +LDLIBS += -L$(ROOT)/usr/lib/fm -lfmd_agent diff --git a/usr/src/cmd/fm/modules/common/disk-monitor/Makefile b/usr/src/cmd/fm/modules/common/disk-monitor/Makefile index 24ba7361c2..5f91570ae5 100644 --- a/usr/src/cmd/fm/modules/common/disk-monitor/Makefile +++ b/usr/src/cmd/fm/modules/common/disk-monitor/Makefile @@ -31,7 +31,7 @@ SRCS = disk_monitor.c diskmon_conf.c topo_gather.c \ include ../../Makefile.plugin -CFLAGS += -I. -I$(SRC)/lib/fm/topo/modules/common/disk +CFLAGS64 += -I. -I$(SRC)/lib/fm/topo/modules/common/disk LDLIBS += -lsysevent -lnvpair -lsmbios -lcfgadm -ltopo -luutil -lipmi LDFLAGS += -L$(ROOT)/usr/lib/fm -R/usr/lib/fm CERRWARN += -Wno-uninitialized diff --git a/usr/src/cmd/fm/modules/common/disk-transport/Makefile b/usr/src/cmd/fm/modules/common/disk-transport/Makefile index 1b94d0031a..474eb45e71 100644 --- a/usr/src/cmd/fm/modules/common/disk-transport/Makefile +++ b/usr/src/cmd/fm/modules/common/disk-transport/Makefile @@ -30,6 +30,6 @@ SRCS = disk_transport.c include ../../Makefile.plugin -CFLAGS += $(INCS) -LDLIBS += -L$(ROOTLIB)/fm -ldiskstatus -ltopo -LDFLAGS += -R/usr/lib/fm +CFLAGS64 += $(INCS) +LDLIBS += -L$(ROOT)/usr/lib/fm -ldiskstatus -ltopo +LDLIBS += -R/usr/lib/fm diff --git a/usr/src/cmd/fm/modules/common/eversholt/Makefile b/usr/src/cmd/fm/modules/common/eversholt/Makefile index db5528351e..65f08e4a56 100644 --- a/usr/src/cmd/fm/modules/common/eversholt/Makefile +++ b/usr/src/cmd/fm/modules/common/eversholt/Makefile @@ -54,7 +54,7 @@ CERRWARN += -Wno-implicit-function-declaration SMATCH=off $(PROG) := LDFLAGS += -R/usr/lib/fm -$(PROG) := LDLIBS += -L$(ROOTLIB)/fm -ltopo +$(PROG) := LDLIBS += -L$(ROOT)/usr/lib/fm -ltopo CLEANFILES += y.tab.h y.tab.c diff --git a/usr/src/cmd/fm/modules/common/ext-event-transport/Makefile b/usr/src/cmd/fm/modules/common/ext-event-transport/Makefile index e81ef0f451..065798de2c 100644 --- a/usr/src/cmd/fm/modules/common/ext-event-transport/Makefile +++ b/usr/src/cmd/fm/modules/common/ext-event-transport/Makefile @@ -34,6 +34,6 @@ SRCS = fmevt_main.c \ include ../../Makefile.plugin -CFLAGS += $(INCS) -LDLIBS += -L$(ROOTLIB)/fm -lsysevent -lfmevent -ltopo -luuid -lscf -lc -LDFLAGS += -R/usr/lib/fm +CFLAGS64 += $(INCS) +LDLIBS += -L$(ROOT)/usr/lib/fm -lsysevent -lfmevent -ltopo -luuid -lscf -lc +LDLIBS += -R/usr/lib/fm diff --git a/usr/src/cmd/fm/modules/common/sensor-transport/Makefile b/usr/src/cmd/fm/modules/common/sensor-transport/Makefile index 94da1dfd56..66746b4a4a 100644 --- a/usr/src/cmd/fm/modules/common/sensor-transport/Makefile +++ b/usr/src/cmd/fm/modules/common/sensor-transport/Makefile @@ -29,6 +29,6 @@ SRCS = sensor_transport.c include ../../Makefile.plugin -CFLAGS += $(INCS) -LDLIBS += -L$(ROOTLIB)/fm -ltopo -LDFLAGS += -R/usr/lib/fm +CFLAGS64 += $(INCS) +LDLIBS += -L$(ROOT)/usr/lib/fm -ltopo +LDLIBS += -R/usr/lib/fm diff --git a/usr/src/cmd/fm/modules/common/ses-log-transport/Makefile b/usr/src/cmd/fm/modules/common/ses-log-transport/Makefile index 887bbf3408..25244ecc08 100644 --- a/usr/src/cmd/fm/modules/common/ses-log-transport/Makefile +++ b/usr/src/cmd/fm/modules/common/ses-log-transport/Makefile @@ -29,9 +29,9 @@ SRCS = ses_log_transport.c include ../../Makefile.plugin -CFLAGS += $(INCS) -LDLIBS += -L$(ROOTLIB)/fm -ltopo -lseslog -LDFLAGS += -R/usr/lib/fm +CFLAGS64 += $(INCS) +LDLIBS += -L$(ROOT)/usr/lib/fm -ltopo -lseslog +LDLIBS += -R/usr/lib/fm # not linted SMATCH=off diff --git a/usr/src/cmd/fm/modules/common/sw-diag-response/software-diagnosis/Makefile b/usr/src/cmd/fm/modules/common/sw-diag-response/software-diagnosis/Makefile index 0228c67497..f701b230b9 100644 --- a/usr/src/cmd/fm/modules/common/sw-diag-response/software-diagnosis/Makefile +++ b/usr/src/cmd/fm/modules/common/sw-diag-response/software-diagnosis/Makefile @@ -45,8 +45,8 @@ SRCS = $(SWDE_SRCS) $(CMN_SRCS:%=../%) $(SUBDE_SRCS:%=../%) include ../../../Makefile.plugin -CFLAGS += $(INCS) -LDLIBS += -L$(ROOTLIB)/fm -ltopo -luutil -luuid -lkstat -LDFLAGS += -R/usr/lib/fm +CFLAGS64 += $(INCS) +LDLIBS += -L$(ROOT)/usr/lib/fm -ltopo -luutil -luuid -lkstat +LDLIBS += -R/usr/lib/fm CERRWARN += -Wno-parentheses CERRWARN += -Wno-uninitialized diff --git a/usr/src/cmd/fm/modules/common/sw-diag-response/software-response/Makefile b/usr/src/cmd/fm/modules/common/sw-diag-response/software-response/Makefile index 356cc43810..760220cb52 100644 --- a/usr/src/cmd/fm/modules/common/sw-diag-response/software-response/Makefile +++ b/usr/src/cmd/fm/modules/common/sw-diag-response/software-response/Makefile @@ -35,6 +35,6 @@ SRCS = $(SWRP_SRCS) $(CMN_SRCS:%=../%) $(SUBRP_SRCS:%=../%) include ../../../Makefile.plugin -CFLAGS += $(INCS) -LDLIBS += -L$(ROOTLIB)/fm -ltopo -lscf -LDFLAGS += -R/usr/lib/fm +CFLAGS64 += $(INCS) +LDLIBS += -L$(ROOT)/usr/lib/fm -ltopo -lscf +LDLIBS += -R/usr/lib/fm diff --git a/usr/src/cmd/fm/modules/common/zfs-diagnosis/Makefile b/usr/src/cmd/fm/modules/common/zfs-diagnosis/Makefile index 7b47c81579..c7f18f11c4 100644 --- a/usr/src/cmd/fm/modules/common/zfs-diagnosis/Makefile +++ b/usr/src/cmd/fm/modules/common/zfs-diagnosis/Makefile @@ -29,5 +29,5 @@ SRCS = zfs_de.c include ../../Makefile.plugin -LDLIBS += -L$(ROOTLIB)/fm -luutil -lzfs -ltopo +LDLIBS += -L$(ROOT)/usr/lib/fm -luutil -lzfs -ltopo LDFLAGS += -R/usr/lib/fm diff --git a/usr/src/cmd/fm/modules/common/zfs-retire/Makefile b/usr/src/cmd/fm/modules/common/zfs-retire/Makefile index ba93c75696..7166c210b8 100644 --- a/usr/src/cmd/fm/modules/common/zfs-retire/Makefile +++ b/usr/src/cmd/fm/modules/common/zfs-retire/Makefile @@ -29,5 +29,5 @@ SRCS = zfs_retire.c include ../../Makefile.plugin -LDLIBS += -lzfs -L$(ROOTLIB)/fm -ltopo +LDLIBS += -lzfs -L$(ROOT)/usr/lib/fm -ltopo LDFLAGS += -R/usr/lib/fm diff --git a/usr/src/cmd/fm/notify/smtp-notify/Makefile.com b/usr/src/cmd/fm/notify/smtp-notify/Makefile.com index 26ee8b342b..96ad3c0de6 100644 --- a/usr/src/cmd/fm/notify/smtp-notify/Makefile.com +++ b/usr/src/cmd/fm/notify/smtp-notify/Makefile.com @@ -45,7 +45,7 @@ $(ROOTNOTIFYPARAMS) := FILEMODE = 0444 $(NOT_RELEASE_BUILD)CPPFLAGS += -DDEBUG CPPFLAGS += -I. -I../common -I../../../../../lib/fm/libfmnotify/common CSTD = $(CSTD_GNU99) -CFLAGS += $(CTF_FLAGS) +CFLAGS64 += $(CTF_FLAGS) LDLIBS += -L$(ROOT)/usr/lib/fm -lnvpair -lfmevent -lfmd_msg -lfmnotify \ -lumem LDFLAGS += -R/usr/lib/fm diff --git a/usr/src/cmd/fm/notify/smtp-notify/i386/Makefile b/usr/src/cmd/fm/notify/smtp-notify/i386/Makefile index ebcbee3118..1fe3849db3 100644 --- a/usr/src/cmd/fm/notify/smtp-notify/i386/Makefile +++ b/usr/src/cmd/fm/notify/smtp-notify/i386/Makefile @@ -24,4 +24,5 @@ # include ../../../../Makefile.cmd +include ../../../../Makefile.cmd.64 include ../Makefile.com diff --git a/usr/src/cmd/fm/schemes/Makefile.com b/usr/src/cmd/fm/schemes/Makefile.com index 62dec9de50..45a751fa1a 100644 --- a/usr/src/cmd/fm/schemes/Makefile.com +++ b/usr/src/cmd/fm/schemes/Makefile.com @@ -41,8 +41,8 @@ PROG = $(SCHEME:%=%.so) SRCS = scheme.c OBJS = $(SRCS:%.c=%.o) -ROOTPROG = $(ROOT)/usr/lib/fm/fmd/schemes/$(PROG) -ROOTPROG64 = $(ROOT)/usr/lib/fm/fmd/schemes/$(MACH64)/$(PROG) +ROOTPROG64 = $(ROOT)/usr/lib/fm/fmd/schemes/$(PROG) +ROOTPROG = $(ROOT)/usr/lib/fm/fmd/schemes/$(MACH32)/$(PROG) MAPFILE = ../../../fmd/common/fmd_fmri.map diff --git a/usr/src/cmd/fm/schemes/Makefile.targ b/usr/src/cmd/fm/schemes/Makefile.targ index 9ad453f396..5279d6e21e 100644 --- a/usr/src/cmd/fm/schemes/Makefile.targ +++ b/usr/src/cmd/fm/schemes/Makefile.targ @@ -69,7 +69,7 @@ $(ROOT)/usr/lib/fm/fmd: $(ROOT)/usr/lib/fm $(ROOT)/usr/lib/fm/fmd/schemes: $(ROOT)/usr/lib/fm/fmd $(INS.dir) -$(ROOT)/usr/lib/fm/fmd/schemes/$(MACH64): $(ROOT)/usr/lib/fm/fmd/schemes +$(ROOT)/usr/lib/fm/fmd/schemes/$(MACH32): $(ROOT)/usr/lib/fm/fmd/schemes $(INS.dir) $(ROOTPROG): $$(@D) $(PROG) diff --git a/usr/src/cmd/fm/schemes/cpu/amd64/Makefile b/usr/src/cmd/fm/schemes/cpu/amd64/Makefile index 9adc8b2d88..68b9e12aa0 100644 --- a/usr/src/cmd/fm/schemes/cpu/amd64/Makefile +++ b/usr/src/cmd/fm/schemes/cpu/amd64/Makefile @@ -29,8 +29,8 @@ include $(SRC)/Makefile.master.64 SRCS = cpu.c LDFLAGS += -lkstat \ - -L$(ROOTLIB)/fm/$(MACH64) -ltopo -LDFLAGS += -R/usr/lib/fm/$(MACH64) + -L$(ROOT)/usr/lib/fm -ltopo +LDFLAGS += -R/usr/lib/fm CERRWARN += -Wno-parentheses diff --git a/usr/src/cmd/fm/schemes/cpu/i386/Makefile b/usr/src/cmd/fm/schemes/cpu/i386/Makefile index 7509ffe2d5..328f682eae 100644 --- a/usr/src/cmd/fm/schemes/cpu/i386/Makefile +++ b/usr/src/cmd/fm/schemes/cpu/i386/Makefile @@ -28,8 +28,8 @@ include ../../Makefile.com SRCS = cpu.c LDLIBS += -lkstat \ - -L$(ROOTLIB)/fm -ltopo -LDFLAGS += -R/usr/lib/fm + -L$(ROOT)/usr/lib/fm/$(MACH32) -ltopo +LDFLAGS += -R/usr/lib/fm/$(MACH32) CERRWARN += -Wno-parentheses diff --git a/usr/src/cmd/fm/schemes/dev/amd64/Makefile b/usr/src/cmd/fm/schemes/dev/amd64/Makefile index ce44131ca0..001f174061 100644 --- a/usr/src/cmd/fm/schemes/dev/amd64/Makefile +++ b/usr/src/cmd/fm/schemes/dev/amd64/Makefile @@ -31,6 +31,6 @@ include $(SRC)/Makefile.master.64 include ../../Makefile.targ LDLIBS += -ltopo -LDFLAGS += -L$(ROOT)/usr/lib/fm/amd64 -R/usr/lib/fm/amd64 +LDFLAGS += -L$(ROOT)/usr/lib/fm -R/usr/lib/fm install: all $(ROOTPROG64) diff --git a/usr/src/cmd/fm/schemes/dev/i386/Makefile b/usr/src/cmd/fm/schemes/dev/i386/Makefile index 5075cad9bc..05bb19085f 100644 --- a/usr/src/cmd/fm/schemes/dev/i386/Makefile +++ b/usr/src/cmd/fm/schemes/dev/i386/Makefile @@ -30,6 +30,6 @@ include ../Makefile.com include ../../Makefile.targ LDLIBS += -ltopo -LDFLAGS += -L$(ROOT)/usr/lib/fm -R/usr/lib/fm +LDFLAGS += -L$(ROOT)/usr/lib/fm/$(MACH32) -R/usr/lib/fm/$(MACH32) install: all $(ROOTPROG) diff --git a/usr/src/cmd/fm/schemes/hc/amd64/Makefile b/usr/src/cmd/fm/schemes/hc/amd64/Makefile index f19e8b4320..ac2e44797f 100644 --- a/usr/src/cmd/fm/schemes/hc/amd64/Makefile +++ b/usr/src/cmd/fm/schemes/hc/amd64/Makefile @@ -31,6 +31,6 @@ include $(SRC)/Makefile.master.64 include ../../Makefile.targ LDLIBS += -ltopo -LDFLAGS += -L$(ROOT)/usr/lib/fm/amd64 -R/usr/lib/fm/amd64 +LDFLAGS += -L$(ROOT)/usr/lib/fm -R/usr/lib/fm install: all $(ROOTPROG64) diff --git a/usr/src/cmd/fm/schemes/hc/i386/Makefile b/usr/src/cmd/fm/schemes/hc/i386/Makefile index 8fc5e6d02d..b0f380ecea 100644 --- a/usr/src/cmd/fm/schemes/hc/i386/Makefile +++ b/usr/src/cmd/fm/schemes/hc/i386/Makefile @@ -30,6 +30,6 @@ include ../../Makefile.com include ../../Makefile.targ LDLIBS += -ltopo -LDFLAGS += -L$(ROOT)/usr/lib/fm -R/usr/lib/fm +LDFLAGS += -L$(ROOT)/usr/lib/fm/$(MACH32) -R/usr/lib/fm/$(MACH32) install: all $(ROOTPROG) diff --git a/usr/src/cmd/fm/schemes/mem/amd64/Makefile b/usr/src/cmd/fm/schemes/mem/amd64/Makefile index 4f2ed2a1f8..2474cb6497 100644 --- a/usr/src/cmd/fm/schemes/mem/amd64/Makefile +++ b/usr/src/cmd/fm/schemes/mem/amd64/Makefile @@ -28,7 +28,7 @@ include ../Makefile.com include $(SRC)/Makefile.master.64 include ../../Makefile.targ -LDLIBS += -L$(ROOTLIB)/fm/$(MACH64) -lfmd_agent -ltopo -LDFLAGS += -R/usr/lib/fm/$(MACH64) +LDLIBS += -L$(ROOT)/usr/lib/fm -lfmd_agent -ltopo +LDFLAGS += -R/usr/lib/fm install: all $(ROOTPROG64) diff --git a/usr/src/cmd/fm/schemes/mem/i386/Makefile b/usr/src/cmd/fm/schemes/mem/i386/Makefile index 0084e6d5f7..78f7244601 100644 --- a/usr/src/cmd/fm/schemes/mem/i386/Makefile +++ b/usr/src/cmd/fm/schemes/mem/i386/Makefile @@ -27,7 +27,7 @@ include ../Makefile.com include ../../Makefile.targ -LDLIBS += -L$(ROOTLIB)/fm -lfmd_agent -ltopo -LDFLAGS += -R/usr/lib/fm +LDLIBS += -L$(ROOT)/usr/lib/fm/$(MACH32) -lfmd_agent -ltopo +LDFLAGS += -R/usr/lib/fm/$(MACH32) install: all $(ROOTPROG) diff --git a/usr/src/cmd/fm/schemes/mod/amd64/Makefile b/usr/src/cmd/fm/schemes/mod/amd64/Makefile index 46d6bb8f0d..dbe1d3f6f0 100644 --- a/usr/src/cmd/fm/schemes/mod/amd64/Makefile +++ b/usr/src/cmd/fm/schemes/mod/amd64/Makefile @@ -30,8 +30,8 @@ include ../../Makefile.com include $(SRC)/Makefile.master.64 LDLIBS += \ - -L$(ROOTLIB)/fm/$(MACH64) -ltopo -LDFLAGS += -R/usr/lib/fm/$(MACH64) + -L$(ROOT)/usr/lib/fm -ltopo +LDFLAGS += -R/usr/lib/fm include ../../Makefile.targ diff --git a/usr/src/cmd/fm/schemes/mod/i386/Makefile b/usr/src/cmd/fm/schemes/mod/i386/Makefile index 9e893bfdfe..ed151674d1 100644 --- a/usr/src/cmd/fm/schemes/mod/i386/Makefile +++ b/usr/src/cmd/fm/schemes/mod/i386/Makefile @@ -29,8 +29,8 @@ include ../../Makefile.com LDLIBS += \ - -L$(ROOTLIB)/fm -ltopo -LDFLAGS += -R/usr/lib/fm + -L$(ROOT)/usr/lib/fm/$(MACH32) -ltopo +LDFLAGS += -R/usr/lib/fm/$(MACH32) include ../../Makefile.targ diff --git a/usr/src/cmd/fm/schemes/pkg/amd64/Makefile b/usr/src/cmd/fm/schemes/pkg/amd64/Makefile index 46d6bb8f0d..dbe1d3f6f0 100644 --- a/usr/src/cmd/fm/schemes/pkg/amd64/Makefile +++ b/usr/src/cmd/fm/schemes/pkg/amd64/Makefile @@ -30,8 +30,8 @@ include ../../Makefile.com include $(SRC)/Makefile.master.64 LDLIBS += \ - -L$(ROOTLIB)/fm/$(MACH64) -ltopo -LDFLAGS += -R/usr/lib/fm/$(MACH64) + -L$(ROOT)/usr/lib/fm -ltopo +LDFLAGS += -R/usr/lib/fm include ../../Makefile.targ diff --git a/usr/src/cmd/fm/schemes/pkg/i386/Makefile b/usr/src/cmd/fm/schemes/pkg/i386/Makefile index 9e893bfdfe..ed151674d1 100644 --- a/usr/src/cmd/fm/schemes/pkg/i386/Makefile +++ b/usr/src/cmd/fm/schemes/pkg/i386/Makefile @@ -29,8 +29,8 @@ include ../../Makefile.com LDLIBS += \ - -L$(ROOTLIB)/fm -ltopo -LDFLAGS += -R/usr/lib/fm + -L$(ROOT)/usr/lib/fm/$(MACH32) -ltopo +LDFLAGS += -R/usr/lib/fm/$(MACH32) include ../../Makefile.targ diff --git a/usr/src/cmd/fm/schemes/svc/amd64/Makefile b/usr/src/cmd/fm/schemes/svc/amd64/Makefile index 35be1231f1..67abba11d0 100644 --- a/usr/src/cmd/fm/schemes/svc/amd64/Makefile +++ b/usr/src/cmd/fm/schemes/svc/amd64/Makefile @@ -29,6 +29,6 @@ include $(SRC)/Makefile.master.64 include ../../Makefile.targ LDLIBS += -ltopo -LDFLAGS += -L$(ROOT)/usr/lib/fm/$(MACH64) -R/usr/lib/fm/$(MACH64) +LDFLAGS += -L$(ROOT)/usr/lib/fm -R/usr/lib/fm install: all $(ROOTPROG64) diff --git a/usr/src/cmd/fm/schemes/svc/i386/Makefile b/usr/src/cmd/fm/schemes/svc/i386/Makefile index 46dd5f7177..c73e2058cd 100644 --- a/usr/src/cmd/fm/schemes/svc/i386/Makefile +++ b/usr/src/cmd/fm/schemes/svc/i386/Makefile @@ -28,6 +28,6 @@ include ../Makefile.com include ../../Makefile.targ LDLIBS += -ltopo -LDFLAGS += -L$(ROOT)/usr/lib/fm -R/usr/lib/fm +LDFLAGS += -L$(ROOT)/usr/lib/fm/$(MACH32) -R/usr/lib/fm/$(MACH32) install: all $(ROOTPROG) diff --git a/usr/src/cmd/fm/schemes/sw/amd64/Makefile b/usr/src/cmd/fm/schemes/sw/amd64/Makefile index ec578a2e50..77809416ba 100644 --- a/usr/src/cmd/fm/schemes/sw/amd64/Makefile +++ b/usr/src/cmd/fm/schemes/sw/amd64/Makefile @@ -28,6 +28,6 @@ include $(SRC)/Makefile.master.64 include ../../Makefile.targ LDLIBS += -ltopo -LDFLAGS += -L$(ROOT)/usr/lib/fm/$(MACH64) -R/usr/lib/fm/$(MACH64) +LDFLAGS += -L$(ROOT)/usr/lib/fm -R/usr/lib/fm install: all $(ROOTPROG64) diff --git a/usr/src/cmd/fm/schemes/sw/i386/Makefile b/usr/src/cmd/fm/schemes/sw/i386/Makefile index 3b70b0caec..b588cffcb8 100644 --- a/usr/src/cmd/fm/schemes/sw/i386/Makefile +++ b/usr/src/cmd/fm/schemes/sw/i386/Makefile @@ -27,6 +27,6 @@ include ../Makefile.com include ../../Makefile.targ LDLIBS += -ltopo -LDFLAGS += -L$(ROOT)/usr/lib/fm -R/usr/lib/fm +LDFLAGS += -L$(ROOT)/usr/lib/fm/$(MACH32) -R/usr/lib/fm/$(MACH32) install: all $(ROOTPROG) diff --git a/usr/src/cmd/fs.d/Makefile.fstype b/usr/src/cmd/fs.d/Makefile.fstype index 2233045727..4ed0c7d67d 100644 --- a/usr/src/cmd/fs.d/Makefile.fstype +++ b/usr/src/cmd/fs.d/Makefile.fstype @@ -47,12 +47,12 @@ FSLIB= $(FSCOMMONDIR)/fslib.o FSLIBSRC= $(FSLIB:%.o=%.c) ROOTETCFS= $(ROOTETC)/fs -ROOTLIBFS= $(ROOTLIB)/fs +ROOTLIBFS= $(ROOT)/usr/lib/fs FSDIRS= $(ROOTETCFS) $(ROOTLIBFS) ROOTETCFSTYPE= $(ROOTETCFS)/$(FSTYPE) ROOTLIBFSTYPE= $(ROOTLIBFS)/$(FSTYPE) ROOTETCTYPE= $(ROOTETC)/$(FSTYPE) -ROOTLIBTYPE= $(ROOTLIB)/$(FSTYPE) +ROOTLIBTYPE= $(ROOTLIB64)/$(FSTYPE) ROOTETCFSPROG= $(PROG:%=$(ROOTETCFSTYPE)/%) $(ETCPROG:%=$(ROOTETCFSTYPE)/%) ROOTLIBFSPROG= $(PROG:%=$(ROOTLIBFSTYPE)/%) $(LIBPROG:%=$(ROOTLIBFSTYPE)/%) ROOTTYPEPROG= $(TYPEPROG:%=$(ROOTLIBTYPE)/%) diff --git a/usr/src/cmd/fwflash/plugins/transport/Makefile.targ b/usr/src/cmd/fwflash/plugins/transport/Makefile.targ index 6668267405..c4f24aba0f 100644 --- a/usr/src/cmd/fwflash/plugins/transport/Makefile.targ +++ b/usr/src/cmd/fwflash/plugins/transport/Makefile.targ @@ -64,11 +64,11 @@ $(SD_LIB):= SONAME = $(SD_LIB) $(HERMON_LIB):= MAPFILES += ../common/mapfile-vers-hermon $(SD_LIB):= MAPFILES += ../common/mapfile-vers-plus -$(SES_LIB):= LDLIBS += -L$(ROOT)/usr/lib/scsi -lscsi -lses -lnvpair -$(SD_LIB):= LDLIBS += -L$(ROOT)/usr/lib/scsi -lscsi -lumem +$(SES_LIB):= LDLIBS += -L$(ROOT)/usr/lib/scsi/$(MACH32) -lscsi -lses -lnvpair +$(SD_LIB):= LDLIBS += -L$(ROOT)/usr/lib/scsi/$(MACH32) -lscsi -lumem -$(SES_LIB):= DYNFLAGS += -R/usr/lib/scsi -$(SD_LIB):= DYNFLAGS += -R/usr/lib/scsi +$(SES_LIB):= DYNFLAGS += -R/usr/lib/scsi/$(MACH32) +$(SD_LIB):= DYNFLAGS += -R/usr/lib/scsi/$(MACH32) .KEEP STATE: diff --git a/usr/src/cmd/geniconvtbl/Makefile.com b/usr/src/cmd/geniconvtbl/Makefile.com index a1fa86232f..1e84242e09 100644 --- a/usr/src/cmd/geniconvtbl/Makefile.com +++ b/usr/src/cmd/geniconvtbl/Makefile.com @@ -64,8 +64,8 @@ YACCSED = ../yacc.sed include ../../Makefile.cmd -ROOTDIRS32= $(ROOTLIB)/iconv -ROOTDIRS64= $(ROOTLIB)/iconv/$(MACH64) +ROOTDIRS32= $(ROOTLIB64)/iconv +ROOTDIRS64= $(ROOTLIB64)/iconv/$(MACH64) ROOTITM32 = $(ROOTDIRS32)/$(ITM) ROOTITM64 = $(ROOTDIRS64)/$(ITM) @@ -166,13 +166,13 @@ $(ROOTDIRS32)/%: $(ROOTDIRS32) % $(ROOTDIRS64)/%: $(ROOTDIRS64) % -$(INS.file) -$(ROOTDIRS32): $(ROOTLIB) +$(ROOTDIRS32): $(ROOTLIB64) -$(INS.dir) $(ROOTDIRS64): $(ROOTDIRS32) -$(INS.dir) -$(ROOTLIB) $(ROOTBIN): +$(ROOTLIB64) $(ROOTBIN): -$(INS.dir) include ../../Makefile.targ diff --git a/usr/src/cmd/geniconvtbl/samples/Makefile b/usr/src/cmd/geniconvtbl/samples/Makefile index 85a33593d3..3bec3888bb 100644 --- a/usr/src/cmd/geniconvtbl/samples/Makefile +++ b/usr/src/cmd/geniconvtbl/samples/Makefile @@ -46,7 +46,7 @@ GENICONVTBL= ../native/geniconvtbl include ../../Makefile.cmd -ROOTICONVDIRS = $(ROOTLIB)/iconv +ROOTICONVDIRS = $(ROOTLIB64)/iconv ROOTDIRS = $(ROOTICONVDIRS)/geniconvtbl SRCSDIRS = $(ROOTDIRS)/srcs BTSDIRS = $(ROOTDIRS)/binarytables diff --git a/usr/src/cmd/gss/gsscred_clean/Makefile b/usr/src/cmd/gss/gsscred_clean/Makefile index 7c1e00c2cf..2120684464 100644 --- a/usr/src/cmd/gss/gsscred_clean/Makefile +++ b/usr/src/cmd/gss/gsscred_clean/Makefile @@ -36,6 +36,7 @@ include ../../Makefile.cmd # Override $ROOTLIB # ROOTLIB= $(ROOT)/usr/lib/gss +ROOTLIBPROG= $(ROOTLIB)/$(PROG) DIRS= $(ROOTLIB) diff --git a/usr/src/cmd/gss/gssd/Makefile b/usr/src/cmd/gss/gssd/Makefile index d21d8c0f9d..e2163a031e 100644 --- a/usr/src/cmd/gss/gssd/Makefile +++ b/usr/src/cmd/gss/gssd/Makefile @@ -62,6 +62,7 @@ POFILES = generic.po # Override $ROOTLIB # ROOTLIB= $(ROOT)/usr/lib/gss +ROOTLIBPROG= $(ROOTLIB)/$(PROG) DIRS= $(ROOTLIB) diff --git a/usr/src/cmd/hal/Makefile b/usr/src/cmd/hal/Makefile index e33bb919b3..360d1ec535 100644 --- a/usr/src/cmd/hal/Makefile +++ b/usr/src/cmd/hal/Makefile @@ -24,6 +24,7 @@ # include ../Makefile.cmd +include ../Makefile.cmd.64 include Makefile.hal SUBDIRS1 = hald hald-runner addons probing tools diff --git a/usr/src/cmd/hal/Makefile.hal b/usr/src/cmd/hal/Makefile.hal index 64fd44a97a..01bc59f8e1 100644 --- a/usr/src/cmd/hal/Makefile.hal +++ b/usr/src/cmd/hal/Makefile.hal @@ -27,8 +27,8 @@ HAL_VERSION = 0.5.8 -ROOTLIB_HAL = $(ROOTLIB)/hal -ROOTLIB_HAL_SCRIPTS = $(ROOTLIB)/hal +ROOTLIB_HAL = $(ROOTLIB64)/hal +ROOTLIB_HAL_SCRIPTS = $(ROOTLIB64)/hal ROOT_HAL_FDI = $(ROOT)/etc/hal/fdi diff --git a/usr/src/cmd/hal/addons/acpi/Makefile b/usr/src/cmd/hal/addons/acpi/Makefile index 874f7e5b9a..02d0dac0d4 100644 --- a/usr/src/cmd/hal/addons/acpi/Makefile +++ b/usr/src/cmd/hal/addons/acpi/Makefile @@ -30,6 +30,7 @@ OBJS = addon-acpi.o logger.o util_helper.o acpi.o util_pm.o SRCS = addon-acpi.c ../../hald/logger.c ../../hald/util_helper.c include ../../../Makefile.cmd +include ../../../Makefile.cmd.64 include ../../Makefile.hal ROOTCMDDIR = $(ROOTLIB_HAL) diff --git a/usr/src/cmd/hal/addons/cpufreq/Makefile b/usr/src/cmd/hal/addons/cpufreq/Makefile index 0193a53e3d..9933a41d3d 100644 --- a/usr/src/cmd/hal/addons/cpufreq/Makefile +++ b/usr/src/cmd/hal/addons/cpufreq/Makefile @@ -31,6 +31,7 @@ OBJS = addon-cpufreq.o logger.o SRCS = addon-cpufreq.c ../../hald/logger.c include ../../../Makefile.cmd +include ../../../Makefile.cmd.64 include ../../Makefile.hal ROOTCMDDIR = $(ROOTLIB_HAL) diff --git a/usr/src/cmd/hal/addons/storage/Makefile b/usr/src/cmd/hal/addons/storage/Makefile index f5aa0fbbf5..bd2a3245a7 100644 --- a/usr/src/cmd/hal/addons/storage/Makefile +++ b/usr/src/cmd/hal/addons/storage/Makefile @@ -28,6 +28,7 @@ OBJS = addon-storage.o logger.o SRCS = addon-storage.c ../../hald/logger.c include ../../../Makefile.cmd +include ../../../Makefile.cmd.64 include ../../Makefile.hal ROOTCMDDIR = $(ROOTLIB_HAL) diff --git a/usr/src/cmd/hal/fdi/Makefile b/usr/src/cmd/hal/fdi/Makefile index 2d80789610..e6ecc491e8 100644 --- a/usr/src/cmd/hal/fdi/Makefile +++ b/usr/src/cmd/hal/fdi/Makefile @@ -24,6 +24,7 @@ # include ../../Makefile.cmd +include ../../Makefile.cmd.64 include ../Makefile.hal DTDS = fdi.dtd.1 diff --git a/usr/src/cmd/hal/hald-runner/Makefile b/usr/src/cmd/hal/hald-runner/Makefile index 70aca0e33e..34cd2dd88d 100644 --- a/usr/src/cmd/hal/hald-runner/Makefile +++ b/usr/src/cmd/hal/hald-runner/Makefile @@ -30,6 +30,7 @@ OBJS = main.o runner.o utils.o SRCS = $(OBJS:%.o=%.c) include ../../Makefile.cmd +include ../../Makefile.cmd.64 include ../Makefile.hal ROOTCMDDIR = $(ROOTLIB_HAL) diff --git a/usr/src/cmd/hal/hald/Makefile b/usr/src/cmd/hal/hald/Makefile index e61790e3e5..0b553be2bf 100644 --- a/usr/src/cmd/hal/hald/Makefile +++ b/usr/src/cmd/hal/hald/Makefile @@ -36,6 +36,7 @@ OBJS_ALL = $(OBJS) $(OBJS_SOL:%=solaris/%) SRCS = $(OBJS:%.o=%.c) include ../../Makefile.cmd +include ../../Makefile.cmd.64 include ../Makefile.hal ROOTCMDDIR = $(ROOTLIB_HAL) diff --git a/usr/src/cmd/hal/hald/solaris/Makefile b/usr/src/cmd/hal/hald/solaris/Makefile index b7e0d59252..d8d285d0d7 100644 --- a/usr/src/cmd/hal/hald/solaris/Makefile +++ b/usr/src/cmd/hal/hald/solaris/Makefile @@ -33,6 +33,7 @@ MANIFEST = hal.xml SVCMETHOD = svc-hal include ../../../Makefile.cmd +include ../../../Makefile.cmd.64 include ../../Makefile.hal ROOTMANIFESTDIR = $(ROOTSVCSYSTEM) diff --git a/usr/src/cmd/hal/probing/acpi/Makefile b/usr/src/cmd/hal/probing/acpi/Makefile index beaa663ca8..88c795a8fd 100644 --- a/usr/src/cmd/hal/probing/acpi/Makefile +++ b/usr/src/cmd/hal/probing/acpi/Makefile @@ -30,6 +30,7 @@ OBJS = probe-acpi.o logger.o acpi.o util_pm.o SRCS = probe-acpi.c include ../../../Makefile.cmd +include ../../../Makefile.cmd.64 include ../../Makefile.hal ROOTCMDDIR = $(ROOTLIB_HAL) diff --git a/usr/src/cmd/hal/probing/printer/Makefile b/usr/src/cmd/hal/probing/printer/Makefile index fce63a9802..9d93d47875 100644 --- a/usr/src/cmd/hal/probing/printer/Makefile +++ b/usr/src/cmd/hal/probing/printer/Makefile @@ -30,6 +30,7 @@ OBJS = probe-printer.o logger.o printer.o SRCS = probe-printer.c include ../../../Makefile.cmd +include ../../../Makefile.cmd.64 include ../../Makefile.hal ROOTCMDDIR = $(ROOTLIB_HAL) diff --git a/usr/src/cmd/hal/probing/storage/Makefile b/usr/src/cmd/hal/probing/storage/Makefile index 7b9ee6a3ae..c0fec04c6c 100644 --- a/usr/src/cmd/hal/probing/storage/Makefile +++ b/usr/src/cmd/hal/probing/storage/Makefile @@ -30,6 +30,7 @@ OBJS = probe-storage.o cdutils.o fsutils.o logger.o SRCS = addon-storage.c include ../../../Makefile.cmd +include ../../../Makefile.cmd.64 include ../../Makefile.hal ROOTCMDDIR = $(ROOTLIB_HAL) diff --git a/usr/src/cmd/hal/probing/volume/Makefile b/usr/src/cmd/hal/probing/volume/Makefile index b69717235c..9b8dce7136 100644 --- a/usr/src/cmd/hal/probing/volume/Makefile +++ b/usr/src/cmd/hal/probing/volume/Makefile @@ -30,6 +30,7 @@ OBJS = probe-volume.o cdutils.o fsutils.o logger.o SRCS = probe-volume.c include ../../../Makefile.cmd +include ../../../Makefile.cmd.64 include ../../Makefile.hal ROOTCMDDIR = $(ROOTLIB_HAL) diff --git a/usr/src/cmd/hal/probing/xkb/Makefile b/usr/src/cmd/hal/probing/xkb/Makefile index 8d6b1fc13c..8a35791e69 100644 --- a/usr/src/cmd/hal/probing/xkb/Makefile +++ b/usr/src/cmd/hal/probing/xkb/Makefile @@ -29,6 +29,7 @@ OBJS = probe-xkb.o logger.o SRCS = probe-xkb.c include ../../../Makefile.cmd +include ../../../Makefile.cmd.64 include ../../Makefile.hal ROOTCMDDIR = $(ROOTLIB_HAL) diff --git a/usr/src/cmd/hal/tools/Makefile b/usr/src/cmd/hal/tools/Makefile index ea23aa32e5..5a14b479d1 100644 --- a/usr/src/cmd/hal/tools/Makefile +++ b/usr/src/cmd/hal/tools/Makefile @@ -58,6 +58,7 @@ CLOBBERFILES += $(HAL_PROG) $(STORAGE_PROG) $(SCRIPT_BIN) $(SCRIPT_LIB) $(HAL_LI CLEANFILES += $(STORAGE_SHAREDOBJS) $(STORAGE_OBJS) hal-storage-zpool.o include ../../Makefile.cmd +include ../../Makefile.cmd.64 include ../Makefile.hal $(HAL_PROG) := LDLIBS += -lc -ldbus-1 -lhal diff --git a/usr/src/cmd/hal/tools/illumos/Makefile b/usr/src/cmd/hal/tools/illumos/Makefile index 405d5316fc..95caf39358 100644 --- a/usr/src/cmd/hal/tools/illumos/Makefile +++ b/usr/src/cmd/hal/tools/illumos/Makefile @@ -37,6 +37,7 @@ OBJS = $(HAL_PROG:%=%.o) CLOBBERFILES += $(HAL_PROGS) include ../../../Makefile.cmd +include ../../../Makefile.cmd.64 include ../../Makefile.hal $(HAL_PROGS) := LDLIBS += -lc $(ZIGNORE) -lglib-2.0 diff --git a/usr/src/cmd/hotplugd/Makefile b/usr/src/cmd/hotplugd/Makefile index d2577c4e73..8d881fdfab 100644 --- a/usr/src/cmd/hotplugd/Makefile +++ b/usr/src/cmd/hotplugd/Makefile @@ -38,7 +38,7 @@ MANIFEST= hotplug.xml include ../Makefile.cmd -ROOTCMDDIR= $(ROOTLIB) +ROOTCMDDIR= $(ROOTLIB64) ROOTMANIFESTDIR= $(ROOTSVCSYSTEM) $(ROOTMANIFEST) := FILEMODE= 444 diff --git a/usr/src/cmd/intrd/Makefile b/usr/src/cmd/intrd/Makefile index 32dd956b5b..846b6c98aa 100644 --- a/usr/src/cmd/intrd/Makefile +++ b/usr/src/cmd/intrd/Makefile @@ -38,7 +38,7 @@ ROOTMANIFESTDIR= $(ROOTSVCSYSTEM) # install macros and rule # -ROOTPROG= $(ROOTLIB)/$(PROG) +ROOTPROG= $(ROOTLIB64)/$(PROG) $(ROOTPROG) := FILEMODE= 555 .KEEP_STATE: diff --git a/usr/src/cmd/ipf/tools/Makefile b/usr/src/cmd/ipf/tools/Makefile index 4129c367ec..48336bf95c 100644 --- a/usr/src/cmd/ipf/tools/Makefile +++ b/usr/src/cmd/ipf/tools/Makefile @@ -33,7 +33,7 @@ include ../../Makefile.cmd $(64ONLY)SUBDIRS= $(MACH) $(BUILD64)SUBDIRS += $(MACH64) -USRLIBIPF= $(ROOTLIB)/ipf +USRLIBIPF= $(ROOTLIB64)/ipf USRLIBIPFLICENCE= $(LICENCE:%=$(USRLIBIPF)/%) FILEMODE= 0755 diff --git a/usr/src/cmd/ipf/tools/Makefile.tools b/usr/src/cmd/ipf/tools/Makefile.tools index e773dfe9eb..a78f9f2216 100644 --- a/usr/src/cmd/ipf/tools/Makefile.tools +++ b/usr/src/cmd/ipf/tools/Makefile.tools @@ -72,7 +72,7 @@ ippool := LDLIBS += -lkvm -lelf CLEANFILES += $(OBJS) CLOBBERFILES += $(IPFPROG) -ROOTIPF= $(ROOTLIB)/ipf +ROOTIPF= $(ROOTLIB64)/ipf ROOTIPF32= $(ROOTIPF)/$(MACH32) ROOTIPF64= $(ROOTIPF)/$(MACH64) diff --git a/usr/src/cmd/krb5/kadmin/server/Makefile b/usr/src/cmd/krb5/kadmin/server/Makefile index f38ba864fa..cfe23dc9ea 100644 --- a/usr/src/cmd/krb5/kadmin/server/Makefile +++ b/usr/src/cmd/krb5/kadmin/server/Makefile @@ -53,7 +53,7 @@ SMATCH=off LDFLAGS += $(KRUNPATH) $(KERBRUNPATH) LDLIBS += -lgss -L$(KRB5LIB) \ - -lmech_krb5 -lkadm5srv -lkdb -lresolv -lpam + -L$(ROOT_KLIBDIR) -lmech_krb5 -lkadm5srv -lkdb -lresolv -lpam .KEEP_STATE: diff --git a/usr/src/cmd/krb5/slave/Makefile b/usr/src/cmd/krb5/slave/Makefile index fea4516679..181cbc9b81 100644 --- a/usr/src/cmd/krb5/slave/Makefile +++ b/usr/src/cmd/krb5/slave/Makefile @@ -68,7 +68,7 @@ CERRWARN += -Wno-address SMATCH=off LDFLAGS += $(KRUNPATH) $(KERBRUNPATH) -LDLIBS += -lmech_krb5 +LDLIBS += -L$(ROOT_KLIBDIR) -lmech_krb5 $(PROG1) := LDLIBS += -L$(KRB5LIB) -lkadm5srv $(PROG2) := LDLIBS += -L$(KRB5LIB) -lkdb -lkadm5clnt diff --git a/usr/src/cmd/listen/Makefile b/usr/src/cmd/listen/Makefile index 8a0631d13a..9292ab1d56 100644 --- a/usr/src/cmd/listen/Makefile +++ b/usr/src/cmd/listen/Makefile @@ -41,7 +41,7 @@ SRCS= $(LSSRC) $(NLPSSRC) include ../Makefile.cmd -LIBSAFD = $(ROOTLIB)/saf +LIBSAFD = $(ROOT)/usr/lib/saf NETD = $(ROOT)/usr/net NETNLSD = $(NETD)/nls diff --git a/usr/src/cmd/loadkeys/Makefile b/usr/src/cmd/loadkeys/Makefile index b9e4b588b2..e3a0f3a72a 100644 --- a/usr/src/cmd/loadkeys/Makefile +++ b/usr/src/cmd/loadkeys/Makefile @@ -31,7 +31,7 @@ i386_SUBDIRS= type_6 type_101 SUBDIRS= $($(MACH)_SUBDIRS) SRCS= $(PROG:%=%.c) -ROOTHELPER= $(ROOTLIB)/set_keyboard_layout +ROOTHELPER= $(ROOTLIB64)/set_keyboard_layout sparc_EXTRA_INSTALL_TARGETS=$(ROOTHELPER) i386_EXTRA_INSTALL_TARGETS=$(ROOTHELPER) EXTRA_INSTALL_TARGETS= $($(MACH)_EXTRA_INSTALL_TARGETS) @@ -56,7 +56,7 @@ all: $(PROG) $(SUBDIRS) install: $(PROG) $(ROOTPROG) $(SUBDIRS) $(EXTRA_INSTALL_TARGETS) -$(ROOTLIB)/%: % +$(ROOTLIB64)/%: % $(INS.file) # explicit yacc work for the NSE diff --git a/usr/src/cmd/mdb/intel/amd64/kmdb/Makefile b/usr/src/cmd/mdb/intel/amd64/kmdb/Makefile index cdff5716f1..2f46217cd3 100644 --- a/usr/src/cmd/mdb/intel/amd64/kmdb/Makefile +++ b/usr/src/cmd/mdb/intel/amd64/kmdb/Makefile @@ -50,8 +50,8 @@ include ../../../../Makefile.cmd.64 include ../../Makefile.amd64 include ../../../Makefile.kmdb -STANDLIBS += $(ROOT)/usr/lib/amd64/libstanddisasm.so -STANDLIBS += $(ROOT)/usr/lib/amd64/libstandsaveargs.so +STANDLIBS += $(ROOT)/usr/lib/libstanddisasm.so +STANDLIBS += $(ROOT)/usr/lib/libstandsaveargs.so INCDIRS += $(SRCTOP)/arch/x86/kernel/include INCDIRS += $(SRC)/common/dis/i386 diff --git a/usr/src/cmd/msgfmt/Makefile b/usr/src/cmd/msgfmt/Makefile index 29a46a997b..67bf74fe2c 100644 --- a/usr/src/cmd/msgfmt/Makefile +++ b/usr/src/cmd/msgfmt/Makefile @@ -61,7 +61,7 @@ POFILES= $(SOBJS:%.o=%.po) $(GOBJS:%.o=%.po) $(COBJS:%.o=%.po) \ CLOBBERFILES += gmsgfmt_rev ROOTBINPROG= $(BINPROG:%=$(ROOTBIN)/%) -ROOTLIBPROG= $(LIBPROG:%=$(ROOTLIB)/%) +ROOTLIBPROG= $(LIBPROG:%=$(ROOTLIB64)/%) CERRWARN += -Wno-parentheses CERRWARN += -Wno-unused-label diff --git a/usr/src/cmd/ndmpd/Makefile b/usr/src/cmd/ndmpd/Makefile index c31e628ba2..130a6738c5 100644 --- a/usr/src/cmd/ndmpd/Makefile +++ b/usr/src/cmd/ndmpd/Makefile @@ -111,7 +111,7 @@ MANIFEST = ndmp.xml ROOTMANIFESTDIR= $(ROOTSVCSYSTEM) $(ROOTMANIFEST) := FILEMODE = 444 -ROOTNDMPDDIR= $(ROOTLIB)/ndmp +ROOTNDMPDDIR= $(ROOTLIB64)/ndmp ROOTNDMPDFILE = $(PROG:%=$(ROOTNDMPDDIR)/%) FILEMODE = 0444 diff --git a/usr/src/cmd/passwd/Makefile b/usr/src/cmd/passwd/Makefile index 2a6bda9e07..e2569cde69 100644 --- a/usr/src/cmd/passwd/Makefile +++ b/usr/src/cmd/passwd/Makefile @@ -27,6 +27,7 @@ PROG= passwd DEFAULTFILES= passwd.dfl include ../Makefile.cmd +include ../Makefile.cmd.64 passwd := LDLIBS += $(ROOT)/usr/lib/passwdutil.so.1 LDFLAGS += $(ZIGNORE) diff --git a/usr/src/cmd/pfexecd/Makefile b/usr/src/cmd/pfexecd/Makefile index 36ecfffbbd..c11886609c 100644 --- a/usr/src/cmd/pfexecd/Makefile +++ b/usr/src/cmd/pfexecd/Makefile @@ -40,7 +40,7 @@ LDLIBS += -lsecdb # install macros and rule # GROUP= bin -ROOTPROG= $(ROOTLIB)/$(PROG) +ROOTPROG= $(ROOTLIB64)/$(PROG) $(ROOTPROG) := FILEMODE= 555 .KEEP_STATE: diff --git a/usr/src/cmd/policykit/Makefile b/usr/src/cmd/policykit/Makefile index 8e1a100822..268e8dc29a 100644 --- a/usr/src/cmd/policykit/Makefile +++ b/usr/src/cmd/policykit/Makefile @@ -28,6 +28,7 @@ PROG = polkit-is-privileged SRCS = $(PROG:%=%.c) include ../Makefile.cmd +include ../Makefile.cmd.64 include $(SRC)/lib/policykit/Makefile.policykit LDLIBS += -lpolkit $(POLICYKIT_GLIB_LDLIBS) diff --git a/usr/src/cmd/power/Makefile b/usr/src/cmd/power/Makefile index 90741b8e1f..c41af0d3a0 100644 --- a/usr/src/cmd/power/Makefile +++ b/usr/src/cmd/power/Makefile @@ -69,7 +69,7 @@ $(ROOTUSRSBINPMCFG) := FILEMODE= 4555 ROOTUSRBINSUSPEND= $(SUSPEND:%=$(ROOTBIN)/%) $(ROOTUSRBINSUSPEND) := FILEMODE= 4555 -ROOTLIBPOWER= $(ROOTLIB)/power +ROOTLIBPOWER= $(ROOTLIB64)/power ROOTLIBPOWERDAEMON= $(DAEMON:%=$(ROOTLIBPOWER)/%) $(ROOTLIBPOWER) := FILEMODE= 755 $(ROOTLIBPOWERDAEMON) := FILEMODE= 555 diff --git a/usr/src/cmd/priocntl/Makefile b/usr/src/cmd/priocntl/Makefile index 82ef1b1f21..caa54e68cc 100644 --- a/usr/src/cmd/priocntl/Makefile +++ b/usr/src/cmd/priocntl/Makefile @@ -38,7 +38,7 @@ LDLIBS += -lcontract CERRWARN += -Wno-parentheses CERRWARN += -Wno-uninitialized -CLASSD = $(ROOTLIB)/class +CLASSD = $(ROOTLIB64)/class RTD = $(CLASSD)/RT SDCD = $(CLASSD)/SDC TSD = $(CLASSD)/TS diff --git a/usr/src/cmd/prtdiag/Makefile.com b/usr/src/cmd/prtdiag/Makefile.com index 1beb3c60d0..e96d994a61 100644 --- a/usr/src/cmd/prtdiag/Makefile.com +++ b/usr/src/cmd/prtdiag/Makefile.com @@ -25,6 +25,7 @@ # include $(SRCDIR)/../Makefile.cmd +include $(SRCDIR)/../Makefile.cmd.64 include $(SRCDIR)/../../Makefile.psm PROG = prtdiag diff --git a/usr/src/cmd/rcm_daemon/Makefile.com b/usr/src/cmd/rcm_daemon/Makefile.com index ce18824525..656ee453b9 100644 --- a/usr/src/cmd/rcm_daemon/Makefile.com +++ b/usr/src/cmd/rcm_daemon/Makefile.com @@ -127,16 +127,16 @@ MAPFILES = ../common/mapfile-intf $(MAPFILE.NGB) rcm_daemon := LDFLAGS += $(MAPFILES:%=-Wl,-M%) -LDLIBS_MODULES = -SUNW_pool_rcm.so := LDLIBS_MODULES += -L$(ROOT)/usr/lib -lpool -SUNW_network_rcm.so := LDLIBS_MODULES += -L$(ROOT)/lib -ldladm -SUNW_vlan_rcm.so := LDLIBS_MODULES += -L$(ROOT)/lib -ldladm -SUNW_vnic_rcm.so := LDLIBS_MODULES += -L$(ROOT)/lib -ldladm -SUNW_ibpart_rcm.so := LDLIBS_MODULES += -L$(ROOT)/lib -ldladm -SUNW_aggr_rcm.so := LDLIBS_MODULES += -L$(ROOT)/lib -ldladm -SUNW_ip_rcm.so := LDLIBS_MODULES += -L$(ROOT)/lib -linetutil -ldladm -lipmp -lipadm -SUNW_ip_anon_rcm.so := LDLIBS_MODULES += -L$(ROOT)/lib -linetutil -SUNW_bridge_rcm.so := LDLIBS_MODULES += -L$(ROOT)/lib -ldladm +LDLIBS_MODULES = -L$(ROOT)/lib/$(MACH32) -L$(ROOT)/usr/lib +SUNW_pool_rcm.so := LDLIBS_MODULES += -lpool +SUNW_network_rcm.so := LDLIBS_MODULES += -ldladm +SUNW_vlan_rcm.so := LDLIBS_MODULES += -ldladm +SUNW_vnic_rcm.so := LDLIBS_MODULES += -ldladm +SUNW_ibpart_rcm.so := LDLIBS_MODULES += -ldladm +SUNW_aggr_rcm.so := LDLIBS_MODULES += -ldladm +SUNW_ip_rcm.so := LDLIBS_MODULES += -linetutil -ldladm -lipmp -lipadm +SUNW_ip_anon_rcm.so := LDLIBS_MODULES += -linetutil +SUNW_bridge_rcm.so := LDLIBS_MODULES += -ldladm LDLIBS += -lgen -lelf -lrcm -lnvpair -ldevinfo @@ -151,7 +151,7 @@ RCM_SCRIPTS = $(PERL_SCRIPTS) $(SHELL_SCRIPTS) # install specifics -ROOTLIB_RCM = $(ROOTLIB)/$(RCM_DIR) +ROOTLIB_RCM = $(ROOTLIB64)/$(RCM_DIR) ROOTLIB_RCM_MOD = $(ROOTLIB_RCM)/$(MOD_DIR) ROOTLIB_RCM_DAEMON = $(RCM_DAEMON:%=$(ROOTLIB_RCM)/%) ROOTLIB_RCM_MODULES = $(COMMON_RCM_MODS:%=$(ROOTLIB_RCM_MOD)/%) \ diff --git a/usr/src/cmd/rmvolmgr/Makefile b/usr/src/cmd/rmvolmgr/Makefile index a93d17e542..7422c2bbbc 100644 --- a/usr/src/cmd/rmvolmgr/Makefile +++ b/usr/src/cmd/rmvolmgr/Makefile @@ -52,7 +52,7 @@ CERRWARN += -Wno-unused-function # not linted SMATCH=off -ROOTCMDDIR = $(ROOTLIB) +ROOTCMDDIR = $(ROOTLIB64) ROOTMANIFESTDIR = $(ROOTSVCSYSTEMFILESYSTEM) $(ROOTMANIFEST) := FILEMODE = 444 $(ROOTLIBSVCMETHOD)/svc-rmvolmgr:= FILEMODE = 555 diff --git a/usr/src/cmd/rpcsvc/Makefile b/usr/src/cmd/rpcsvc/Makefile index 0050046d8f..27097988d6 100644 --- a/usr/src/cmd/rpcsvc/Makefile +++ b/usr/src/cmd/rpcsvc/Makefile @@ -82,7 +82,7 @@ ETCFILES= rpc TXTS= $(ETCFILES:%=net_files/%) -NETSVC= $(ROOTLIB)/netsvc +NETSVC= $(ROOTLIB64)/netsvc NIS = $(NETSVC)/nis RWALL= $(NETSVC)/rwall RUSERS= $(NETSVC)/rusers diff --git a/usr/src/cmd/saf/Makefile b/usr/src/cmd/saf/Makefile index fafdd94638..fbb4eb5def 100644 --- a/usr/src/cmd/saf/Makefile +++ b/usr/src/cmd/saf/Makefile @@ -46,7 +46,7 @@ PMADMSRC= $(PMADMOBJ:%.o=%.c) PMADMSRCS= $(PMADMSRC) util.c OBJS= $(SACOBJS) $(SACADMOBJS) $(PMADMOBJS) -LIBSAFD = $(ROOTLIB)/saf +LIBSAFD = $(ROOT)/usr/lib/saf DIRS= $(LIBSAFD) SACF= sac ADMF= sacadm pmadm diff --git a/usr/src/cmd/savecore/amd64/Makefile b/usr/src/cmd/savecore/amd64/Makefile index b6c2d55e76..c1a32b405b 100644 --- a/usr/src/cmd/savecore/amd64/Makefile +++ b/usr/src/cmd/savecore/amd64/Makefile @@ -25,7 +25,7 @@ include ../Makefile.com include ../../Makefile.cmd.64 -LDLIBS += -L$(ROOT)/usr/lib/fm/amd64 -lfmevent -lnvpair -LDFLAGS += -R/usr/lib/fm/amd64 +LDLIBS += -L$(ROOT)/usr/lib/fm -lfmevent -lnvpair +LDFLAGS += -R/usr/lib/fm install: all $(ROOTPROG64) diff --git a/usr/src/cmd/savecore/i386/Makefile b/usr/src/cmd/savecore/i386/Makefile index 1c19187ee8..c4cdb965bd 100644 --- a/usr/src/cmd/savecore/i386/Makefile +++ b/usr/src/cmd/savecore/i386/Makefile @@ -23,7 +23,7 @@ include ../Makefile.com -LDLIBS += -L$(ROOT)/usr/lib/fm -lfmevent -lnvpair -LDFLAGS += -R/usr/lib/fm +LDLIBS += -L$(ROOT)/usr/lib/fm/i386 -lfmevent -lnvpair +LDFLAGS += -R/usr/lib/fm/i386 install: all $(ROOTPROG32) diff --git a/usr/src/cmd/scsi/sestopo/Makefile.com b/usr/src/cmd/scsi/sestopo/Makefile.com index 72c4836c57..509fe6c618 100644 --- a/usr/src/cmd/scsi/sestopo/Makefile.com +++ b/usr/src/cmd/scsi/sestopo/Makefile.com @@ -40,8 +40,8 @@ $(NOT_RELEASE_BUILD)CPPFLAGS += -DDEBUG CPPFLAGS += -I. -I../common CFLAGS += $(CTF_FLAGS) CERRWARN += -Wno-unused-variable -LDLIBS += -L$(ROOT)/usr/lib/scsi -lses -lnvpair -LDFLAGS += -R/usr/lib/scsi +LDLIBS += -L$(ROOT)/usr/lib/scsi/$(MACH32) -lses -lnvpair +LDFLAGS += -R/usr/lib/scsi/$(MACH32) all: $(PROG) diff --git a/usr/src/cmd/scsi/smp/Makefile.com b/usr/src/cmd/scsi/smp/Makefile.com index 2841a4535a..40d1758cb3 100644 --- a/usr/src/cmd/scsi/smp/Makefile.com +++ b/usr/src/cmd/scsi/smp/Makefile.com @@ -38,8 +38,8 @@ ROOTPROG = $(ROOTLIBSCSI)/$(PROG) $(NOT_RELEASE_BUILD)CPPFLAGS += -DDEBUG CPPFLAGS += -I. -I../common CFLAGS += $(CTF_FLAGS) -LDLIBS += -L$(ROOT)/usr/lib/scsi -lsmp -LDFLAGS += -R/usr/lib/scsi +LDLIBS += -L$(ROOT)/usr/lib/scsi/$(MACH32) -lsmp +LDFLAGS += -R/usr/lib/scsi/$(MACH32) CERRWARN += -Wno-unused-variable diff --git a/usr/src/cmd/sgs/Makefile.var b/usr/src/cmd/sgs/Makefile.var index 5c57ed01fa..f078090cc0 100644 --- a/usr/src/cmd/sgs/Makefile.var +++ b/usr/src/cmd/sgs/Makefile.var @@ -104,13 +104,13 @@ VAR_ELFEDIT_LLDFLAGS64 ='-R$$ORIGIN/../../../lib/$(MACH64)' # # lddstub # -VAR_LDDSTUB_INTERP= -I'$$ORIGIN/ld.so.1' +VAR_LDDSTUB_INTERP= -I'$$ORIGIN/ld.so' # # libld # VAR_LIBLD_CPPFLAGS= $(VAR_AVLINCDIR) -VAR_LIBLD_64_ROOTFS_LIBDIR= $(ROOT)/lib/$(MACH64) +VAR_LIBLD_64_ROOTFS_LIBDIR= $(ROOT)/lib # # Tools @@ -120,7 +120,7 @@ VAR_TOOLS_CPPFLAGS= $(VAR_AVLINCDIR) # # liblddbg # -VAR_LIBLDDBG_64_ROOTFS_LIBDIR= $(ROOT)/lib/$(MACH64) +VAR_LIBLDDBG_64_ROOTFS_LIBDIR= $(ROOT)/lib # # rtld diff --git a/usr/src/cmd/sgs/crle/common/crle.msg b/usr/src/cmd/sgs/crle/common/crle.msg index fd3cba0710..e8b0917f48 100644 --- a/usr/src/cmd/sgs/crle/common/crle.msg +++ b/usr/src/cmd/sgs/crle/common/crle.msg @@ -141,7 +141,7 @@ @ MSG_DEF_NOCONF "\nDefault configuration file (%s) not found\n" -@ MSG_DEF_NEWDLP " Default Library Path (ELF):\t/lib/32:/usr/lib/32:/lib:/usr/lib \ +@ MSG_DEF_NEWDLP " Default Library Path (ELF):\t/lib/32:/usr/lib/32 \ (system default)\n" @ MSG_DEF_OLDDLP " Default Library Path (ELF):\t/usr/lib \ (system default)\n" @@ -149,7 +149,7 @@ /lib/secure:/usr/lib/secure (system default)\n" @ MSG_DEF_OLDTD " Trusted Directories (ELF):\t/usr/lib/secure \ (system default)\n" -@ MSG_DEF_NEWDLP_64 " Default Library Path (ELF):\t/lib/64:/usr/lib/64 \ +@ MSG_DEF_NEWDLP_64 " Default Library Path (ELF):\t/lib/64:/lib:/usr/lib/64:/usr/lib \ (system default)\n" @ MSG_DEF_OLDDLP_64 " Default Library Path (ELF):\t/usr/lib/64 \ (system default)\n" diff --git a/usr/src/cmd/sgs/lddstub/Makefile.targ b/usr/src/cmd/sgs/lddstub/Makefile.targ index 51aac7a85d..705a594edb 100644 --- a/usr/src/cmd/sgs/lddstub/Makefile.targ +++ b/usr/src/cmd/sgs/lddstub/Makefile.targ @@ -42,6 +42,11 @@ $(PROG): $(OBJS) $(LD) -o $@ $(REMOVE_GCC_PREFIX:sh) $(OBJS) $(POST_PROCESS) +$(ROOTLIBEXEC)/%: % + $(INS.file) +$(ROOTLIBEXEC32)/%: % + $(INS.file) + clean: $(RM) $(OBJS) $(CLEANFILES) diff --git a/usr/src/cmd/sgs/lddstub/amd64/Makefile b/usr/src/cmd/sgs/lddstub/amd64/Makefile index 275f137d6c..0da09927b4 100644 --- a/usr/src/cmd/sgs/lddstub/amd64/Makefile +++ b/usr/src/cmd/sgs/lddstub/amd64/Makefile @@ -34,7 +34,7 @@ CONVLIBDIR= $(CONVLIBDIR64) ASFLAGS += -D__amd64 $(amd64_AS_XARCH) -install: all $(ROOTLIB64)/$(PROG) +install: all $(ROOTLIBEXEC)/$(PROG) include ../Makefile.targ include ../../Makefile.sub.64 diff --git a/usr/src/cmd/sgs/lddstub/i386/Makefile b/usr/src/cmd/sgs/lddstub/i386/Makefile index 3769f8b87a..17e64603e9 100644 --- a/usr/src/cmd/sgs/lddstub/i386/Makefile +++ b/usr/src/cmd/sgs/lddstub/i386/Makefile @@ -30,6 +30,6 @@ include ../Makefile.com .KEEP_STATE: -install: $(ROOTLIBPROG) +install: $(ROOTLIBEXEC32)/$(PROG) include ../Makefile.targ diff --git a/usr/src/cmd/sgs/ldprof/Makefile.com b/usr/src/cmd/sgs/ldprof/Makefile.com index be673e38af..74f7e87073 100644 --- a/usr/src/cmd/sgs/ldprof/Makefile.com +++ b/usr/src/cmd/sgs/ldprof/Makefile.com @@ -33,7 +33,7 @@ OBJECTS= $(COMOBJS) $(BLTOBJ) include ../../../../lib/Makefile.lib include ../../Makefile.com -ROOTLIBDIR= $(ROOT)/usr/lib/link_audit +ROOTLIBDIR= $(ROOT)/usr/lib/link_audit/i386 MAPFILES = ../common/mapfile-vers diff --git a/usr/src/cmd/sgs/ldprof/amd64/Makefile b/usr/src/cmd/sgs/ldprof/amd64/Makefile index fd769d316d..336aa07354 100644 --- a/usr/src/cmd/sgs/ldprof/amd64/Makefile +++ b/usr/src/cmd/sgs/ldprof/amd64/Makefile @@ -28,7 +28,7 @@ include ../Makefile.com -ROOTLIBDIR64= $(ROOT)/usr/lib/link_audit/$(MACH64) +ROOTLIBDIR64= $(ROOT)/usr/lib/link_audit ROOTDYNLIB64= $(DYNLIB:%=$(ROOTLIBDIR64)/%) CFLAGS64 += $(C_PICFLAGS64) -D_ELF64 diff --git a/usr/src/cmd/sgs/libconv/common/lddstub.msg b/usr/src/cmd/sgs/libconv/common/lddstub.msg index 8913d2ea84..2937e75f3c 100644 --- a/usr/src/cmd/sgs/libconv/common/lddstub.msg +++ b/usr/src/cmd/sgs/libconv/common/lddstub.msg @@ -23,10 +23,10 @@ # Use is subject to license terms. # -@ MSG_ORG_32LDD_32STUB "/../lib/lddstub" -@ MSG_ORG_32LDD_64STUB "/../lib/64/lddstub" -@ MSG_ORG_64LDD_32STUB "/../../lib/lddstub" -@ MSG_ORG_64LDD_64STUB "/../../lib/64/lddstub" +@ MSG_ORG_32LDD_32STUB "/lddstub" +@ MSG_ORG_32LDD_64STUB "/../lddstub" +@ MSG_ORG_64LDD_32STUB "/i386/lddstub" +@ MSG_ORG_64LDD_64STUB "/lddstub" -@ MSG_PTH_LDDSTUB "/usr/lib/lddstub" -@ MSG_PTH_LDDSTUB_64 "/usr/lib/64/lddstub" +@ MSG_PTH_LDDSTUB "/usr/libexec/i386/lddstub" +@ MSG_PTH_LDDSTUB_64 "/usr/libexec/lddstub" diff --git a/usr/src/cmd/sgs/libld/common/globals.c b/usr/src/cmd/sgs/libld/common/globals.c index f8d4490377..3b6105c695 100644 --- a/usr/src/cmd/sgs/libld/common/globals.c +++ b/usr/src/cmd/sgs/libld/common/globals.c @@ -52,8 +52,8 @@ char *Ulibdir; /* User specified -YU */ * line. Note: these strings can not use MSG_ORIG() since they are modified as * part of the path processing. */ -char def64_Plibpath[] = "/lib/64:/usr/lib/64"; -char def32_Plibpath[] = "/lib/32:/lib:/usr/lib/32:/usr/lib"; +char def64_Plibpath[] = "/lib/64:/lib:/usr/lib/64:/usr/lib"; +char def32_Plibpath[] = "/lib/32:/usr/lib/32"; /* * Rejected file error messages (indexed to match SGS_REJ_ values). diff --git a/usr/src/cmd/sgs/libld/common/ldmain.c b/usr/src/cmd/sgs/libld/common/ldmain.c index a00fc7ef91..eeb8f0ecc1 100644 --- a/usr/src/cmd/sgs/libld/common/ldmain.c +++ b/usr/src/cmd/sgs/libld/common/ldmain.c @@ -58,9 +58,9 @@ Target ld_targ; * part of the path processing. */ #if defined(_ELF64) -static char def_Plibpath[] = "/lib/64:/usr/lib/64"; +static char def_Plibpath[] = "/lib/64:/lib:/usr/lib/64:/usr/lib"; #else -static char def_Plibpath[] = "/lib/32:/lib:/usr/lib/32:/usr/lib"; +static char def_Plibpath[] = "/lib/32:/usr/lib/32"; #endif /* diff --git a/usr/src/cmd/sgs/libldstab/amd64/Makefile b/usr/src/cmd/sgs/libldstab/amd64/Makefile index bedeea5a05..e16a9ea20b 100644 --- a/usr/src/cmd/sgs/libldstab/amd64/Makefile +++ b/usr/src/cmd/sgs/libldstab/amd64/Makefile @@ -28,7 +28,7 @@ include ../Makefile.com .KEEP_STATE: -ROOTLIBDIR= $(ROOT)/usr/lib/$(MACH64) +ROOTLIBDIR= $(ROOT)/usr/lib ROOTDYNLIB64= $(DYNLIB:%=$(ROOTLIBDIR)/%) CONVLIBDIR= $(CONVLIBDIR64) diff --git a/usr/src/cmd/sgs/libldstab/i386/Makefile b/usr/src/cmd/sgs/libldstab/i386/Makefile index 32d67e8050..7d479f4dd6 100644 --- a/usr/src/cmd/sgs/libldstab/i386/Makefile +++ b/usr/src/cmd/sgs/libldstab/i386/Makefile @@ -24,6 +24,8 @@ DUPOBJS= stab64.o +ROOTLIBDIR= $(ROOT)/usr/lib/$(MACH32) + include ../Makefile.com .KEEP_STATE: diff --git a/usr/src/cmd/sgs/rtld/Makefile.com b/usr/src/cmd/sgs/rtld/Makefile.com index e552faf3c6..a83b917930 100644 --- a/usr/src/cmd/sgs/rtld/Makefile.com +++ b/usr/src/cmd/sgs/rtld/Makefile.com @@ -24,7 +24,7 @@ # # Copyright (c) 2018, Joyent, Inc. -RTLD= ld.so.1 +RTLD= ld.so AVLOBJ= avl.o DTROBJ= dtrace_data.o @@ -65,8 +65,11 @@ ROOTFS_DYNLIB64= $(RTLD:%=$(ROOTFS_LIBDIR64)/%) ETCLIBDIR= $(ROOT)/etc/lib ETCDYNLIB= $(RTLD:%=$(ETCLIBDIR)/%) -ROOTDYNLIB= $(RTLD:%=$(ROOTFS_LIBDIR)/%) -ROOTDYNLIB64= $(RTLD:%=$(ROOTFS_LIBDIR64)/%) +ROOTLIBEXEC= $(ROOT)/usr/libexec +ROOTLIBEXEC32= $(ROOT)/usr/libexec/$(MACH32) + +ROOTDYNLIB= $(RTLD:%=$(ROOTLIBEXEC32)/%) +ROOTDYNLIB64= $(RTLD:%=$(ROOTLIBEXEC)/%) FILEMODE = 755 diff --git a/usr/src/cmd/sgs/rtld/Makefile.targ b/usr/src/cmd/sgs/rtld/Makefile.targ index b27a2447c1..dba832cb5b 100644 --- a/usr/src/cmd/sgs/rtld/Makefile.targ +++ b/usr/src/cmd/sgs/rtld/Makefile.targ @@ -73,6 +73,10 @@ delete: $(ROOTFS_LIBDIR)/%: % $(INS.file) +$(ROOTLIBEXEC)/%: % + $(INS.file) +$(ROOTLIBEXEC32)/%: % + $(INS.file) $(ETCLIBDIR)/%: % $(INS.file) diff --git a/usr/src/cmd/sgs/rtld/common/config_elf.c b/usr/src/cmd/sgs/rtld/common/config_elf.c index 5e6e59ecb0..6322a48286 100644 --- a/usr/src/cmd/sgs/rtld/common/config_elf.c +++ b/usr/src/cmd/sgs/rtld/common/config_elf.c @@ -323,11 +323,11 @@ elf_config(Rt_map *lmp, int aout) #ifndef SGS_PRE_UNIFIED_PROCESS if ((head->ch_cnflags & RTC_HDR_UPM) == 0) { #if defined(_ELF64) - str = conv_config_upm(str, MSG_ORIG(MSG_PTH_USRLIB_64), - MSG_ORIG(MSG_PTH_LIB_64), MSG_PTH_LIB_64_SIZE); -#else str = conv_config_upm(str, MSG_ORIG(MSG_PTH_USRLIB), MSG_ORIG(MSG_PTH_LIB), MSG_PTH_LIB_SIZE); +#else + str = conv_config_upm(str, MSG_ORIG(MSG_PTH_USRLIB_32), + MSG_ORIG(MSG_PTH_LIB_32), MSG_PTH_LIB_32_SIZE); #endif } #endif diff --git a/usr/src/cmd/sgs/rtld/common/elf.c b/usr/src/cmd/sgs/rtld/common/elf.c index 064076c8fe..f2f1d2811b 100644 --- a/usr/src/cmd/sgs/rtld/common/elf.c +++ b/usr/src/cmd/sgs/rtld/common/elf.c @@ -56,11 +56,11 @@ static Spath_defn _elf_def_dirs[] = { #if defined(_ELF64) { MSG_ORIG(MSG_PTH_LIB_64), MSG_PTH_LIB_64_SIZE }, { MSG_ORIG(MSG_PTH_USRLIB_64), MSG_PTH_USRLIB_64_SIZE }, + { MSG_ORIG(MSG_PTH_LIB), MSG_PTH_LIB_SIZE }, + { MSG_ORIG(MSG_PTH_USRLIB), MSG_PTH_USRLIB_SIZE }, #else { MSG_ORIG(MSG_PTH_LIB_32), MSG_PTH_LIB_32_SIZE }, { MSG_ORIG(MSG_PTH_USRLIB_32), MSG_PTH_USRLIB_32_SIZE }, - { MSG_ORIG(MSG_PTH_LIB), MSG_PTH_LIB_SIZE }, - { MSG_ORIG(MSG_PTH_USRLIB), MSG_PTH_USRLIB_SIZE }, #endif { 0, 0 } }; diff --git a/usr/src/cmd/smbsrv/bind-helper/Makefile b/usr/src/cmd/smbsrv/bind-helper/Makefile index 2caf1df21f..f4d2b0a58f 100644 --- a/usr/src/cmd/smbsrv/bind-helper/Makefile +++ b/usr/src/cmd/smbsrv/bind-helper/Makefile @@ -20,7 +20,7 @@ include ../../Makefile.cmd include ../Makefile.smbsrv.defs -ROOTLIBSMBSRVDIR = $(ROOTLIB)/smbsrv +ROOTLIBSMBSRVDIR = $(ROOT)/usr/lib/smbsrv ROOTLIBSMBSRVPROG = $(PROG:%=$(ROOTLIBSMBSRVDIR)/%) .KEEP_STATE: diff --git a/usr/src/cmd/smbsrv/dtrace/Makefile b/usr/src/cmd/smbsrv/dtrace/Makefile index 732e57b859..b5fb0c55bf 100644 --- a/usr/src/cmd/smbsrv/dtrace/Makefile +++ b/usr/src/cmd/smbsrv/dtrace/Makefile @@ -30,7 +30,7 @@ SRCS= smbd-all.d smbd-authsvc.d smbd-doorsvc.d smbd-pipesvc.d \ include ../../Makefile.cmd -ROOTSMBDTRACEDIR = $(ROOTLIB)/smbsrv/dtrace +ROOTSMBDTRACEDIR = $(ROOT)/usr/lib/smbsrv/dtrace ROOTSMBDTRACEFILE = $(SRCS:%=$(ROOTSMBDTRACEDIR)/%) $(ROOTSMBDTRACEFILE):= FILEMODE = 0555 diff --git a/usr/src/cmd/smbsrv/smbd/Makefile b/usr/src/cmd/smbsrv/smbd/Makefile index 2ab1d72686..25b64c9d03 100644 --- a/usr/src/cmd/smbsrv/smbd/Makefile +++ b/usr/src/cmd/smbsrv/smbd/Makefile @@ -73,7 +73,7 @@ LDLIBS += -lmlsvc -lmlrpc -lsmbns -lsmb -lsmbfs -lgss LDLIBS += -lzfs -lscf -lcmdutils -lumem $(PROG) := LDLIBS += -lkrb5 -ROOTSMBDDIR = $(ROOTLIB)/smbsrv +ROOTSMBDDIR = $(ROOT)/usr/lib/smbsrv ROOTSMBDFILE = $(PROG:%=$(ROOTSMBDDIR)/%) FILEMODE = 0444 diff --git a/usr/src/cmd/smserverd/Makefile b/usr/src/cmd/smserverd/Makefile index 785ba285f3..6046d43935 100644 --- a/usr/src/cmd/smserverd/Makefile +++ b/usr/src/cmd/smserverd/Makefile @@ -34,7 +34,7 @@ DERIVED_FILES = smed.h smed_xdr.c smed_svc.c # install specifics -ROOTLIBSMSERVERDIR= $(ROOTLIB)/smedia +ROOTLIBSMSERVERDIR= $(ROOTLIB64)/smedia ROOTLIBSMSERVERD= $(PROG:%=$(ROOTLIBSMSERVERDIR)/%) include ../Makefile.cmd diff --git a/usr/src/cmd/spell/Makefile b/usr/src/cmd/spell/Makefile index f772b13fc8..b08a900126 100644 --- a/usr/src/cmd/spell/Makefile +++ b/usr/src/cmd/spell/Makefile @@ -56,7 +56,7 @@ XGETFLAGS += -a -x spell.xcl CLOBBERFILES += htemp1 htemp2 -ROOTSPELLD = $(ROOTLIB)/spell +ROOTSPELLD = $(ROOTLIB64)/spell ROOTVARADMD = $(ROOT)/var/log ROOTDIRS= $(ROOTSPELLD) diff --git a/usr/src/cmd/svc/configd/Makefile b/usr/src/cmd/svc/configd/Makefile index 51154ccdcc..c98afb7090 100644 --- a/usr/src/cmd/svc/configd/Makefile +++ b/usr/src/cmd/svc/configd/Makefile @@ -85,7 +85,7 @@ FILEMODE = 0555 OBJSQLITE = LIBSQLITE = -lsqlite-sys -$(NATIVE_BUILD)OBJSQLITE = $(ROOT)/lib/libsqlite-native.o +$(NATIVE_BUILD)OBJSQLITE = $(ROOT)/lib/$(MACH32)/libsqlite-native.o $(NATIVE_BUILD)LIBSQLITE = OBJS += $(OBJSQLITE) diff --git a/usr/src/cmd/svc/startd/Makefile b/usr/src/cmd/svc/startd/Makefile index f7d3841d83..86f806b7b6 100644 --- a/usr/src/cmd/svc/startd/Makefile +++ b/usr/src/cmd/svc/startd/Makefile @@ -94,8 +94,8 @@ LDLIBS_i386 += -lbe # we don't directly depend on anything in /usr/lib/fm, but libfmevent does # (libtopo is there), so we must specify it here or we will link against # libtopo on the running system -LDLIBS += $(LDLIBS_$(MACH)) -L $(ROOT)/lib/fm -L $(ROOT)/usr/lib/fm -lfmevent -LDFLAGS += -R/lib/fm +LDLIBS += $(LDLIBS_$(MACH)) -L $(ROOT)/lib/fm/$(MACH32) -L $(ROOT)/usr/lib/fm/$(MACH32) -lfmevent +LDFLAGS += -R/lib/fm/$(MACH32) FILEMODE = 0555 diff --git a/usr/src/cmd/syslogd/Makefile.com b/usr/src/cmd/syslogd/Makefile.com index 7b066707e5..bc6ffc6034 100644 --- a/usr/src/cmd/syslogd/Makefile.com +++ b/usr/src/cmd/syslogd/Makefile.com @@ -50,7 +50,7 @@ VARAUTHLOG= authlog ROOTVARLOGD= $(ROOT)/var/log ROOTETCCONFIG= $(CONFIGFILE:%=$(ROOTETC)/%) -ROOTLIBROTATE= $(ROTATESCRIPT:%=$(ROOTLIB)/%) +ROOTLIBROTATE= $(ROTATESCRIPT:%=$(ROOTLIB64)/%) ROOTVARSYSLOG= $(VARSYSLOG:%=$(ROOTVARLOGD)/%) ROOTVARAUTHLOG= $(VARAUTHLOG:%=$(ROOTVARLOGD)/%) @@ -66,7 +66,7 @@ $(ROOTVARLOGD)/% : % $(ROOTETC)/%: ../% $(INS.file) -$(ROOTLIB)/%: ../% +$(ROOTLIB64)/%: ../% $(INS.file) .KEEP_STATE: diff --git a/usr/src/cmd/ttymon/Makefile b/usr/src/cmd/ttymon/Makefile index 26e5897993..2eebf62eb9 100644 --- a/usr/src/cmd/ttymon/Makefile +++ b/usr/src/cmd/ttymon/Makefile @@ -79,7 +79,7 @@ POFILES= $(STTYOBJ:sttyobjs/%.o=%.po) POFILE= ttymon.po -LIBSAFD= $(ROOTLIB)/saf +LIBSAFD= $(ROOTLIB64)/saf DIRS= $(LIBSAFD) LIBSAF= ttymon USRSBINF= sttydefs ttyadm diff --git a/usr/src/cmd/vscan/vscand/Makefile b/usr/src/cmd/vscan/vscand/Makefile index 8c0a88679a..782dfb4115 100644 --- a/usr/src/cmd/vscan/vscand/Makefile +++ b/usr/src/cmd/vscan/vscand/Makefile @@ -52,7 +52,7 @@ CSTD = $(CSTD_GNU99) MANIFEST = vscan.xml ROOTMANIFESTDIR= $(ROOTSVCSYSTEM)/filesystem -ROOTVSCANDIR= $(ROOTLIB)/vscan +ROOTVSCANDIR= $(ROOTLIB64)/vscan ROOTVSCANFILE = $(PROG:%=$(ROOTVSCANDIR)/%) CHECKHDRS= $(HDRS:%.h=%.check) diff --git a/usr/src/cmd/xhci/Makefile b/usr/src/cmd/xhci/Makefile index b0282ca5f9..f1a938bf82 100644 --- a/usr/src/cmd/xhci/Makefile +++ b/usr/src/cmd/xhci/Makefile @@ -15,7 +15,7 @@ PROG= xhci_portsc -ROOTLIBXHCI = $(ROOTLIB)/xhci +ROOTLIBXHCI = $(ROOTLIB64)/xhci ROOTLIBXHCIPROG = $(PROG:%=$(ROOTLIBXHCI)/%) include ../Makefile.cmd diff --git a/usr/src/cmd/ypcmd/Makefile b/usr/src/cmd/ypcmd/Makefile index e58a3d2505..aa4037f2a2 100644 --- a/usr/src/cmd/ypcmd/Makefile +++ b/usr/src/cmd/ypcmd/Makefile @@ -42,12 +42,12 @@ include ../Makefile.cmd ROOTMANIFESTDIR = $(ROOTSVCNETWORKNIS) # installed directories -NETSVC = $(ROOTLIB)/netsvc +NETSVC = $(ROOTLIB64)/netsvc NETYP = $(NETSVC)/yp ROOTVAR_YP = $(ROOT)/var/yp ROOTBINDING = $(ROOTVAR_YP)/binding -ROOTDIRS = $(ROOT) $(ROOTUSR) $(ROOTLIB) $(ROOTETC) $(ROOTVAR) \ +ROOTDIRS = $(ROOT) $(ROOTUSR) $(ROOTLIB64) $(ROOTETC) $(ROOTVAR) \ $(NETSVC) $(NETYP) $(ROOTVAR_YP) $(ROOTBINDING) \ $(ROOTUSRSBIN) $(ROOTBIN) diff --git a/usr/src/cmd/ypcmd/yp2lscripts/Makefile b/usr/src/cmd/ypcmd/yp2lscripts/Makefile index 9400b9e6cc..c03ad7d11b 100644 --- a/usr/src/cmd/ypcmd/yp2lscripts/Makefile +++ b/usr/src/cmd/ypcmd/yp2lscripts/Makefile @@ -27,7 +27,7 @@ OBJS= inityp2l ypmap2src include $(SRC)/cmd/Makefile.cmd # install directories -NETSVC = $(ROOTLIB)/netsvc +NETSVC = $(ROOTLIB64)/netsvc NETYP = $(NETSVC)/yp ROOTNETYPFILES= $(OBJS:%=$(NETYP)/%) diff --git a/usr/src/cmd/ypcmd/yppasswd/Makefile b/usr/src/cmd/ypcmd/yppasswd/Makefile index 0700038c11..909039b4ff 100644 --- a/usr/src/cmd/ypcmd/yppasswd/Makefile +++ b/usr/src/cmd/ypcmd/yppasswd/Makefile @@ -35,7 +35,7 @@ ROOTMANIFESTDIR = $(ROOTSVCNETWORKNIS) #installed directories RPCSVC= $(ROOT)/usr/include/rpcsvc -NETSVC = $(ROOTLIB)/netsvc +NETSVC = $(ROOTLIB64)/netsvc NETYP = $(NETSVC)/yp ROOTDIRS = $(NETSVC) $(NETYP) diff --git a/usr/src/cmd/ypcmd/ypupdated/Makefile b/usr/src/cmd/ypcmd/ypupdated/Makefile index 3b079e8197..6d63e875aa 100644 --- a/usr/src/cmd/ypcmd/ypupdated/Makefile +++ b/usr/src/cmd/ypcmd/ypupdated/Makefile @@ -35,7 +35,7 @@ ROOTMANIFESTDIR = $(ROOTSVCNETWORKNIS) #installed directories RPCSVC= $(ROOT)/usr/include/rpcsvc -NETSVC = $(ROOTLIB)/netsvc +NETSVC = $(ROOTLIB64)/netsvc NETYP = $(NETSVC)/yp ROOTDIRS = $(NETSVC) $(NETYP) diff --git a/usr/src/cmd/zfs/Makefile b/usr/src/cmd/zfs/Makefile index 2c34bcae80..556f498f59 100644 --- a/usr/src/cmd/zfs/Makefile +++ b/usr/src/cmd/zfs/Makefile @@ -38,7 +38,7 @@ include ../Makefile.ctf FSTYPE= zfs LINKPROGS= mount umount ROOTETCFSTYPE= $(ROOTETC)/fs/$(FSTYPE) -USRLIBFSTYPE= $(ROOTLIB)/fs/$(FSTYPE) +USRLIBFSTYPE= $(ROOT)/usr/lib/fs/$(FSTYPE) LDLIBS += -lzfs_core -lzfs -luutil -lumem -lnvpair -lsec -lidmap diff --git a/usr/src/cmd/zoneadmd/Makefile b/usr/src/cmd/zoneadmd/Makefile index fa79e0bd0d..e424a2fa62 100644 --- a/usr/src/cmd/zoneadmd/Makefile +++ b/usr/src/cmd/zoneadmd/Makefile @@ -30,7 +30,7 @@ PROG= zoneadmd include ../Makefile.cmd -ROOTCMDDIR= $(ROOTLIB)/zones +ROOTCMDDIR= $(ROOTLIB64)/zones OBJS= zoneadmd.o zcons.o vplat.o SRCS = $(OBJS:.o=.c) diff --git a/usr/src/cmd/zonestat/zonestatd/Makefile b/usr/src/cmd/zonestat/zonestatd/Makefile index 510751677a..484a16a6d5 100644 --- a/usr/src/cmd/zonestat/zonestatd/Makefile +++ b/usr/src/cmd/zonestat/zonestatd/Makefile @@ -29,7 +29,7 @@ PROG = zonestatd include ../../Makefile.cmd -ROOTCMDDIR = $(ROOTLIB)/zones +ROOTCMDDIR = $(ROOTLIB64)/zones ROOTMANIFESTDIR = $(ROOTSVCSYSTEM) SRCS = zonestatd.c diff --git a/usr/src/common/mapfiles/amd64/Makefile b/usr/src/common/mapfiles/amd64/Makefile dissimilarity index 100% index c0669c0b59..445af73832 100644 --- a/usr/src/common/mapfiles/amd64/Makefile +++ b/usr/src/common/mapfiles/amd64/Makefile @@ -1,54 +1 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License (the "License"). -# You may not use this file except in compliance with the License. -# -# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE -# or http://www.opensolaris.org/os/licensing. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# - -# -# Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. -# - -include $(SRC)/Makefile.master - -ROOTDIR= $(ROOT)/usr/lib/ld -ROOTDIR64= $(ROOT)/usr/lib/ld/$(MACH64) - -DIRS= $(ROOTDIR) $(ROOTDIR64) -FILES= - -install: $(DIRS) $(FILES) map.link - -$(FILES):= FILEMODE=444 - -$(DIRS):= DIRMODE=755 - -map.link: - $(RM) $(ROOTDIR64)/map.default \ - $(ROOTDIR64)/map.above4G $(ROOTDIR64)/map.below4G - $(SYMLINK) ../map.default $(ROOTDIR64)/map.default - $(SYMLINK) ../map.above4G $(ROOTDIR64)/map.above4G - $(SYMLINK) ../map.below4G $(ROOTDIR64)/map.below4G - -$(DIRS): - $(INS.dir) - -$(ROOTDIR)/%: % - $(INS.file) - -$(ROOTDIR64)/%: % - $(INS.file) +install: diff --git a/usr/src/common/mapfiles/i386/Makefile b/usr/src/common/mapfiles/i386/Makefile index cea2a5946d..1cde49b4cd 100644 --- a/usr/src/common/mapfiles/i386/Makefile +++ b/usr/src/common/mapfiles/i386/Makefile @@ -20,24 +20,34 @@ # # -# Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. # include $(SRC)/Makefile.master -ROOTDIR= $(ROOT)/usr/lib/ld +ROOTDIR= $(ROOT)/usr/lib/ld/$(MACH32) DIRS= $(ROOTDIR) FILES= -install: $(DIRS) $(FILES) +install: $(DIRS) $(FILES) map.link $(FILES):= FILEMODE=444 $(DIRS):= DIRMODE=755 +map.link: + $(RM) $(ROOTDIR)/map.default \ + $(ROOTDIR)/map.above4G $(ROOTDIR)/map.below4G + $(SYMLINK) ../map.default $(ROOTDIR)/map.default + $(SYMLINK) ../map.above4G $(ROOTDIR)/map.above4G + $(SYMLINK) ../map.below4G $(ROOTDIR)/map.below4G + $(DIRS): $(INS.dir) $(ROOTDIR)/%: % $(INS.file) + +$(ROOTDIR64)/%: % + $(INS.file) diff --git a/usr/src/lib/Makefile.lib b/usr/src/lib/Makefile.lib index 0e28546c49..09b2e1a81d 100644 --- a/usr/src/lib/Makefile.lib +++ b/usr/src/lib/Makefile.lib @@ -87,10 +87,10 @@ LIBNAME= $(LIBRARY:lib%.a=%) LIBLINKPATH= LIBNULL= null.a ROOTHDRDIR= $(ROOT)/usr/include -ROOTLIBDIR= $(ROOT)/usr/lib -ROOTLIBDIR64= $(ROOT)/usr/lib/$(MACH64) -ROOTFS_LIBDIR= $(ROOT)/lib -ROOTFS_LIBDIR64= $(ROOT)/lib/$(MACH64) +ROOTLIBDIR= $(ROOT)/usr/lib/$(MACH32) +ROOTLIBDIR64= $(ROOT)/usr/lib +ROOTFS_LIBDIR= $(ROOT)/lib/$(MACH32) +ROOTFS_LIBDIR64= $(ROOT)/lib ROOTHDRS= $(HDRS:%=$(ROOTHDRDIR)/%) HDRSRCS= $(HDRS:%=$(HDRDIR)/%) CHECKHDRS= $(HDRSRCS:%.h=%.check) diff --git a/usr/src/lib/crt/Makefile.com b/usr/src/lib/crt/Makefile.com index ba1aeb327e..0f2718a87a 100644 --- a/usr/src/lib/crt/Makefile.com +++ b/usr/src/lib/crt/Makefile.com @@ -40,8 +40,8 @@ POST_PROCESS_O = $(STRIP) -x $@ OBJECTS = $(VALUES) $(CRT1) $(CRTI) $(CRTN) -ROOTLIB= $(ROOT)/usr/lib -ROOTLIB64= $(ROOTLIB)/$(MACH64) +ROOTLIB= $(ROOT)/usr/lib/$(MACH32) +ROOTLIB64= $(ROOT)/usr/lib ROOTOBJECTS= $(OBJECTS:%=$(ROOTLIB)/%) ROOTOBJECTS64= $(OBJECTS:%=$(ROOTLIB64)/%) diff --git a/usr/src/lib/fm/Makefile.lib b/usr/src/lib/fm/Makefile.lib index 374ed76677..b684c9b054 100644 --- a/usr/src/lib/fm/Makefile.lib +++ b/usr/src/lib/fm/Makefile.lib @@ -32,9 +32,9 @@ ROOTFMHDRDIR = $(ROOTHDRDIR)/fm ROOTFMHDRS = $(FMHDRS:%=$(ROOTFMHDRDIR)/%) -ROOTLIBDIR = $(ROOT)/usr/lib/fm -ROOTLIBDIR64 = $(ROOTLIBDIR)/$(MACH64) +ROOTLIBDIR = $(ROOT)/usr/lib/fm/$(MACH32) +ROOTLIBDIR64 = $(ROOT)/usr/lib/fm -ROOTLIBTOPODIR = $(ROOT)/usr/lib/fm/topo -ROOTLIBTOPODIR64 = $(ROOTLIBTOPODIR)/$(MACH64) +ROOTLIBTOPODIR = $(ROOT)/usr/lib/fm/topo/$(MACH32) +ROOTLIBTOPODIR64 = $(ROOT)/usr/lib/fm/topo diff --git a/usr/src/lib/fm/libfmd_msg/Makefile.com b/usr/src/lib/fm/libfmd_msg/Makefile.com index 2e6f4203ac..08ec62b49b 100644 --- a/usr/src/lib/fm/libfmd_msg/Makefile.com +++ b/usr/src/lib/fm/libfmd_msg/Makefile.com @@ -57,8 +57,8 @@ all: $(LIBS) include ../../../Makefile.targ include ../../Makefile.targ -LDLIBS_$(MACH) = -L$(ROOT)/usr/lib/fm -R$(ROOT)/usr/lib/fm -LDLIBS_$(MACH64) = -L$(ROOT)/usr/lib/fm/$(MACH64) -R$(ROOT)/usr/lib/fm/$(MACH64) +LDLIBS_$(MACH) = -L$(ROOT)/usr/lib/fm/$(MACH32) -R$(ROOT)/usr/lib/fm/$(MACH32) +LDLIBS_$(MACH64) = -L$(ROOT)/usr/lib/fm -R$(ROOT)/usr/lib/fm # # To ease the development and maintenance of libfmd_msg, a test suite is built diff --git a/usr/src/lib/fm/libfmevent/Makefile b/usr/src/lib/fm/libfmevent/Makefile index 991f4e44b7..e1dce6b9d8 100644 --- a/usr/src/lib/fm/libfmevent/Makefile +++ b/usr/src/lib/fm/libfmevent/Makefile @@ -32,8 +32,8 @@ include ../../Makefile.lib ROOTFMHDRDIR = $(ROOTHDRDIR)/fm ROOTFMHDRS = $(FMHDRS:%=$(ROOTFMHDRDIR)/%) -ROOTLIBDIR= $(ROOTFS_LIBDIR)/fm -ROOTLIBDIR64= $(ROOTFS_LIBDIR)/fm/$(MACH64) +ROOTLIBDIR= $(ROOT)/lib/fm/$(MACH32) +ROOTLIBDIR64= $(ROOT)/lib/fm FMHDRS = libfmevent.h libfmevent_ruleset.h HDRDIR = common diff --git a/usr/src/lib/fm/libfmevent/Makefile.com b/usr/src/lib/fm/libfmevent/Makefile.com index ec8b9fffd8..d22ffe7109 100644 --- a/usr/src/lib/fm/libfmevent/Makefile.com +++ b/usr/src/lib/fm/libfmevent/Makefile.com @@ -43,8 +43,8 @@ include ../../../Makefile.lib ROOTFMHDRDIR = $(ROOTHDRDIR)/fm ROOTFMHDRS = $(FMHDRS:%=$(ROOTFMHDRDIR)/%) -ROOTLIBDIR= $(ROOTFS_LIBDIR)/fm -ROOTLIBDIR64= $(ROOTFS_LIBDIR)/fm/$(MACH64) +ROOTLIBDIR= $(ROOT)/lib/fm/$(MACH32) +ROOTLIBDIR64= $(ROOT)/lib/fm SRCS = $(LIBSRCS:%.c=../common/%.c) LIBS = $(DYNLIB) @@ -63,8 +63,8 @@ CERRWARN += -Wno-parentheses CERRWARN += -Wno-unused-function CERRWARN += -Wno-uninitialized -FMLIBDIR=usr/lib/fm -$(BUILD64)FMLIBDIR64=usr/lib/fm/$(MACH64) +FMLIBDIR=usr/lib/fm/$(MACH32) +FMLIBDIR64=usr/lib/fm $(DYNLIB) := LDLIBS += -lumem -lnvpair -luutil -lsysevent \ -L$(ROOT)/$(FMLIBDIR) -ltopo -lc diff --git a/usr/src/lib/fm/libfmevent/amd64/Makefile b/usr/src/lib/fm/libfmevent/amd64/Makefile index 34adaebb38..7874315d87 100644 --- a/usr/src/lib/fm/libfmevent/amd64/Makefile +++ b/usr/src/lib/fm/libfmevent/amd64/Makefile @@ -25,6 +25,6 @@ include ../Makefile.com include ../../../Makefile.lib.64 -DYNFLAGS += -R/usr/lib/fm/$(MACH64) +DYNFLAGS += -R/usr/lib/fm install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/fm/libfmevent/i386/Makefile b/usr/src/lib/fm/libfmevent/i386/Makefile index 991febf8ca..e141ba931c 100644 --- a/usr/src/lib/fm/libfmevent/i386/Makefile +++ b/usr/src/lib/fm/libfmevent/i386/Makefile @@ -24,6 +24,6 @@ include ../Makefile.com -DYNFLAGS += -R/usr/lib/fm +DYNFLAGS += -R/usr/lib/fm/$(MACH32) install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/fm/libfmnotify/amd64/Makefile b/usr/src/lib/fm/libfmnotify/amd64/Makefile index e070d1346b..9d217f2fdd 100644 --- a/usr/src/lib/fm/libfmnotify/amd64/Makefile +++ b/usr/src/lib/fm/libfmnotify/amd64/Makefile @@ -21,11 +21,11 @@ # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # -MACH_LDLIBS = -L$(ROOT)/usr/lib/fm/$(MACH64) +MACH_LDLIBS = -L$(ROOT)/usr/lib/fm include ../Makefile.com include ../../../Makefile.lib.64 -DYNFLAGS += -R/usr/lib/fm/$(MACH64) +DYNFLAGS += -R/usr/lib/fm install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/fm/libfmnotify/i386/Makefile b/usr/src/lib/fm/libfmnotify/i386/Makefile index 1b80409fdf..4fa52eceb5 100644 --- a/usr/src/lib/fm/libfmnotify/i386/Makefile +++ b/usr/src/lib/fm/libfmnotify/i386/Makefile @@ -26,7 +26,7 @@ include ../Makefile.com install: all $(ROOTLIBS) $(ROOTLINKS) -MACH_LDLIBS = -L$(ROOT)/usr/lib/fm +MACH_LDLIBS = -L$(ROOT)/usr/lib/fm/$(MACH32) -DYNFLAGS += -R/usr/lib/fm +DYNFLAGS += -R/usr/lib/fm/$(MACH32) diff --git a/usr/src/lib/fm/topo/modules/Makefile.plugin b/usr/src/lib/fm/topo/modules/Makefile.plugin index c026defdea..60fe2fb87d 100644 --- a/usr/src/lib/fm/topo/modules/Makefile.plugin +++ b/usr/src/lib/fm/topo/modules/Makefile.plugin @@ -68,8 +68,8 @@ CFLAGS += $(GSHARED) $(XREGSFLAG) CPPFLAGS += -I. CPPFLAGS += -D_POSIX_PTHREAD_SEMANTICS LDFLAGS += $(ZIGNORE) -Wl,-M$(APIMAP) -LDLIBS += -L$(ROOTLIBDIR)/fm -ltopo -lnvpair -lc -DYNFLAGS += -R/usr/lib/fm +LDLIBS += -L$(ROOT)/usr/lib/fm/$(MACH32) -ltopo -lnvpair -lc +DYNFLAGS += -R/usr/lib/fm/$(MACH32) all: $(PROG) diff --git a/usr/src/lib/fm/topo/modules/common/ses/Makefile b/usr/src/lib/fm/topo/modules/common/ses/Makefile index acd772c92f..916866b1e8 100644 --- a/usr/src/lib/fm/topo/modules/common/ses/Makefile +++ b/usr/src/lib/fm/topo/modules/common/ses/Makefile @@ -34,7 +34,7 @@ include ../../Makefile.plugin CPPFLAGS += -I../disk -LDLIBS += -L$(ROOTLIBDIR)/scsi -R/usr/lib/scsi -lses +LDLIBS += -L$(ROOT)/usr/lib/scsi/$(MACH32) -R/usr/lib/scsi/$(MACH32) -lses LDLIBS += -ldevinfo -ldevid -ldiskstatus -lcontract -lsysevent -ldiskmgt CLOBBERFILES += disk_common.ln diff --git a/usr/src/lib/gss_mechs/mech_dh/backend/Makefile.com b/usr/src/lib/gss_mechs/mech_dh/backend/Makefile.com index a52373e21a..44db01bef0 100644 --- a/usr/src/lib/gss_mechs/mech_dh/backend/Makefile.com +++ b/usr/src/lib/gss_mechs/mech_dh/backend/Makefile.com @@ -71,8 +71,8 @@ SED = sed CSRCS= $(MECH:%.o=../mech/%.c) $(CRYPTO:%.o=../crypto/%.c) SRCS= $(CSRCS) -ROOTLIBDIR = $(ROOT)/usr/lib/gss -ROOTLIBDIR64 = $(ROOT)/usr/lib/$(MACH64)/gss +ROOTLIBDIR = $(ROOT)/usr/lib/$(MACH32)/gss +ROOTLIBDIR64 = $(ROOT)/usr/lib/gss diff --git a/usr/src/lib/gss_mechs/mech_dh/dh1024/Makefile.com b/usr/src/lib/gss_mechs/mech_dh/dh1024/Makefile.com index da50cde779..c00cdfe992 100644 --- a/usr/src/lib/gss_mechs/mech_dh/dh1024/Makefile.com +++ b/usr/src/lib/gss_mechs/mech_dh/dh1024/Makefile.com @@ -57,8 +57,8 @@ LDLIBS += -lmp -lc SRCS= ../dh1024.c ../../dh_common/dh_common.c ../../dh_common/generic_key.c -ROOTLIBDIR = $(ROOT)/usr/lib/gss -ROOTLIBDIR64 = $(ROOT)/usr/lib/$(MACH64)/gss +ROOTLIBDIR = $(ROOT)/usr/lib/$(MACH32)/gss +ROOTLIBDIR64 = $(ROOT)/usr/lib/gss diff --git a/usr/src/lib/gss_mechs/mech_dh/dh192/Makefile.com b/usr/src/lib/gss_mechs/mech_dh/dh192/Makefile.com index 25f9ca0ab7..88e23794e3 100644 --- a/usr/src/lib/gss_mechs/mech_dh/dh192/Makefile.com +++ b/usr/src/lib/gss_mechs/mech_dh/dh192/Makefile.com @@ -57,8 +57,8 @@ LDLIBS += -lmp -lc SRCS= ../dh192.c ../../dh_common/dh_common.c ../../dh_common/generic_key.c -ROOTLIBDIR = $(ROOT)/usr/lib/gss -ROOTLIBDIR64 = $(ROOT)/usr/lib/$(MACH64)/gss +ROOTLIBDIR = $(ROOT)/usr/lib/$(MACH32)/gss +ROOTLIBDIR64 = $(ROOT)/usr/lib/gss diff --git a/usr/src/lib/gss_mechs/mech_dh/dh640/Makefile.com b/usr/src/lib/gss_mechs/mech_dh/dh640/Makefile.com index 91ab2ce959..a3ea37f9c6 100644 --- a/usr/src/lib/gss_mechs/mech_dh/dh640/Makefile.com +++ b/usr/src/lib/gss_mechs/mech_dh/dh640/Makefile.com @@ -57,8 +57,8 @@ LDLIBS += -lmp -lc SRCS= ../dh640.c ../../dh_common/dh_common.c ../../dh_common/generic_key.c -ROOTLIBDIR = $(ROOT)/usr/lib/gss -ROOTLIBDIR64 = $(ROOT)/usr/lib/$(MACH64)/gss +ROOTLIBDIR = $(ROOT)/usr/lib/$(MACH32)/gss +ROOTLIBDIR64 = $(ROOT)/usr/lib/gss diff --git a/usr/src/lib/gss_mechs/mech_krb5/Makefile b/usr/src/lib/gss_mechs/mech_krb5/Makefile index fa6890be13..a1f8029ef4 100644 --- a/usr/src/lib/gss_mechs/mech_krb5/Makefile +++ b/usr/src/lib/gss_mechs/mech_krb5/Makefile @@ -63,7 +63,7 @@ all clean: $(SUBDIRS) install: install_dir all .WAIT $(SUBDIRS) # override ROOTLIBDIR and ROOTLINKS -ROOTLIBDIR= $(ROOT)/usr/lib/gss +ROOTLIBDIR= $(ROOT)/usr/lib/$(MACH32)/gss install_dir: $(ROOTLIBDIR) $(BUILD64) diff --git a/usr/src/lib/gss_mechs/mech_krb5/Makefile.com b/usr/src/lib/gss_mechs/mech_krb5/Makefile.com index 978b62c05e..e45e58ca83 100644 --- a/usr/src/lib/gss_mechs/mech_krb5/Makefile.com +++ b/usr/src/lib/gss_mechs/mech_krb5/Makefile.com @@ -273,8 +273,8 @@ MAPFILES = ../mapfile-vers LIBS = $(DYNLIB) $(K5LIBLINK) # override ROOTLIBDIR and ROOTLINKS -ROOTLIBDIR= $(ROOT)/usr/lib/gss -ROOTLIBDIR64= $(ROOT)/usr/lib/$(MACH64)/gss +ROOTLIBDIR= $(ROOT)/usr/lib/$(MACH32)/gss +ROOTLIBDIR64= $(ROOT)/usr/lib/gss K5MECHLINK= $(K5LIBLINK:%=$(ROOT)/usr/lib/%) K5MECHLINK64= $(K5LIBLINK:%=$(ROOT)/usr/lib/$(MACH64)/%) diff --git a/usr/src/lib/gss_mechs/mech_krb5/Makefile.mech_krb5 b/usr/src/lib/gss_mechs/mech_krb5/Makefile.mech_krb5 index cb48fe0a7c..d73c3fcbe8 100644 --- a/usr/src/lib/gss_mechs/mech_krb5/Makefile.mech_krb5 +++ b/usr/src/lib/gss_mechs/mech_krb5/Makefile.mech_krb5 @@ -6,11 +6,11 @@ # plug in. # 32 bit library directories -KLIBDIR = /usr/lib/gss +KLIBDIR = /usr/lib/$(MACH32)/gss ROOT_KLIBDIR = $(ROOT)/$(KLIBDIR) # 64 bit library directories -KLIBDIR64 = /usr/lib/$(MACH64)/gss +KLIBDIR64 = /usr/lib/gss ROOT_KLIBDIR64 = $(ROOT)/$(KLIBDIR64) # Kerberos V GSS-API Mechanism library @@ -20,7 +20,7 @@ KMECHLIB64 = $(ROOT)/$(KLIBDIR64)/mech_krb5.so # KADM5 client library KERBLIBDIR = /usr/lib/krb5 -KERBLIBDIR64 = /usr/lib/krb5/$(MACH64) +KERBLIBDIR64 = /usr/lib/krb5/amd64 KCLNTLIB = $(ROOT)$(KERBLIBDIR)/libkadm5clnt.so KCLNTLIB64 = $(ROOT)$(KERBLIBDIR64)/libkadm5clnt.so diff --git a/usr/src/lib/gss_mechs/mech_spnego/Makefile.com b/usr/src/lib/gss_mechs/mech_spnego/Makefile.com index 74b1d3f3d3..f37533bfc6 100644 --- a/usr/src/lib/gss_mechs/mech_spnego/Makefile.com +++ b/usr/src/lib/gss_mechs/mech_spnego/Makefile.com @@ -37,8 +37,8 @@ OBJECTS = spnego_mech.o spnego_disp_status.o spnego_kerrs.o include ../../../Makefile.lib LIBS = $(DYNLIB) -ROOTLIBDIR = $(ROOT)/usr/lib/gss -ROOTLIBDIR64 = $(ROOT)/usr/lib/$(MACH64)/gss +ROOTLIBDIR = $(ROOT)/usr/lib/$(MACH32)/gss +ROOTLIBDIR64 = $(ROOT)/usr/lib/gss SRCDIR = ../mech MAPFILES = ../mapfile-vers diff --git a/usr/src/lib/hal/Makefile.com b/usr/src/lib/hal/Makefile.com index 4dcbe4b13a..c58a3512a3 100644 --- a/usr/src/lib/hal/Makefile.com +++ b/usr/src/lib/hal/Makefile.com @@ -31,8 +31,8 @@ CPPFLAGS = $(HAL_DBUS_CPPFLAGS) $(HAL_GLIB_CPPFLAGS) $(CPPFLAGS.master) LIBDIR = /usr/lib LIBDIR64 = /usr/lib/$(MACH64) -ROOTLIBPCDIR = $(ROOT)/usr/lib/pkgconfig -ROOTLIBPCDIR64 = $(ROOT)/usr/lib/$(MACH64)/pkgconfig +ROOTLIBPCDIR64 = $(ROOT)/usr/lib/pkgconfig +ROOTLIBPCDIR = $(ROOT)/usr/lib/$(MACH32)/pkgconfig ROOTLIBPC = $(LIBPCSRC:%=$(ROOTLIBPCDIR)/%) ROOTLIBPC64 = $(LIBPCSRC:%=$(ROOTLIBPCDIR64)/%) diff --git a/usr/src/lib/krb5/kadm5/srv/Makefile.com b/usr/src/lib/krb5/kadm5/srv/Makefile.com index 63d7c1c50f..e214007518 100644 --- a/usr/src/lib/krb5/kadm5/srv/Makefile.com +++ b/usr/src/lib/krb5/kadm5/srv/Makefile.com @@ -57,7 +57,7 @@ include ../../../Makefile.lib SRCS= $(SRV_OBJS:%.o=../%.c) \ $(SHARED_OBJS:%.o=../../%.c) -KRB5LIB= $(ROOT)/usr/lib/krb5 +KRB5LIB= $(ROOTLIBDIR) LIBS= $(DYNLIB) diff --git a/usr/src/lib/krb5/plugins/kdb/ldap/Makefile.com b/usr/src/lib/krb5/plugins/kdb/ldap/Makefile.com index 22d51916e0..94823db66f 100644 --- a/usr/src/lib/krb5/plugins/kdb/ldap/Makefile.com +++ b/usr/src/lib/krb5/plugins/kdb/ldap/Makefile.com @@ -63,8 +63,8 @@ CERRWARN += -Wno-parentheses CERRWARN += -Wno-unused-function DYNFLAGS += $(KERBRUNPATH) -# setting -L $(ROOT)/usr/lib/gss because libkdb_ldap needs mech_krb5 -LDLIBS += -L $(ROOT)/usr/lib/gss -L $(ROOTLIBDIR) -lkdb_ldap \ +# setting -L $(ROOT)/usr/lib/$(MACH32)/gss because libkdb_ldap needs mech_krb5 +LDLIBS += -L $(ROOT)/usr/lib/$(MACH32)/gss -L $(ROOTLIBDIR) -lkdb_ldap \ -lc .KEEP_STATE: diff --git a/usr/src/lib/libc/Makefile b/usr/src/lib/libc/Makefile index 01fac5d07c..31885e18c7 100644 --- a/usr/src/lib/libc/Makefile +++ b/usr/src/lib/libc/Makefile @@ -36,10 +36,10 @@ VERS= .1 # and it must be built in the same workspace as libc. LIB_PIC= libc_pic.a -ROOTLIB= $(ROOT)/usr/lib -ROOTFS_LIB= $(ROOT)/lib -ROOTLIB64= $(ROOTLIB)/$(MACH64) -ROOTFS_LIB64= $(ROOTFS_LIB)/$(MACH64) +ROOTLIB= $(ROOT)/usr/lib/$(MACH32) +ROOTFS_LIB= $(ROOT)/lib/$(MACH32) +ROOTLIB64= $(ROOT)/usr/lib +ROOTFS_LIB64= $(ROOT)/lib # include common library definitions include ../Makefile.lib diff --git a/usr/src/lib/libkmf/mappers/kmf_mapper_cn/Makefile.com b/usr/src/lib/libkmf/mappers/kmf_mapper_cn/Makefile.com index fbe3845fe8..9cc8ea7469 100644 --- a/usr/src/lib/libkmf/mappers/kmf_mapper_cn/Makefile.com +++ b/usr/src/lib/libkmf/mappers/kmf_mapper_cn/Makefile.com @@ -44,8 +44,8 @@ PICS = $(OBJECTS:%=pics/%) LDLIBS += -lkmf -lc -ROOTLIBDIR = $(ROOTFS_LIBDIR)/crypto -ROOTLIBDIR64 = $(ROOTFS_LIBDIR)/crypto/$(MACH64) +ROOTLIBDIR = $(ROOT)/lib/crypto/$(MACH32) +ROOTLIBDIR64 = $(ROOT)/lib/crypto .KEEP_STATE: diff --git a/usr/src/lib/libkmf/plugins/kmf_nss/Makefile.com b/usr/src/lib/libkmf/plugins/kmf_nss/Makefile.com index 454f95e731..96780e6352 100644 --- a/usr/src/lib/libkmf/plugins/kmf_nss/Makefile.com +++ b/usr/src/lib/libkmf/plugins/kmf_nss/Makefile.com @@ -61,8 +61,8 @@ LDLIBS32 += $(NSSLIBS) LIBS = $(DYNLIB) -ROOTLIBDIR= $(ROOTFS_LIBDIR)/crypto -ROOTLIBDIR64= $(ROOTFS_LIBDIR)/crypto/$(MACH64) +ROOTLIBDIR= $(ROOT)/lib/crypto/$(MACH32) +ROOTLIBDIR64= $(ROOT)/lib/crypto .KEEP_STATE: diff --git a/usr/src/lib/libkmf/plugins/kmf_openssl/Makefile.com b/usr/src/lib/libkmf/plugins/kmf_openssl/Makefile.com index 59f2dda95b..02c1e6885c 100644 --- a/usr/src/lib/libkmf/plugins/kmf_openssl/Makefile.com +++ b/usr/src/lib/libkmf/plugins/kmf_openssl/Makefile.com @@ -56,8 +56,8 @@ PICS= $(OBJECTS:%=pics/%) LDLIBS32 += $(OPENSSLLIBS) -ROOTLIBDIR= $(ROOTFS_LIBDIR)/crypto -ROOTLIBDIR64= $(ROOTFS_LIBDIR)/crypto/$(MACH64) +ROOTLIBDIR= $(ROOT)/lib/crypto/$(MACH32) +ROOTLIBDIR64= $(ROOT)/lib/crypto .KEEP_STATE: diff --git a/usr/src/lib/libkmf/plugins/kmf_pkcs11/Makefile.com b/usr/src/lib/libkmf/plugins/kmf_pkcs11/Makefile.com index 19edd16b18..b10157fba2 100644 --- a/usr/src/lib/libkmf/plugins/kmf_pkcs11/Makefile.com +++ b/usr/src/lib/libkmf/plugins/kmf_pkcs11/Makefile.com @@ -59,8 +59,8 @@ PICS= $(OBJECTS:%=pics/%) LDLIBS += $(PKCS11LIBS) -ROOTLIBDIR= $(ROOTFS_LIBDIR)/crypto -ROOTLIBDIR64= $(ROOTFS_LIBDIR)/crypto/$(MACH64) +ROOTLIBDIR= $(ROOT)/lib/crypto/$(MACH32) +ROOTLIBDIR64= $(ROOT)/lib/crypto .KEEP_STATE: diff --git a/usr/src/lib/libsmedia/library/common/l_misc.c b/usr/src/lib/libsmedia/library/common/l_misc.c index 22776839dd..5ebe0d945e 100644 --- a/usr/src/lib/libsmedia/library/common/l_misc.c +++ b/usr/src/lib/libsmedia/library/common/l_misc.c @@ -54,10 +54,10 @@ #ifdef __sparc #define PATHNAME "/usr/lib/smedia/sparcv9" #else -#define PATHNAME "/usr/lib/smedia/amd64" +#define PATHNAME "/usr/lib/smedia" #endif #else -#define PATHNAME "/usr/lib/smedia" +#define PATHNAME "/usr/lib/smedia/i386" #endif #define PERROR(string) my_perror(gettext(string)) diff --git a/usr/src/lib/libsmedia/plugins/Makefile.com b/usr/src/lib/libsmedia/plugins/Makefile.com index d825795d66..f0f6874966 100644 --- a/usr/src/lib/libsmedia/plugins/Makefile.com +++ b/usr/src/lib/libsmedia/plugins/Makefile.com @@ -29,8 +29,8 @@ LIBS = $(DYNLIB) CPPFLAGS += -I../inc -I$(SRC)/cmd/smserverd/ LDLIBS += -lc $(PLUGIN_SPECIFIC_LIB) -PLUGINDIR = $(ROOTLIBDIR)/smedia -PLUGINDIR64 = $(ROOTLIBDIR)/smedia/$(MACH64) +PLUGINDIR = $(ROOTLIBDIR64)/smedia/$(MACH32) +PLUGINDIR64 = $(ROOTLIBDIR64)/smedia FILEMODE = 555 SOFILES = $(LIBRARY:%.a=%.so) diff --git a/usr/src/lib/pam_modules/Makefile.pam_modules b/usr/src/lib/pam_modules/Makefile.pam_modules index 35d23019f4..49e51531ff 100644 --- a/usr/src/lib/pam_modules/Makefile.pam_modules +++ b/usr/src/lib/pam_modules/Makefile.pam_modules @@ -39,5 +39,8 @@ LIBS= $(DYNLIB) ROOTLIBDIR= $(ROOT)/usr/lib/security ROOTLIBDIR64= $(ROOT)/usr/lib/security/$(MACH64) +ROOTLIB32= $(ROOT)/usr/lib/$(MACH32) +ROOTLIB64= $(ROOT)/usr/lib + .KEEP_STATE: .PARALLEL: diff --git a/usr/src/lib/pam_modules/authtok_check/amd64/Makefile b/usr/src/lib/pam_modules/authtok_check/amd64/Makefile index 8cf05207cf..c04732d105 100644 --- a/usr/src/lib/pam_modules/authtok_check/amd64/Makefile +++ b/usr/src/lib/pam_modules/authtok_check/amd64/Makefile @@ -29,6 +29,6 @@ include ../Makefile.com include ../../../Makefile.lib.64 -DYNFLAGS += $(ROOT)/usr/lib/$(MACH64)/passwdutil.so.1 +DYNFLAGS += $(ROOTLIB64)/passwdutil.so.1 install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/pam_modules/authtok_check/i386/Makefile b/usr/src/lib/pam_modules/authtok_check/i386/Makefile index b532f1a3ce..987e12e2dd 100644 --- a/usr/src/lib/pam_modules/authtok_check/i386/Makefile +++ b/usr/src/lib/pam_modules/authtok_check/i386/Makefile @@ -30,6 +30,6 @@ include ../Makefile.com -DYNFLAGS += $(ROOT)/usr/lib/passwdutil.so.1 +DYNFLAGS += $(ROOTLIB32)/passwdutil.so.1 install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/pam_modules/authtok_get/amd64/Makefile b/usr/src/lib/pam_modules/authtok_get/amd64/Makefile index 8cf05207cf..c04732d105 100644 --- a/usr/src/lib/pam_modules/authtok_get/amd64/Makefile +++ b/usr/src/lib/pam_modules/authtok_get/amd64/Makefile @@ -29,6 +29,6 @@ include ../Makefile.com include ../../../Makefile.lib.64 -DYNFLAGS += $(ROOT)/usr/lib/$(MACH64)/passwdutil.so.1 +DYNFLAGS += $(ROOTLIB64)/passwdutil.so.1 install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/pam_modules/authtok_get/i386/Makefile b/usr/src/lib/pam_modules/authtok_get/i386/Makefile index 0c62a1df22..3d92940180 100644 --- a/usr/src/lib/pam_modules/authtok_get/i386/Makefile +++ b/usr/src/lib/pam_modules/authtok_get/i386/Makefile @@ -30,6 +30,6 @@ include ../Makefile.com -DYNFLAGS += $(ROOT)/usr/lib/passwdutil.so.1 +DYNFLAGS += $(ROOTLIB32)/passwdutil.so.1 install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/pam_modules/authtok_store/amd64/Makefile b/usr/src/lib/pam_modules/authtok_store/amd64/Makefile index 8cf05207cf..c04732d105 100644 --- a/usr/src/lib/pam_modules/authtok_store/amd64/Makefile +++ b/usr/src/lib/pam_modules/authtok_store/amd64/Makefile @@ -29,6 +29,6 @@ include ../Makefile.com include ../../../Makefile.lib.64 -DYNFLAGS += $(ROOT)/usr/lib/$(MACH64)/passwdutil.so.1 +DYNFLAGS += $(ROOTLIB64)/passwdutil.so.1 install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/pam_modules/authtok_store/i386/Makefile b/usr/src/lib/pam_modules/authtok_store/i386/Makefile index 03e1714392..06e33dae8e 100644 --- a/usr/src/lib/pam_modules/authtok_store/i386/Makefile +++ b/usr/src/lib/pam_modules/authtok_store/i386/Makefile @@ -30,6 +30,6 @@ include ../Makefile.com -DYNFLAGS += $(ROOT)/usr/lib/passwdutil.so.1 +DYNFLAGS += $(ROOTLIB32)/passwdutil.so.1 install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/pam_modules/dhkeys/amd64/Makefile b/usr/src/lib/pam_modules/dhkeys/amd64/Makefile index 3b7720f074..d0e9c1c428 100644 --- a/usr/src/lib/pam_modules/dhkeys/amd64/Makefile +++ b/usr/src/lib/pam_modules/dhkeys/amd64/Makefile @@ -29,6 +29,6 @@ include ../Makefile.com include ../../../Makefile.lib.64 -DYNFLAGS += $(ROOT)/usr/lib/$(MACH64)/passwdutil.so.1 +DYNFLAGS += $(ROOTLIB64)/passwdutil.so.1 install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/pam_modules/dhkeys/i386/Makefile b/usr/src/lib/pam_modules/dhkeys/i386/Makefile index 9e59623784..97bbcd1915 100644 --- a/usr/src/lib/pam_modules/dhkeys/i386/Makefile +++ b/usr/src/lib/pam_modules/dhkeys/i386/Makefile @@ -29,6 +29,6 @@ include ../Makefile.com -DYNFLAGS += $(ROOT)/usr/lib/passwdutil.so.1 +DYNFLAGS += $(ROOTLIB32)/passwdutil.so.1 install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/pam_modules/passwd_auth/amd64/Makefile b/usr/src/lib/pam_modules/passwd_auth/amd64/Makefile index 8cf05207cf..c04732d105 100644 --- a/usr/src/lib/pam_modules/passwd_auth/amd64/Makefile +++ b/usr/src/lib/pam_modules/passwd_auth/amd64/Makefile @@ -29,6 +29,6 @@ include ../Makefile.com include ../../../Makefile.lib.64 -DYNFLAGS += $(ROOT)/usr/lib/$(MACH64)/passwdutil.so.1 +DYNFLAGS += $(ROOTLIB64)/passwdutil.so.1 install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/pam_modules/passwd_auth/i386/Makefile b/usr/src/lib/pam_modules/passwd_auth/i386/Makefile index 2854e4744c..71e659bdde 100644 --- a/usr/src/lib/pam_modules/passwd_auth/i386/Makefile +++ b/usr/src/lib/pam_modules/passwd_auth/i386/Makefile @@ -30,6 +30,6 @@ include ../Makefile.com -DYNFLAGS += $(ROOT)/usr/lib/passwdutil.so.1 +DYNFLAGS += $(ROOTLIB32)/passwdutil.so.1 install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/pam_modules/smb/amd64/Makefile b/usr/src/lib/pam_modules/smb/amd64/Makefile index 9b4eadce04..19feaea242 100644 --- a/usr/src/lib/pam_modules/smb/amd64/Makefile +++ b/usr/src/lib/pam_modules/smb/amd64/Makefile @@ -30,6 +30,6 @@ include ../Makefile.com include ../../../Makefile.lib.64 DYNFLAGS += -R/usr/lib/smbsrv/$(MACH64) -DYNFLAGS += $(ROOT)/usr/lib/$(MACH64)/passwdutil.so.1 +DYNFLAGS += $(ROOTLIB64)/passwdutil.so.1 install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/pam_modules/smb/i386/Makefile b/usr/src/lib/pam_modules/smb/i386/Makefile index f4af79c32e..63e3e60189 100644 --- a/usr/src/lib/pam_modules/smb/i386/Makefile +++ b/usr/src/lib/pam_modules/smb/i386/Makefile @@ -29,6 +29,6 @@ include ../Makefile.com DYNFLAGS += -R/usr/lib/smbsrv -DYNFLAGS += $(ROOT)/usr/lib/passwdutil.so.1 +DYNFLAGS += $(ROOTLIB32)/passwdutil.so.1 install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/pam_modules/unix_account/amd64/Makefile b/usr/src/lib/pam_modules/unix_account/amd64/Makefile index bbc1dee1a8..6ebef31337 100644 --- a/usr/src/lib/pam_modules/unix_account/amd64/Makefile +++ b/usr/src/lib/pam_modules/unix_account/amd64/Makefile @@ -29,6 +29,6 @@ include ../Makefile.com include ../../../Makefile.lib.64 -DYNFLAGS += $(ROOT)/usr/lib/$(MACH64)/passwdutil.so.1 +DYNFLAGS += $(ROOTLIB64)/passwdutil.so.1 install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/pam_modules/unix_account/i386/Makefile b/usr/src/lib/pam_modules/unix_account/i386/Makefile index b0d7202f35..3aa2951a09 100644 --- a/usr/src/lib/pam_modules/unix_account/i386/Makefile +++ b/usr/src/lib/pam_modules/unix_account/i386/Makefile @@ -30,6 +30,6 @@ include ../Makefile.com -DYNFLAGS += $(ROOT)/usr/lib/passwdutil.so.1 +DYNFLAGS += $(ROOTLIB32)/passwdutil.so.1 install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/pam_modules/unix_auth/amd64/Makefile b/usr/src/lib/pam_modules/unix_auth/amd64/Makefile index 8cf05207cf..c04732d105 100644 --- a/usr/src/lib/pam_modules/unix_auth/amd64/Makefile +++ b/usr/src/lib/pam_modules/unix_auth/amd64/Makefile @@ -29,6 +29,6 @@ include ../Makefile.com include ../../../Makefile.lib.64 -DYNFLAGS += $(ROOT)/usr/lib/$(MACH64)/passwdutil.so.1 +DYNFLAGS += $(ROOTLIB64)/passwdutil.so.1 install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/pam_modules/unix_auth/i386/Makefile b/usr/src/lib/pam_modules/unix_auth/i386/Makefile index fd8bacc2a6..65904c75f1 100644 --- a/usr/src/lib/pam_modules/unix_auth/i386/Makefile +++ b/usr/src/lib/pam_modules/unix_auth/i386/Makefile @@ -30,6 +30,6 @@ include ../Makefile.com -DYNFLAGS += $(ROOT)/usr/lib/passwdutil.so.1 +DYNFLAGS += $(ROOTLIB32)/passwdutil.so.1 install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/policykit/Makefile b/usr/src/lib/policykit/Makefile index b60b67f7a1..25b241c330 100644 --- a/usr/src/lib/policykit/Makefile +++ b/usr/src/lib/policykit/Makefile @@ -26,6 +26,7 @@ # include ../Makefile.lib +include ../Makefile.lib.64 include $(SRC)/lib/policykit/Makefile.policykit SUBDIRS = libpolkit diff --git a/usr/src/lib/policykit/libpolkit/Makefile b/usr/src/lib/policykit/libpolkit/Makefile index 76b1fd758e..d005fe379d 100644 --- a/usr/src/lib/policykit/libpolkit/Makefile +++ b/usr/src/lib/policykit/libpolkit/Makefile @@ -31,7 +31,7 @@ HDRS = libpolkit.h HDRDIR = common ROOTHDRDIR = $(ROOT)/usr/include/libpolkit -SUBDIRS = $(MACH) +SUBDIRS = $(MACH64) all := TARGET= all clean := TARGET= clean diff --git a/usr/src/lib/policykit/libpolkit/Makefile.com b/usr/src/lib/policykit/libpolkit/Makefile.com index 8246fa5249..8967db19a9 100644 --- a/usr/src/lib/policykit/libpolkit/Makefile.com +++ b/usr/src/lib/policykit/libpolkit/Makefile.com @@ -43,7 +43,7 @@ SRCDIR = ../common CPPFLAGS += -DPACKAGE_LOCALE_DIR=\"/usr/lib/locale\" -ROOTMAJLINK = $(ROOTLIBDIR)/$(LIBRARY:.a=.so)$(VERS_MAJ) +ROOTMAJLINK = $(ROOTLIBDIR64)/$(LIBRARY:.a=.so)$(VERS_MAJ) .KEEP_STATE: diff --git a/usr/src/lib/policykit/libpolkit/i386/Makefile b/usr/src/lib/policykit/libpolkit/amd64/Makefile similarity index 90% rename from usr/src/lib/policykit/libpolkit/i386/Makefile rename to usr/src/lib/policykit/libpolkit/amd64/Makefile index 1bd0820e06..874629a83e 100644 --- a/usr/src/lib/policykit/libpolkit/i386/Makefile +++ b/usr/src/lib/policykit/libpolkit/amd64/Makefile @@ -26,5 +26,6 @@ # include ../Makefile.com +include ../../../Makefile.lib.64 -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLIBPC) $(ROOTMAJLINK) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLIBPC) $(ROOTMAJLINK) diff --git a/usr/src/lib/scsi/Makefile.rootdirs b/usr/src/lib/scsi/Makefile.rootdirs index 797f633609..76dadc1fc7 100644 --- a/usr/src/lib/scsi/Makefile.rootdirs +++ b/usr/src/lib/scsi/Makefile.rootdirs @@ -36,7 +36,7 @@ $(ROOTPLUGINLIBDIR)/scsi: $(ROOTPLUGINLIBDIR) $(ROOTPLUGINLIBDIR)/scsi/engines: $(ROOTPLUGINLIBDIR)/scsi $(INS.dir) -$(ROOTPLUGINLIBDIR)/scsi/engines/$(MACH64): $(ROOTPLUGINLIBDIR)/scsi/engines +$(ROOTPLUGINLIBDIR)/scsi/engines/$(MACH32): $(ROOTPLUGINLIBDIR)/scsi/engines $(INS.dir) $(ROOTPLUGINLIBDIR)/ses: $(ROOTPLUGINLIBDIR) @@ -45,13 +45,13 @@ $(ROOTPLUGINLIBDIR)/ses: $(ROOTPLUGINLIBDIR) $(ROOTPLUGINLIBDIR)/ses/framework: $(ROOTPLUGINLIBDIR)/ses $(INS.dir) -$(ROOTPLUGINLIBDIR)/ses/framework/$(MACH64): $(ROOTPLUGINLIBDIR)/ses/framework +$(ROOTPLUGINLIBDIR)/ses/framework/$(MACH32): $(ROOTPLUGINLIBDIR)/ses/framework $(INS.dir) $(ROOTPLUGINLIBDIR)/ses/vendor: $(ROOTPLUGINLIBDIR)/ses $(INS.dir) -$(ROOTPLUGINLIBDIR)/ses/vendor/$(MACH64): $(ROOTPLUGINLIBDIR)/ses/vendor +$(ROOTPLUGINLIBDIR)/ses/vendor/$(MACH32): $(ROOTPLUGINLIBDIR)/ses/vendor $(INS.dir) $(ROOTPLUGINLIBDIR)/smp: $(ROOTPLUGINLIBDIR) @@ -60,19 +60,19 @@ $(ROOTPLUGINLIBDIR)/smp: $(ROOTPLUGINLIBDIR) $(ROOTPLUGINLIBDIR)/smp/engine: $(ROOTPLUGINLIBDIR)/smp $(INS.dir) -$(ROOTPLUGINLIBDIR)/smp/engine/$(MACH64): $(ROOTPLUGINLIBDIR)/smp/engine +$(ROOTPLUGINLIBDIR)/smp/engine/$(MACH32): $(ROOTPLUGINLIBDIR)/smp/engine $(INS.dir) $(ROOTPLUGINLIBDIR)/smp/framework: $(ROOTPLUGINLIBDIR)/smp $(INS.dir) -$(ROOTPLUGINLIBDIR)/smp/framework/$(MACH64): $(ROOTPLUGINLIBDIR)/smp/framework +$(ROOTPLUGINLIBDIR)/smp/framework/$(MACH32): $(ROOTPLUGINLIBDIR)/smp/framework $(INS.dir) $(ROOTPLUGINLIBDIR)/smp/vendor: $(ROOTPLUGINLIBDIR)/smp $(INS.dir) -$(ROOTPLUGINLIBDIR)/smp/vendor/$(MACH64): $(ROOTPLUGINLIBDIR)/smp/vendor +$(ROOTPLUGINLIBDIR)/smp/vendor/$(MACH32): $(ROOTPLUGINLIBDIR)/smp/vendor $(INS.dir) $(ROOTPLUGINHDRDIR): diff --git a/usr/src/lib/scsi/libscsi/Makefile.com b/usr/src/lib/scsi/libscsi/Makefile.com index 0824ac8237..fce23525d7 100644 --- a/usr/src/lib/scsi/libscsi/Makefile.com +++ b/usr/src/lib/scsi/libscsi/Makefile.com @@ -47,8 +47,8 @@ LDLIBS += \ -lumem \ -lc LIBS = $(DYNLIB) -ROOTLIBDIR = $(ROOTSCSILIBDIR) -ROOTLIBDIR64 = $(ROOTSCSILIBDIR)/$(MACH64) +ROOTLIBDIR = $(ROOTSCSILIBDIR)/$(MACH32) +ROOTLIBDIR64 = $(ROOTSCSILIBDIR) CLEANFILES += \ ../common/scsi_errno.c diff --git a/usr/src/lib/scsi/libscsi/common/scsi_engine.c b/usr/src/lib/scsi/libscsi/common/scsi_engine.c index 5f064f1838..d82c498f71 100644 --- a/usr/src/lib/scsi/libscsi/common/scsi_engine.c +++ b/usr/src/lib/scsi/libscsi/common/scsi_engine.c @@ -65,10 +65,9 @@ get_engine(libscsi_hdl_t *hp, const char *name) engine_path = LIBSCSI_DEFAULT_ENGINE_PATH; #if defined(_LP64) - if (sysinfo(SI_ARCHITECTURE_64, isa, sizeof (isa)) < 0) - isa[0] = '\0'; -#else isa[0] = '\0'; +#else + strcpy(isa, "i386"); #endif for (p = engine_path; p != NULL; p = q) { diff --git a/usr/src/lib/scsi/libses/Makefile.defs b/usr/src/lib/scsi/libses/Makefile.defs index fe6dde0355..02f6a3e1b7 100644 --- a/usr/src/lib/scsi/libses/Makefile.defs +++ b/usr/src/lib/scsi/libses/Makefile.defs @@ -35,14 +35,14 @@ CERRWARN += -Wno-unused-label SMOFF += all_func_returns -ROOTLIBDIR = $(ROOTSCSILIBDIR) -ROOTLIBDIR64 = $(ROOTSCSILIBDIR)/$(MACH64) +ROOTLIBDIR = $(ROOTSCSILIBDIR)/$(MACH32) +ROOTLIBDIR64 = $(ROOTSCSILIBDIR) -DYNFLAGS32 += -R$(SCSILIBDIR) -DYNFLAGS64 += -R$(SCSILIBDIR)/$(MACH64) +DYNFLAGS32 += -R$(SCSILIBDIR)/$(MACH32) +DYNFLAGS64 += -R$(SCSILIBDIR) -LDLIBS32 += -L$(ROOTSCSILIBDIR) -LDLIBS64 += -L$(ROOTSCSILIBDIR)/$(MACH64) +LDLIBS32 += -L$(ROOTSCSILIBDIR)/$(MACH32) +LDLIBS64 += -L$(ROOTSCSILIBDIR) LDLIBS += \ -lnvpair \ diff --git a/usr/src/lib/scsi/libses/Makefile.defs.64 b/usr/src/lib/scsi/libses/Makefile.defs.64 index a6fe3b77dd..c2ad0227d8 100644 --- a/usr/src/lib/scsi/libses/Makefile.defs.64 +++ b/usr/src/lib/scsi/libses/Makefile.defs.64 @@ -25,4 +25,4 @@ # # ident "%Z%%M% %I% %E% SMI" -DYNFLAGS += -R/usr/lib/scsi/$(MACH64) +DYNFLAGS += -R/usr/lib/scsi diff --git a/usr/src/lib/scsi/libses/common/ses_plugin.c b/usr/src/lib/scsi/libses/common/ses_plugin.c index 823fc43fea..6ad72d1b71 100644 --- a/usr/src/lib/scsi/libses/common/ses_plugin.c +++ b/usr/src/lib/scsi/libses/common/ses_plugin.c @@ -287,10 +287,9 @@ ses_plugin_load_dir(ses_target_t *tp, const char *pluginroot) pluginroot, LIBSES_PLUGIN_FRAMEWORK); #if defined(_LP64) - if (sysinfo(SI_ARCHITECTURE_64, isa, sizeof (isa)) < 0) - isa[0] = '\0'; -#else isa[0] = '\0'; +#else + strcpy(isa, "i386"); #endif if ((dirp = opendir(path)) != NULL) { diff --git a/usr/src/lib/scsi/libsmp/Makefile.com b/usr/src/lib/scsi/libsmp/Makefile.com index 19fa077265..6eefa0ac10 100644 --- a/usr/src/lib/scsi/libsmp/Makefile.com +++ b/usr/src/lib/scsi/libsmp/Makefile.com @@ -50,8 +50,8 @@ LDLIBS += \ -lumem \ -lc LIBS = $(DYNLIB) -ROOTLIBDIR = $(ROOTSCSILIBDIR) -ROOTLIBDIR64 = $(ROOTSCSILIBDIR)/$(MACH64) +ROOTLIBDIR = $(ROOTSCSILIBDIR)/$(MACH32) +ROOTLIBDIR64 = $(ROOTSCSILIBDIR) CLEANFILES += \ ../common/smp_errno.c diff --git a/usr/src/lib/scsi/libsmp/common/smp_engine.c b/usr/src/lib/scsi/libsmp/common/smp_engine.c index 3c408a8f01..1a30daed60 100644 --- a/usr/src/lib/scsi/libsmp/common/smp_engine.c +++ b/usr/src/lib/scsi/libsmp/common/smp_engine.c @@ -195,10 +195,9 @@ smp_engine_hold(const char *name) } #if defined(_LP64) - if (sysinfo(SI_ARCHITECTURE_64, isa, sizeof (isa)) < 0) - isa[0] = '\0'; -#else isa[0] = '\0'; +#else + strcpy(isa, "i386"); #endif if ((pluginpath = getenv("SMP_PLUGINPATH")) == NULL) diff --git a/usr/src/lib/scsi/libsmp/common/smp_plugin.c b/usr/src/lib/scsi/libsmp/common/smp_plugin.c index cedb664953..9db98f081c 100644 --- a/usr/src/lib/scsi/libsmp/common/smp_plugin.c +++ b/usr/src/lib/scsi/libsmp/common/smp_plugin.c @@ -274,10 +274,9 @@ smp_plugin_load_dir(smp_target_t *tp, const char *pluginroot) pluginroot, LIBSMP_PLUGIN_FRAMEWORK); #if defined(_LP64) - if (sysinfo(SI_ARCHITECTURE_64, isa, sizeof (isa)) < 0) - isa[0] = '\0'; -#else isa[0] = '\0'; +#else + strcpy(isa, "i386"); #endif if ((dirp = opendir(path)) != NULL) { diff --git a/usr/src/lib/scsi/plugins/scsi/engines/Makefile.engine b/usr/src/lib/scsi/plugins/scsi/engines/Makefile.engine index a02d107fc0..1cdb97ebc0 100644 --- a/usr/src/lib/scsi/plugins/scsi/engines/Makefile.engine +++ b/usr/src/lib/scsi/plugins/scsi/engines/Makefile.engine @@ -44,13 +44,13 @@ OBJS = $(YOBJS) $(SRCS:%.c=%.o) # DMOD, if set, must match PROG above (for mdb autoloading) so it will # be built in a subdirectory. # -ROOTDMOD = $(DMOD:%.so=$(ROOT)/usr/lib/mdb/proc/%.so) -ROOTDMOD64 = $(DMOD:%.so=$(ROOT)/usr/lib/mdb/proc/$(MACH64)/%.so) +ROOTDMOD = $(DMOD:%.so=$(ROOT)/usr/lib/mdb/proc/$(MACH32)/%.so) +ROOTDMOD64 = $(DMOD:%.so=$(ROOT)/usr/lib/mdb/proc/%.so) DMODPROG = $(DMOD:%=dmod/%) DMOD_OBJS = $(DMOD_SRCS:%.c=%.o) -ROOTPROG = $(ROOTPLUGINLIBDIR)/scsi/engines/$(PROG) -ROOTPROG64 = $(ROOTPLUGINLIBDIR)/scsi/engines/$(MACH64)/$(PROG) +ROOTPROG = $(ROOTPLUGINLIBDIR)/scsi/engines/$(MACH32)/$(PROG) +ROOTPROG64 = $(ROOTPLUGINLIBDIR)/scsi/engines/$(PROG) diff --git a/usr/src/lib/scsi/plugins/ses/Makefile.lib b/usr/src/lib/scsi/plugins/ses/Makefile.lib index ea89311963..c45072568b 100644 --- a/usr/src/lib/scsi/plugins/ses/Makefile.lib +++ b/usr/src/lib/scsi/plugins/ses/Makefile.lib @@ -44,13 +44,13 @@ OBJS = $(YOBJS) $(SRCS:%.c=%.o) # DMOD, if set, must match PROG above (for mdb autoloading) so it will # be built in a subdirectory. # -ROOTDMOD = $(DMOD:%.so=$(ROOT)/usr/lib/mdb/proc/%.so) -ROOTDMOD64 = $(DMOD:%.so=$(ROOT)/usr/lib/mdb/proc/$(MACH64)/%.so) +ROOTDMOD = $(DMOD:%.so=$(ROOT)/usr/lib/mdb/proc/$(MACH32)%.so) +ROOTDMOD64 = $(DMOD:%.so=$(ROOT)/usr/lib/mdb/proc/%.so) DMODPROG = $(DMOD:%=dmod/%) DMOD_OBJS = $(DMOD_SRCS:%.c=%.o) -ROOTPLUGINDIR = $(ROOTPLUGINLIBDIR)/ses/$(PLUGINTYPE) -ROOTPLUGINDIR64 = $(ROOTPLUGINLIBDIR)/ses/$(PLUGINTYPE)/$(MACH64) +ROOTPLUGINDIR = $(ROOTPLUGINLIBDIR)/ses/$(PLUGINTYPE)/$(MACH32) +ROOTPLUGINDIR64 = $(ROOTPLUGINLIBDIR)/ses/$(PLUGINTYPE) ROOTPROG = $(ROOTPLUGINDIR)/$(PROG) ROOTPROG64 = $(ROOTPLUGINDIR64)/$(PROG) diff --git a/usr/src/lib/scsi/plugins/smp/Makefile.lib b/usr/src/lib/scsi/plugins/smp/Makefile.lib index 0e54634df4..4b79942663 100644 --- a/usr/src/lib/scsi/plugins/smp/Makefile.lib +++ b/usr/src/lib/scsi/plugins/smp/Makefile.lib @@ -42,13 +42,13 @@ OBJS = $(YOBJS) $(SRCS:%.c=%.o) # DMOD, if set, must match PROG above (for mdb autoloading) so it will # be built in a subdirectory. # -ROOTDMOD = $(DMOD:%.so=$(ROOT)/usr/lib/mdb/proc/%.so) -ROOTDMOD64 = $(DMOD:%.so=$(ROOT)/usr/lib/mdb/proc/$(MACH64)/%.so) +ROOTDMOD = $(DMOD:%.so=$(ROOT)/usr/lib/mdb/proc$(MACH32)/%.so) +ROOTDMOD64 = $(DMOD:%.so=$(ROOT)/usr/lib/mdb/proc/%.so) DMODPROG = $(DMOD:%=dmod/%) DMOD_OBJS = $(DMOD_SRCS:%.c=%.o) -ROOTPLUGINDIR = $(ROOTPLUGINLIBDIR)/smp/$(PLUGINTYPE) -ROOTPLUGINDIR64 = $(ROOTPLUGINLIBDIR)/smp/$(PLUGINTYPE)/$(MACH64) +ROOTPLUGINDIR = $(ROOTPLUGINLIBDIR)/smp/$(PLUGINTYPE)/$(MACH32) +ROOTPLUGINDIR64 = $(ROOTPLUGINLIBDIR)/smp/$(PLUGINTYPE) ROOTPROG = $(ROOTPLUGINDIR)/$(PROG) ROOTPROG64 = $(ROOTPLUGINDIR64)/$(PROG) diff --git a/usr/src/pkg/manifests/developer-build-make.mf b/usr/src/pkg/manifests/developer-build-make.mf index d4ed85f59e..ee82deb0dd 100644 --- a/usr/src/pkg/manifests/developer-build-make.mf +++ b/usr/src/pkg/manifests/developer-build-make.mf @@ -20,7 +20,7 @@ set name=variant.arch value=$(ARCH) dir path=usr/share/lib/make dir path=usr/share/man/man1 file path=usr/bin/dmake mode=0555 -file path=usr/lib/$(ARCH64)/libmakestate.so.1 +file path=usr/lib/$(ARCH32)/libmakestate.so.1 file path=usr/lib/libmakestate.so.1 file path=usr/share/lib/make/make.rules file path=usr/share/lib/make/svr4.make.rules diff --git a/usr/src/pkg/manifests/developer-dtrace.inc b/usr/src/pkg/manifests/developer-dtrace.inc index 27e112fe05..b833ff28ab 100644 --- a/usr/src/pkg/manifests/developer-dtrace.inc +++ b/usr/src/pkg/manifests/developer-dtrace.inc @@ -31,7 +31,7 @@ dir path=usr group=sys dir path=usr/include dir path=usr/include/sys dir path=usr/lib -dir path=usr/lib/$(ARCH64) +dir path=usr/lib/$(ARCH32) dir path=usr/lib/devfsadm group=sys dir path=usr/lib/devfsadm/linkmod group=sys dir path=usr/lib/dtrace @@ -43,7 +43,7 @@ dir path=usr/lib/mdb/raw group=sys dir path=usr/lib/mdb/raw/$(ARCH64) group=sys dir path=usr/sbin dir path=usr/sbin/$(ARCH32) -dir path=usr/sbin/$(ARCH64) +dir path=usr/sbin/$(ARCH32) dir path=usr/share dir path=usr/share/lib dir path=usr/share/man/man8 @@ -56,7 +56,7 @@ file path=usr/include/sys/fasttrap_impl.h file path=usr/include/sys/fasttrap_isa.h file path=usr/include/sys/lockstat.h file path=usr/include/sys/sdt.h -file path=usr/lib/$(ARCH64)/libdtrace.so.1 +file path=usr/lib/$(ARCH32)/libdtrace.so.1 file path=usr/lib/devfsadm/linkmod/SUNW_dtrace_link.so group=sys file path=usr/lib/dtrace/64/drti.o mode=0444 file path=usr/lib/dtrace/64/libdtrace_forceload.so mode=0555 @@ -103,5 +103,5 @@ hardlink path=usr/sbin/lockstat target=../../usr/lib/isaexec hardlink path=usr/sbin/plockstat target=../../usr/lib/isaexec license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL -link path=usr/lib/$(ARCH64)/libdtrace.so target=libdtrace.so.1 +link path=usr/lib/$(ARCH32)/libdtrace.so target=libdtrace.so.1 link path=usr/lib/libdtrace.so target=libdtrace.so.1 diff --git a/usr/src/pkg/manifests/developer-linker.mf b/usr/src/pkg/manifests/developer-linker.mf index a614908a2d..ef44c26d60 100644 --- a/usr/src/pkg/manifests/developer-linker.mf +++ b/usr/src/pkg/manifests/developer-linker.mf @@ -41,6 +41,8 @@ dir path=usr/lib/ld dir path=usr/lib/ld/$(ARCH64) dir path=usr/lib/link_audit dir path=usr/lib/link_audit/$(ARCH64) +dir path=usr/libexec +dir path=usr/libexec/$(ARCH32) dir path=usr/share/man dir path=usr/share/man/man1 dir path=usr/share/man/man4 @@ -64,8 +66,7 @@ file path=usr/bin/ldd mode=0555 file path=usr/bin/od mode=0555 file path=usr/bin/pvs mode=0555 file path=usr/bin/regcmp mode=0555 -file path=usr/lib/$(ARCH64)/lddstub mode=0555 -file path=usr/lib/$(ARCH64)/libldstab.so.1 +file path=usr/lib/$(ARCH32)/libldstab.so.1 file path=usr/lib/abi/spec2map mode=0755 file path=usr/lib/abi/spec2trace mode=0755 file path=usr/lib/ld/map.above4G mode=0444 @@ -77,10 +78,11 @@ file path=usr/lib/ld/map.execstack mode=0444 file path=usr/lib/ld/map.filter mode=0444 file path=usr/lib/ld/map.noexbss mode=0444 file path=usr/lib/ld/map.pagealign mode=0444 -file path=usr/lib/lddstub mode=0555 file path=usr/lib/libldstab.so.1 -file path=usr/lib/link_audit/$(ARCH64)/ldprof.so.1 +file path=usr/lib/link_audit/$(ARCH32)/ldprof.so.1 file path=usr/lib/link_audit/ldprof.so.1 +file path=usr/libexec/$(ARCH32)/lddstub mode=0555 +file path=usr/libexec/lddstub mode=0555 file path=usr/share/man/man1/elfsign.1 file path=usr/share/man/man1/elfwrap.1 file path=usr/share/man/man1/exstr.1 @@ -101,6 +103,6 @@ hardlink path=usr/bin/truss target=../../usr/lib/isaexec license cr_ATT license=cr_ATT license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL -link path=usr/lib/ld/$(ARCH64)/map.above4G target=../map.above4G -link path=usr/lib/ld/$(ARCH64)/map.below4G target=../map.below4G -link path=usr/lib/ld/$(ARCH64)/map.default target=../map.default +link path=usr/lib/ld/$(ARCH32)/map.above4G target=../map.above4G +link path=usr/lib/ld/$(ARCH32)/map.below4G target=../map.below4G +link path=usr/lib/ld/$(ARCH32)/map.default target=../map.default diff --git a/usr/src/pkg/manifests/diagnostic-cpu-counters.mf b/usr/src/pkg/manifests/diagnostic-cpu-counters.mf index cee0d80057..6a15e48933 100644 --- a/usr/src/pkg/manifests/diagnostic-cpu-counters.mf +++ b/usr/src/pkg/manifests/diagnostic-cpu-counters.mf @@ -39,7 +39,7 @@ dir path=usr/include/sys dir path=usr/kernel group=sys dir path=usr/kernel/pcbe group=sys dir path=usr/lib -dir path=usr/lib/$(ARCH64) +dir path=usr/lib/$(ARCH32) dir path=usr/sbin dir path=usr/share/man/man1 dir path=usr/share/man/man3cpc @@ -52,8 +52,8 @@ file path=usr/include/libpctx.h file path=usr/kernel/pcbe/pcbe.AuthenticAMD group=sys mode=0755 file path=usr/kernel/pcbe/pcbe.GenuineIntel.15 group=sys mode=0755 file path=usr/kernel/pcbe/pcbe.GenuineIntel.6.15 group=sys mode=0755 -file path=usr/lib/$(ARCH64)/libcpc.so.1 -file path=usr/lib/$(ARCH64)/libpctx.so.1 +file path=usr/lib/$(ARCH32)/libcpc.so.1 +file path=usr/lib/$(ARCH32)/libpctx.so.1 file path=usr/lib/libcpc.so.1 file path=usr/lib/libpctx.so.1 file path=usr/sbin/cpustat mode=0555 @@ -98,7 +98,7 @@ link path=usr/kernel/pcbe/pcbe.GenuineIntel.6.37 target=pcbe.GenuineIntel.6.15 link path=usr/kernel/pcbe/pcbe.GenuineIntel.6.44 target=pcbe.GenuineIntel.6.15 link path=usr/kernel/pcbe/pcbe.GenuineIntel.6.46 target=pcbe.GenuineIntel.6.15 link path=usr/kernel/pcbe/pcbe.GenuineIntel.6.47 target=pcbe.GenuineIntel.6.15 -link path=usr/lib/$(ARCH64)/libcpc.so target=./libcpc.so.1 -link path=usr/lib/$(ARCH64)/libpctx.so target=./libpctx.so.1 +link path=usr/lib/$(ARCH32)/libcpc.so target=./libcpc.so.1 +link path=usr/lib/$(ARCH32)/libpctx.so target=./libpctx.so.1 link path=usr/lib/libcpc.so target=./libcpc.so.1 link path=usr/lib/libpctx.so target=./libpctx.so.1 diff --git a/usr/src/pkg/manifests/driver-network-srpt.inc b/usr/src/pkg/manifests/driver-network-srpt.inc index d0bc135ee0..304aaba776 100644 --- a/usr/src/pkg/manifests/driver-network-srpt.inc +++ b/usr/src/pkg/manifests/driver-network-srpt.inc @@ -36,7 +36,7 @@ dir path=lib/svc/method variant.opensolaris.zone=global dir path=usr group=sys dir path=usr/include dir path=usr/lib -dir path=usr/lib/$(ARCH64) +dir path=usr/lib/$(ARCH32) dir path=usr/lib/mdb group=sys dir path=usr/lib/mdb/kvm group=sys dir path=usr/lib/mdb/kvm/$(ARCH64) group=sys @@ -51,12 +51,12 @@ file path=lib/svc/manifest/system/ibsrp/target.xml group=sys mode=0444 \ variant.opensolaris.zone=global file path=lib/svc/method/svc-srpt mode=0555 variant.opensolaris.zone=global file path=usr/include/libsrpt.h -file path=usr/lib/$(ARCH64)/libsrpt.so.1 +file path=usr/lib/$(ARCH32)/libsrpt.so.1 file path=usr/lib/libsrpt.so.1 file path=usr/lib/mdb/kvm/$(ARCH64)/srpt.so group=sys mode=0555 file path=usr/sbin/srptadm mode=0555 file path=usr/share/man/man7d/srpt.7d license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL -link path=usr/lib/$(ARCH64)/libsrpt.so target=libsrpt.so.1 +link path=usr/lib/$(ARCH32)/libsrpt.so target=libsrpt.so.1 link path=usr/lib/libsrpt.so target=libsrpt.so.1 diff --git a/usr/src/pkg/manifests/install-beadm.inc b/usr/src/pkg/manifests/install-beadm.inc index 14cce85ac1..c234027c0b 100644 --- a/usr/src/pkg/manifests/install-beadm.inc +++ b/usr/src/pkg/manifests/install-beadm.inc @@ -31,18 +31,18 @@ dir path=sbin group=sys dir path=usr group=sys dir path=usr/include dir path=usr/lib -dir path=usr/lib/$(ARCH64) +dir path=usr/lib/$(ARCH32) dir path=usr/sbin dir path=usr/share dir path=usr/share/man dir path=usr/share/man/man8 file path=sbin/beadm mode=0555 file path=usr/include/libbe.h -file path=usr/lib/$(ARCH64)/libbe.so.1 +file path=usr/lib/$(ARCH32)/libbe.so.1 file path=usr/lib/libbe.so.1 file path=usr/share/man/man8/beadm.8 license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL -link path=usr/lib/$(ARCH64)/libbe.so target=./libbe.so.1 +link path=usr/lib/$(ARCH32)/libbe.so target=./libbe.so.1 link path=usr/lib/libbe.so target=./libbe.so.1 link path=usr/sbin/beadm target=../../sbin/beadm diff --git a/usr/src/pkg/manifests/library-libedit.inc b/usr/src/pkg/manifests/library-libedit.inc index 43398fb62a..9dd8c45b05 100644 --- a/usr/src/pkg/manifests/library-libedit.inc +++ b/usr/src/pkg/manifests/library-libedit.inc @@ -15,19 +15,19 @@ dir path=usr group=sys dir path=usr/include dir path=usr/lib -dir path=usr/lib/amd64 +dir path=usr/lib/i386 dir path=usr/share dir path=usr/share/man dir path=usr/share/man/man3 dir path=usr/share/man/man5 dir path=usr/share/man/man7 file path=usr/include/histedit.h -file path=usr/lib/amd64/libedit.so.5.2 mode=0555 +file path=usr/lib/i386/libedit.so.5.2 mode=0555 file path=usr/lib/libedit.so.5.2 mode=0555 file path=usr/share/man/man3/editline.3 file path=usr/share/man/man5/editrc.5 file path=usr/share/man/man7/editline.7 -link path=usr/lib/amd64/libedit.so target=libedit.so.5.2 -link path=usr/lib/amd64/libedit.so.5 target=libedit.so.5.2 +link path=usr/lib/i386/libedit.so target=libedit.so.5.2 +link path=usr/lib/i386/libedit.so.5 target=libedit.so.5.2 link path=usr/lib/libedit.so target=libedit.so.5.2 link path=usr/lib/libedit.so.5 target=libedit.so.5.2 diff --git a/usr/src/pkg/manifests/library-libressl.inc b/usr/src/pkg/manifests/library-libressl.inc index 8092b462fb..b96075665b 100644 --- a/usr/src/pkg/manifests/library-libressl.inc +++ b/usr/src/pkg/manifests/library-libressl.inc @@ -19,7 +19,7 @@ dir path=usr/bin dir path=usr/include dir path=usr/include/openssl dir path=usr/lib -dir path=usr/lib/amd64 +dir path=usr/lib/i386 dir path=usr/lib/pkgconfig group=other dir path=usr/share dir path=usr/share/man @@ -102,9 +102,9 @@ file path=usr/include/openssl/x509.h file path=usr/include/openssl/x509_vfy.h file path=usr/include/openssl/x509v3.h file path=usr/include/tls.h -file path=usr/lib/amd64/libcrypto.so.44.1 mode=0555 -file path=usr/lib/amd64/libssl.so.46.1 mode=0555 -file path=usr/lib/amd64/libtls.so.18.1 mode=0555 +file path=usr/lib/i386/libcrypto.so.44.1 mode=0555 +file path=usr/lib/i386/libssl.so.46.1 mode=0555 +file path=usr/lib/i386/libtls.so.18.1 mode=0555 file path=usr/lib/libcrypto.so.44.1 mode=0555 file path=usr/lib/libssl.so.46.1 mode=0555 file path=usr/lib/libtls.so.18.1 mode=0555 @@ -546,12 +546,12 @@ file path=usr/share/man/man3/tls_ocsp_process_response.3 file path=usr/share/man/man3/tls_read.3 file path=usr/share/man/man5/openssl.cnf.5 file path=usr/share/man/man5/x509v3.cnf.5 -link path=usr/lib/amd64/libcrypto.so target=libcrypto.so.44.1 -link path=usr/lib/amd64/libcrypto.so.44 target=libcrypto.so.44.1 -link path=usr/lib/amd64/libssl.so target=libssl.so.46.1 -link path=usr/lib/amd64/libssl.so.46 target=libssl.so.46.1 -link path=usr/lib/amd64/libtls.so target=libtls.so.18.1 -link path=usr/lib/amd64/libtls.so.18 target=libtls.so.18.1 +link path=usr/lib/i386/libcrypto.so target=libcrypto.so.44.1 +link path=usr/lib/i386/libcrypto.so.44 target=libcrypto.so.44.1 +link path=usr/lib/i386/libssl.so target=libssl.so.46.1 +link path=usr/lib/i386/libssl.so.46 target=libssl.so.46.1 +link path=usr/lib/i386/libtls.so target=libtls.so.18.1 +link path=usr/lib/i386/libtls.so.18 target=libtls.so.18.1 link path=usr/lib/libcrypto.so target=libcrypto.so.44.1 link path=usr/lib/libcrypto.so.44 target=libcrypto.so.44.1 link path=usr/lib/libssl.so target=libssl.so.46.1 diff --git a/usr/src/pkg/manifests/library-libtecla.inc b/usr/src/pkg/manifests/library-libtecla.inc index 4c808a69c8..8e00975dad 100644 --- a/usr/src/pkg/manifests/library-libtecla.inc +++ b/usr/src/pkg/manifests/library-libtecla.inc @@ -28,7 +28,7 @@ dir path=usr group=sys dir path=usr/bin dir path=usr/include dir path=usr/lib -dir path=usr/lib/$(ARCH64) +dir path=usr/lib/$(ARCH32) dir path=usr/share/man dir path=usr/share/man/man1 dir path=usr/share/man/man3lib @@ -36,7 +36,7 @@ dir path=usr/share/man/man3tecla dir path=usr/share/man/man5 file path=usr/bin/enhance mode=0555 file path=usr/include/libtecla.h -file path=usr/lib/$(ARCH64)/libtecla.so.1 +file path=usr/lib/$(ARCH32)/libtecla.so.1 file path=usr/lib/libtecla.so.1 file path=usr/share/man/man1/enhance.1 file path=usr/share/man/man3lib/libtecla.3lib @@ -49,5 +49,5 @@ file path=usr/share/man/man3tecla/pca_lookup_file.3tecla file path=usr/share/man/man5/tecla.5 license usr/src/lib/libtecla/THIRDPARTYLICENSE \ license=usr/src/lib/libtecla/THIRDPARTYLICENSE -link path=usr/lib/$(ARCH64)/libtecla.so target=libtecla.so.1 +link path=usr/lib/$(ARCH32)/libtecla.so target=libtecla.so.1 link path=usr/lib/libtecla.so target=libtecla.so.1 diff --git a/usr/src/pkg/manifests/library-ncurses.inc b/usr/src/pkg/manifests/library-ncurses.inc index a0b75cf3fd..4be909d298 100644 --- a/usr/src/pkg/manifests/library-ncurses.inc +++ b/usr/src/pkg/manifests/library-ncurses.inc @@ -76,10 +76,10 @@ file path=usr/include/panel.h mode=0444 file path=usr/include/term.h mode=0444 file path=usr/include/termcap.h mode=0444 file path=usr/include/unctrl.h mode=0444 -file path=usr/lib/$(ARCH64)/libform.so.6.0 mode=0555 -file path=usr/lib/$(ARCH64)/libmenu.so.6.0 mode=0555 -file path=usr/lib/$(ARCH64)/libncurses.so.6.0 mode=0555 -file path=usr/lib/$(ARCH64)/libpanel.so.6.0 mode=0555 +file path=usr/lib/$(ARCH32)/libform.so.6.0 mode=0555 +file path=usr/lib/$(ARCH32)/libmenu.so.6.0 mode=0555 +file path=usr/lib/$(ARCH32)/libncurses.so.6.0 mode=0555 +file path=usr/lib/$(ARCH32)/libpanel.so.6.0 mode=0555 file path=usr/lib/libform.so.6.0 mode=0555 file path=usr/lib/libmenu.so.6.0 mode=0555 file path=usr/lib/libncurses.so.6.0 mode=0555 @@ -1929,7 +1929,7 @@ file path=usr/share/terminfo/z/zen30 mode=0644 file path=usr/share/terminfo/z/zen50 mode=0644 hardlink path=usr/bin/captoinfo target=../../usr/bin/tic hardlink path=usr/bin/reset target=../../usr/bin/tset -hardlink path=usr/lib/$(ARCH64)/libcurses.so.6.0 target=libncurses.so.6.0 +hardlink path=usr/lib/$(ARCH32)/libcurses.so.6.0 target=libncurses.so.6.0 hardlink path=usr/lib/libcurses.so.6.0 target=libncurses.so.6.0 hardlink path=usr/share/terminfo/1/1178 target=../a/adm1178 hardlink path=usr/share/terminfo/1/1730-lm target=../d/diablo1740-lm @@ -2962,16 +2962,16 @@ hardlink path=usr/share/terminfo/z/ztx target=../h/htx11 hardlink path=usr/share/terminfo/z/ztx-1-a target=../h/htx11 hardlink path=usr/share/terminfo/z/ztx11 target=../h/htx11 link path=usr/include/ncurses.h target=curses.h -link path=usr/lib/$(ARCH64)/libcurses.so target=libcurses.so.6.0 -link path=usr/lib/$(ARCH64)/libcurses.so.6 target=libcurses.so.6.0 -link path=usr/lib/$(ARCH64)/libform.so target=libform.so.6.0 -link path=usr/lib/$(ARCH64)/libform.so.6 target=libform.so.6.0 -link path=usr/lib/$(ARCH64)/libmenu.so target=libmenu.so.6.0 -link path=usr/lib/$(ARCH64)/libmenu.so.6 target=libmenu.so.6.0 -link path=usr/lib/$(ARCH64)/libncurses.so target=libncurses.so.6.0 -link path=usr/lib/$(ARCH64)/libncurses.so.6 target=libncurses.so.6.0 -link path=usr/lib/$(ARCH64)/libpanel.so target=libpanel.so.6.0 -link path=usr/lib/$(ARCH64)/libpanel.so.6 target=libpanel.so.6.0 +link path=usr/lib/$(ARCH32)/libcurses.so target=libcurses.so.6.0 +link path=usr/lib/$(ARCH32)/libcurses.so.6 target=libcurses.so.6.0 +link path=usr/lib/$(ARCH32)/libform.so target=libform.so.6.0 +link path=usr/lib/$(ARCH32)/libform.so.6 target=libform.so.6.0 +link path=usr/lib/$(ARCH32)/libmenu.so target=libmenu.so.6.0 +link path=usr/lib/$(ARCH32)/libmenu.so.6 target=libmenu.so.6.0 +link path=usr/lib/$(ARCH32)/libncurses.so target=libncurses.so.6.0 +link path=usr/lib/$(ARCH32)/libncurses.so.6 target=libncurses.so.6.0 +link path=usr/lib/$(ARCH32)/libpanel.so target=libpanel.so.6.0 +link path=usr/lib/$(ARCH32)/libpanel.so.6 target=libpanel.so.6.0 link path=usr/lib/libcurses.so target=libcurses.so.6.0 link path=usr/lib/libcurses.so.6 target=libcurses.so.6.0 link path=usr/lib/libform.so target=libform.so.6.0 diff --git a/usr/src/pkg/manifests/library-pcap.mf b/usr/src/pkg/manifests/library-pcap.mf index 685defbcd9..ee7bac534a 100644 --- a/usr/src/pkg/manifests/library-pcap.mf +++ b/usr/src/pkg/manifests/library-pcap.mf @@ -32,7 +32,7 @@ file path=usr/include/pcap/pcap.h mode=0444 file path=usr/include/pcap/sll.h mode=0444 file path=usr/include/pcap/usb.h mode=0444 file path=usr/include/pcap/vlan.h mode=0444 -file path=usr/lib/amd64/libpcap.so.1.8.1 mode=0555 +file path=usr/lib/libpcap.so.1.8.1 mode=0555 file path=usr/share/man/man3/pcap.3 file path=usr/share/man/man3/pcap_activate.3 file path=usr/share/man/man3/pcap_breakloop.3 @@ -88,5 +88,5 @@ file path=usr/share/man/man3/pcap_statustostr.3 file path=usr/share/man/man3/pcap_strerror.3 file path=usr/share/man/man3/pcap_tstamp_type_name_to_val.3 file path=usr/share/man/man3/pcap_tstamp_type_val_to_name.3 -link path=usr/lib/amd64/libpcap.so target=libpcap.so.1.8.1 -link path=usr/lib/amd64/libpcap.so.1 target=libpcap.so.1.8.1 +link path=usr/lib/libpcap.so target=libpcap.so.1.8.1 +link path=usr/lib/libpcap.so.1 target=libpcap.so.1.8.1 diff --git a/usr/src/pkg/manifests/network-bridging.mf b/usr/src/pkg/manifests/network-bridging.mf index 04268421f8..553e67436d 100644 --- a/usr/src/pkg/manifests/network-bridging.mf +++ b/usr/src/pkg/manifests/network-bridging.mf @@ -38,7 +38,7 @@ dir path=usr/lib/rcm dir path=usr/lib/rcm/modules file path=lib/svc/manifest/network/bridge.xml group=sys mode=0444 file path=usr/lib/bridged mode=0555 -file path=usr/lib/librstp.so.1 +file path=usr/lib/$(ARCH32)/librstp.so.1 file path=usr/lib/rcm/modules/SUNW_bridge_rcm.so mode=0555 license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/network-ipd.mf b/usr/src/pkg/manifests/network-ipd.mf index 96be82e2fb..423c26b15b 100644 --- a/usr/src/pkg/manifests/network-ipd.mf +++ b/usr/src/pkg/manifests/network-ipd.mf @@ -23,7 +23,7 @@ dir path=kernel group=sys dir path=kernel/drv group=sys dir path=usr group=sys dir path=usr/lib -dir path=usr/lib/$(ARCH64) +dir path=usr/lib/$(ARCH32) dir path=usr/sbin dir path=usr/share/man/man8 driver name=ipd perms="* 0600 root sys" @@ -31,11 +31,11 @@ file path=kernel/drv/ipd group=sys file path=kernel/drv/ipd.conf group=sys file path=usr/include/libipd.h file path=usr/include/sys/ipd.h -file path=usr/lib/$(ARCH64)/libipd.so.1 +file path=usr/lib/$(ARCH32)/libipd.so.1 file path=usr/lib/libipd.so.1 file path=usr/sbin/ipdadm mode=0555 file path=usr/share/man/man8/ipdadm.8 license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL -link path=usr/lib/$(ARCH64)/libipd.so target=libipd.so.1 +link path=usr/lib/$(ARCH32)/libipd.so target=libipd.so.1 link path=usr/lib/libipd.so target=libipd.so.1 diff --git a/usr/src/pkg/manifests/network-iscsi-target.mf b/usr/src/pkg/manifests/network-iscsi-target.mf index 6c0b8e3aa6..44cfe6283c 100644 --- a/usr/src/pkg/manifests/network-iscsi-target.mf +++ b/usr/src/pkg/manifests/network-iscsi-target.mf @@ -44,7 +44,7 @@ dir path=usr/include dir path=usr/include/sys dir path=usr/include/sys/iscsit dir path=usr/lib -dir path=usr/lib/$(ARCH64) +dir path=usr/lib/$(ARCH32) dir path=usr/sbin dir path=usr/share/man/man3iscsit dir path=usr/share/man/man3lib @@ -58,7 +58,7 @@ file path=lib/svc/method/iscsi-target mode=0555 \ variant.opensolaris.zone=global file path=usr/include/libiscsit.h mode=0644 file path=usr/include/sys/iscsit/iscsit_common.h -file path=usr/lib/$(ARCH64)/libiscsit.so.1 +file path=usr/lib/$(ARCH32)/libiscsit.so.1 file path=usr/lib/libiscsit.so.1 file path=usr/sbin/itadm mode=0555 file path=usr/share/man/man3iscsit/it_config_load.3iscsit @@ -70,5 +70,5 @@ file path=usr/share/man/man3lib/libiscsit.3lib file path=usr/share/man/man8/itadm.8 license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL -link path=usr/lib/$(ARCH64)/libiscsit.so target=libiscsit.so.1 +link path=usr/lib/$(ARCH32)/libiscsit.so target=libiscsit.so.1 link path=usr/lib/libiscsit.so target=libiscsit.so.1 diff --git a/usr/src/pkg/manifests/service-fault-management.mf b/usr/src/pkg/manifests/service-fault-management.mf index a18095eaf9..bb7bc2f7ae 100644 --- a/usr/src/pkg/manifests/service-fault-management.mf +++ b/usr/src/pkg/manifests/service-fault-management.mf @@ -55,7 +55,7 @@ dir path=kernel/drv group=sys # lib dirs: # dir path=lib/fm variant.opensolaris.zone=__NODEFAULT -dir path=lib/fm/$(ARCH64) variant.opensolaris.zone=__NODEFAULT +dir path=lib/fm/$(ARCH32) variant.opensolaris.zone=__NODEFAULT # # Our service manifests are common to global and non-global zones # @@ -82,13 +82,13 @@ dir path=usr/include dir path=usr/include/fm dir path=usr/lib variant.opensolaris.zone=__NODEFAULT dir path=usr/lib/fm variant.opensolaris.zone=__NODEFAULT -dir path=usr/lib/fm/$(ARCH64) variant.opensolaris.zone=__NODEFAULT +dir path=usr/lib/fm/$(ARCH32) variant.opensolaris.zone=__NODEFAULT dir path=usr/lib/fm/dict variant.opensolaris.zone=__NODEFAULT dir path=usr/lib/fm/eft dir path=usr/lib/fm/fmd variant.opensolaris.zone=__NODEFAULT dir path=usr/lib/fm/fmd/plugins variant.opensolaris.zone=__NODEFAULT dir path=usr/lib/fm/fmd/schemes variant.opensolaris.zone=__NODEFAULT -dir path=usr/lib/fm/fmd/schemes/$(ARCH64) variant.opensolaris.zone=__NODEFAULT +dir path=usr/lib/fm/fmd/schemes/$(ARCH32) variant.opensolaris.zone=__NODEFAULT dir path=usr/lib/fm/notify variant.opensolaris.zone=__NODEFAULT dir path=usr/lib/fm/topo variant.opensolaris.zone=__NODEFAULT dir path=usr/lib/fm/topo/maps variant.opensolaris.zone=__NODEFAULT @@ -140,7 +140,7 @@ file path=kernel/drv/fm.conf group=sys # # Some libraries need to be in lib for install # -file path=lib/fm/$(ARCH64)/libfmevent.so.1 \ +file path=lib/fm/$(ARCH32)/libfmevent.so.1 \ variant.opensolaris.zone=__NODEFAULT file path=lib/fm/libfmevent.so.1 variant.opensolaris.zone=__NODEFAULT # @@ -174,22 +174,22 @@ file path=usr/include/fm/topo_mod.h mode=0644 # # 64-bit .so.1 # -file path=usr/lib/fm/$(ARCH64)/libdiagcode.so.1 \ +file path=usr/lib/fm/$(ARCH32)/libdiagcode.so.1 \ variant.opensolaris.zone=__NODEFAULT -file path=usr/lib/fm/$(ARCH64)/libdiskstatus.so.1 \ +file path=usr/lib/fm/$(ARCH32)/libdiskstatus.so.1 \ variant.opensolaris.zone=__NODEFAULT -file path=usr/lib/fm/$(ARCH64)/libfmd_adm.so.1 \ +file path=usr/lib/fm/$(ARCH32)/libfmd_adm.so.1 \ variant.opensolaris.zone=__NODEFAULT -file path=usr/lib/fm/$(ARCH64)/libfmd_agent.so.1 \ +file path=usr/lib/fm/$(ARCH32)/libfmd_agent.so.1 \ variant.opensolaris.zone=__NODEFAULT -file path=usr/lib/fm/$(ARCH64)/libfmd_log.so.1 \ +file path=usr/lib/fm/$(ARCH32)/libfmd_log.so.1 \ variant.opensolaris.zone=__NODEFAULT -file path=usr/lib/fm/$(ARCH64)/libfmd_msg.so.1 \ +file path=usr/lib/fm/$(ARCH32)/libfmd_msg.so.1 \ variant.opensolaris.zone=__NODEFAULT -file path=usr/lib/fm/$(ARCH64)/libfmnotify.so.1 \ +file path=usr/lib/fm/$(ARCH32)/libfmnotify.so.1 \ variant.opensolaris.zone=__NODEFAULT -file path=usr/lib/fm/$(ARCH64)/libseslog.so.1 -file path=usr/lib/fm/$(ARCH64)/libtopo.so.1 \ +file path=usr/lib/fm/$(ARCH32)/libseslog.so.1 +file path=usr/lib/fm/$(ARCH32)/libtopo.so.1 \ variant.opensolaris.zone=__NODEFAULT # # Dictionaries, whether they are hardware-specific or not, are @@ -302,27 +302,27 @@ file path=usr/lib/fm/fmd/plugins/zfs-retire.so mode=0555 # # fmri scheme support: all are common to both global and non-global zones # -file path=usr/lib/fm/fmd/schemes/$(ARCH64)/cpu.so mode=0555 \ +file path=usr/lib/fm/fmd/schemes/$(ARCH32)/cpu.so mode=0555 \ variant.opensolaris.zone=__NODEFAULT -file path=usr/lib/fm/fmd/schemes/$(ARCH64)/dev.so mode=0555 \ +file path=usr/lib/fm/fmd/schemes/$(ARCH32)/dev.so mode=0555 \ variant.opensolaris.zone=__NODEFAULT -file path=usr/lib/fm/fmd/schemes/$(ARCH64)/fmd.so mode=0555 \ +file path=usr/lib/fm/fmd/schemes/$(ARCH32)/fmd.so mode=0555 \ variant.opensolaris.zone=__NODEFAULT -file path=usr/lib/fm/fmd/schemes/$(ARCH64)/hc.so mode=0555 \ +file path=usr/lib/fm/fmd/schemes/$(ARCH32)/hc.so mode=0555 \ variant.opensolaris.zone=__NODEFAULT -file path=usr/lib/fm/fmd/schemes/$(ARCH64)/legacy-hc.so mode=0555 \ +file path=usr/lib/fm/fmd/schemes/$(ARCH32)/legacy-hc.so mode=0555 \ variant.opensolaris.zone=__NODEFAULT -file path=usr/lib/fm/fmd/schemes/$(ARCH64)/mem.so mode=0555 \ +file path=usr/lib/fm/fmd/schemes/$(ARCH32)/mem.so mode=0555 \ variant.opensolaris.zone=__NODEFAULT -file path=usr/lib/fm/fmd/schemes/$(ARCH64)/mod.so mode=0555 \ +file path=usr/lib/fm/fmd/schemes/$(ARCH32)/mod.so mode=0555 \ variant.opensolaris.zone=__NODEFAULT -file path=usr/lib/fm/fmd/schemes/$(ARCH64)/pkg.so mode=0555 \ +file path=usr/lib/fm/fmd/schemes/$(ARCH32)/pkg.so mode=0555 \ variant.opensolaris.zone=__NODEFAULT -file path=usr/lib/fm/fmd/schemes/$(ARCH64)/svc.so mode=0555 \ +file path=usr/lib/fm/fmd/schemes/$(ARCH32)/svc.so mode=0555 \ variant.opensolaris.zone=__NODEFAULT -file path=usr/lib/fm/fmd/schemes/$(ARCH64)/sw.so mode=0555 \ +file path=usr/lib/fm/fmd/schemes/$(ARCH32)/sw.so mode=0555 \ variant.opensolaris.zone=__NODEFAULT -file path=usr/lib/fm/fmd/schemes/$(ARCH64)/zfs.so mode=0555 \ +file path=usr/lib/fm/fmd/schemes/$(ARCH32)/zfs.so mode=0555 \ variant.opensolaris.zone=__NODEFAULT file path=usr/lib/fm/fmd/schemes/cpu.so mode=0555 \ variant.opensolaris.zone=__NODEFAULT @@ -474,39 +474,39 @@ license lic_CDDL license=lic_CDDL # # libraries .so symlinks in lib # -link path=lib/fm/$(ARCH64)/libfmevent.so target=./libfmevent.so.1 \ +link path=lib/fm/$(ARCH32)/libfmevent.so target=./libfmevent.so.1 \ variant.opensolaris.zone=__NODEFAULT link path=lib/fm/libfmevent.so target=libfmevent.so.1 \ variant.opensolaris.zone=__NODEFAULT # -# 64-bit .so symlinks +# 32-bit .so symlinks # -link path=usr/lib/fm/$(ARCH64)/libdiagcode.so target=./libdiagcode.so.1 \ +link path=usr/lib/fm/$(ARCH32)/libdiagcode.so target=./libdiagcode.so.1 \ variant.opensolaris.zone=__NODEFAULT -link path=usr/lib/fm/$(ARCH64)/libdiskstatus.so target=./libdiskstatus.so.1 \ +link path=usr/lib/fm/$(ARCH32)/libdiskstatus.so target=./libdiskstatus.so.1 \ variant.opensolaris.zone=__NODEFAULT -link path=usr/lib/fm/$(ARCH64)/libfmd_adm.so target=./libfmd_adm.so.1 \ +link path=usr/lib/fm/$(ARCH32)/libfmd_adm.so target=./libfmd_adm.so.1 \ variant.opensolaris.zone=__NODEFAULT -link path=usr/lib/fm/$(ARCH64)/libfmd_agent.so target=./libfmd_agent.so.1 \ +link path=usr/lib/fm/$(ARCH32)/libfmd_agent.so target=./libfmd_agent.so.1 \ variant.opensolaris.zone=__NODEFAULT -link path=usr/lib/fm/$(ARCH64)/libfmd_log.so target=./libfmd_log.so.1 \ +link path=usr/lib/fm/$(ARCH32)/libfmd_log.so target=./libfmd_log.so.1 \ variant.opensolaris.zone=__NODEFAULT -link path=usr/lib/fm/$(ARCH64)/libfmd_msg.so target=./libfmd_msg.so.1 \ +link path=usr/lib/fm/$(ARCH32)/libfmd_msg.so target=./libfmd_msg.so.1 \ variant.opensolaris.zone=__NODEFAULT -link path=usr/lib/fm/$(ARCH64)/libfmevent.so \ - target=../../../../lib/fm/$(ARCH64)/libfmevent.so.1 \ +link path=usr/lib/fm/$(ARCH32)/libfmevent.so \ + target=../../../../lib/fm/$(ARCH32)/libfmevent.so.1 \ variant.opensolaris.zone=__NODEFAULT -link path=usr/lib/fm/$(ARCH64)/libfmevent.so.1 \ - target=../../../../lib/fm/$(ARCH64)/libfmevent.so.1 \ +link path=usr/lib/fm/$(ARCH32)/libfmevent.so.1 \ + target=../../../../lib/fm/$(ARCH32)/libfmevent.so.1 \ variant.opensolaris.zone=__NODEFAULT -link path=usr/lib/fm/$(ARCH64)/libfmnotify.so target=./libfmnotify.so.1 \ +link path=usr/lib/fm/$(ARCH32)/libfmnotify.so target=./libfmnotify.so.1 \ variant.opensolaris.zone=__NODEFAULT -link path=usr/lib/fm/$(ARCH64)/libseslog.so target=./libseslog.so.1 -link path=usr/lib/fm/$(ARCH64)/libtopo.so target=libtopo.so.1 \ +link path=usr/lib/fm/$(ARCH32)/libseslog.so target=./libseslog.so.1 +link path=usr/lib/fm/$(ARCH32)/libtopo.so target=libtopo.so.1 \ variant.opensolaris.zone=__NODEFAULT # -# 32-bit .so symlinks +# 64-bit .so symlinks # link path=usr/lib/fm/libdiagcode.so target=libdiagcode.so.1 \ variant.opensolaris.zone=__NODEFAULT diff --git a/usr/src/pkg/manifests/service-file-system-smb.inc b/usr/src/pkg/manifests/service-file-system-smb.inc index 2495a0d605..551cb7ecc5 100644 --- a/usr/src/pkg/manifests/service-file-system-smb.inc +++ b/usr/src/pkg/manifests/service-file-system-smb.inc @@ -37,7 +37,7 @@ dir path=usr/kernel/kmdb group=sys dir path=usr/lib dir path=usr/lib/fs group=sys dir path=usr/lib/fs/smb group=sys -dir path=usr/lib/fs/smb/$(ARCH64) group=sys +dir path=usr/lib/fs/smb/$(ARCH32) group=sys dir path=usr/lib/mdb group=sys dir path=usr/lib/mdb/kvm group=sys dir path=usr/lib/mdb/kvm/$(ARCH64) group=sys diff --git a/usr/src/pkg/manifests/service-hal.mf b/usr/src/pkg/manifests/service-hal.mf index 794a7db62c..2355730204 100644 --- a/usr/src/pkg/manifests/service-hal.mf +++ b/usr/src/pkg/manifests/service-hal.mf @@ -57,8 +57,8 @@ dir path=lib/svc/manifest/system group=sys variant.opensolaris.zone=global dir path=lib/svc/method variant.opensolaris.zone=global dir path=usr group=sys dir path=usr/lib -dir path=usr/lib/$(ARCH64) -dir path=usr/lib/$(ARCH64)/pkgconfig group=other +dir path=usr/lib/$(ARCH32) +dir path=usr/lib/$(ARCH32)/pkgconfig group=other dir path=usr/lib/hal dir path=usr/lib/hal/illumos dir path=usr/lib/pkgconfig group=other @@ -111,10 +111,10 @@ file path=etc/hal/fdi/preprobe/10osvendor/20-printers.fdi mode=0444 \ file path=lib/svc/manifest/system/hal.xml group=sys mode=0444 \ variant.opensolaris.zone=global file path=lib/svc/method/svc-hal mode=0555 variant.opensolaris.zone=global -file path=usr/lib/$(ARCH64)/libhal-storage.so.1.0.0 -file path=usr/lib/$(ARCH64)/libhal.so.1.0.0 -file path=usr/lib/$(ARCH64)/pkgconfig/hal-storage.pc -file path=usr/lib/$(ARCH64)/pkgconfig/hal.pc +file path=usr/lib/$(ARCH32)/libhal-storage.so.1.0.0 +file path=usr/lib/$(ARCH32)/libhal.so.1.0.0 +file path=usr/lib/$(ARCH32)/pkgconfig/hal-storage.pc +file path=usr/lib/$(ARCH32)/pkgconfig/hal.pc file path=usr/lib/hal/hal-functions mode=0555 file path=usr/lib/hal/hal-is-caller-privileged mode=0555 file path=usr/lib/hal/hal-storage-cleanup-all-mountpoints mode=0555 @@ -169,11 +169,11 @@ file path=usr/share/man/man8/hald.8 license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL license usr/src/cmd/hal/LICENSE license=usr/src/cmd/hal/LICENSE -link path=usr/lib/$(ARCH64)/libhal-storage.so target=./libhal-storage.so.1.0.0 -link path=usr/lib/$(ARCH64)/libhal-storage.so.1 \ +link path=usr/lib/$(ARCH32)/libhal-storage.so target=./libhal-storage.so.1.0.0 +link path=usr/lib/$(ARCH32)/libhal-storage.so.1 \ target=./libhal-storage.so.1.0.0 -link path=usr/lib/$(ARCH64)/libhal.so target=./libhal.so.1.0.0 -link path=usr/lib/$(ARCH64)/libhal.so.1 target=./libhal.so.1.0.0 +link path=usr/lib/$(ARCH32)/libhal.so target=./libhal.so.1.0.0 +link path=usr/lib/$(ARCH32)/libhal.so.1 target=./libhal.so.1.0.0 link path=usr/lib/libhal-storage.so target=./libhal-storage.so.1.0.0 link path=usr/lib/libhal-storage.so.1 target=./libhal-storage.so.1.0.0 link path=usr/lib/libhal.so target=./libhal.so.1.0.0 diff --git a/usr/src/pkg/manifests/service-network-dns-mdns.mf b/usr/src/pkg/manifests/service-network-dns-mdns.mf index dd26a6538b..9fcb282acf 100644 --- a/usr/src/pkg/manifests/service-network-dns-mdns.mf +++ b/usr/src/pkg/manifests/service-network-dns-mdns.mf @@ -41,7 +41,7 @@ dir path=usr group=sys dir path=usr/bin dir path=usr/include dir path=usr/lib -dir path=usr/lib/$(ARCH64) +dir path=usr/lib/$(ARCH32) dir path=usr/lib/inet dir path=usr/share dir path=usr/share/man @@ -51,8 +51,8 @@ dir path=usr/share/man/man8 file path=lib/svc/manifest/network/dns/multicast.xml group=sys mode=0444 file path=usr/bin/dns-sd mode=0555 file path=usr/include/dns_sd.h -file path=usr/lib/$(ARCH64)/libdns_sd.so.1 -file path=usr/lib/$(ARCH64)/nss_mdns.so.1 +file path=usr/lib/$(ARCH32)/libdns_sd.so.1 +file path=usr/lib/$(ARCH32)/nss_mdns.so.1 file path=usr/lib/inet/mdnsd mode=0555 file path=usr/lib/libdns_sd.so.1 file path=usr/lib/nss_mdns.so.1 @@ -75,5 +75,5 @@ license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL license usr/src/contrib/mDNSResponder/LICENSE \ license=usr/src/contrib/mDNSResponder/LICENSE -link path=usr/lib/$(ARCH64)/libdns_sd.so target=libdns_sd.so.1 +link path=usr/lib/$(ARCH32)/libdns_sd.so target=libdns_sd.so.1 link path=usr/lib/libdns_sd.so target=libdns_sd.so.1 diff --git a/usr/src/pkg/manifests/service-network-load-balancer-ilb.mf b/usr/src/pkg/manifests/service-network-load-balancer-ilb.mf index b47cba34a0..489afdd4df 100644 --- a/usr/src/pkg/manifests/service-network-load-balancer-ilb.mf +++ b/usr/src/pkg/manifests/service-network-load-balancer-ilb.mf @@ -37,18 +37,18 @@ dir path=lib/svc/manifest/network/loadbalancer group=sys dir path=usr group=sys dir path=usr/include dir path=usr/lib -dir path=usr/lib/$(ARCH64) +dir path=usr/lib/$(ARCH32) dir path=usr/lib/inet dir path=usr/lib/inet/ilb dir path=usr/sbin file path=lib/svc/manifest/network/loadbalancer/ilbd.xml group=sys mode=0444 file path=usr/include/libilb.h -file path=usr/lib/$(ARCH64)/libilb.so.1 +file path=usr/lib/$(ARCH32)/libilb.so.1 file path=usr/lib/inet/ilb/ilb_probe mode=0555 file path=usr/lib/inet/ilbd mode=0555 file path=usr/lib/libilb.so.1 file path=usr/sbin/ilbadm mode=0555 license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL -link path=usr/lib/$(ARCH64)/libilb.so target=./libilb.so.1 +link path=usr/lib/$(ARCH32)/libilb.so target=./libilb.so.1 link path=usr/lib/libilb.so target=./libilb.so.1 diff --git a/usr/src/pkg/manifests/service-resource-pools.inc b/usr/src/pkg/manifests/service-resource-pools.inc index 625cd9b2b3..778625163a 100644 --- a/usr/src/pkg/manifests/service-resource-pools.inc +++ b/usr/src/pkg/manifests/service-resource-pools.inc @@ -35,7 +35,7 @@ dir path=usr/include dir path=usr/kernel group=sys dir path=usr/kernel/drv group=sys dir path=usr/lib -dir path=usr/lib/$(ARCH64) +dir path=usr/lib/$(ARCH32) dir path=usr/lib/rcm dir path=usr/lib/rcm/modules dir path=usr/sbin @@ -58,7 +58,7 @@ file path=usr/bin/poolstat mode=0555 file path=usr/include/pool.h file path=usr/kernel/drv/pool group=sys file path=usr/kernel/drv/pool.conf group=sys -file path=usr/lib/$(ARCH64)/libpool.so.1 +file path=usr/lib/$(ARCH32)/libpool.so.1 file path=usr/lib/libpool.so.1 file path=usr/lib/rcm/modules/SUNW_pool_rcm.so mode=0555 file path=usr/sbin/pooladm mode=0555 @@ -84,5 +84,5 @@ file path=usr/share/man/man3pool/pool_value_alloc.3pool file path=usr/share/man/man3pool/pool_walk_components.3pool license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL -link path=usr/lib/$(ARCH64)/libpool.so target=libpool.so.1 +link path=usr/lib/$(ARCH32)/libpool.so target=libpool.so.1 link path=usr/lib/libpool.so target=./libpool.so.1 diff --git a/usr/src/pkg/manifests/service-security-kerberos-5.inc b/usr/src/pkg/manifests/service-security-kerberos-5.inc index c31bc7c6c0..e5947235ac 100644 --- a/usr/src/pkg/manifests/service-security-kerberos-5.inc +++ b/usr/src/pkg/manifests/service-security-kerberos-5.inc @@ -33,15 +33,15 @@ 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 +dir path=usr/lib/$(ARCH32) +dir path=usr/lib/$(ARCH32)/gss dir path=usr/lib/gss dir path=usr/lib/krb5 -dir path=usr/lib/krb5/$(ARCH64) +dir path=usr/lib/krb5/$(ARCH32) dir path=usr/lib/krb5/plugins dir path=usr/lib/krb5/plugins/preauth dir path=usr/lib/security -dir path=usr/lib/security/$(ARCH64) +dir path=usr/lib/security/$(ARCH32) dir path=usr/share/man dir path=usr/share/man/man1 dir path=usr/share/man/man8 @@ -62,8 +62,8 @@ 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 +file path=usr/lib/$(ARCH32)/gss/mech_krb5.so.1 +file path=usr/lib/$(ARCH32)/libkrb5.so.1 file path=usr/lib/gss/mech_krb5.so.1 file path=usr/lib/krb5/$(ARCH64)/libkadm5clnt.so.1 file path=usr/lib/krb5/ktkt_warnd mode=0555 @@ -89,8 +89,8 @@ 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 +link path=usr/lib/$(ARCH32)/gss/mech_krb5.so target=./mech_krb5.so.1 +link path=usr/lib/$(ARCH32)/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 link path=usr/lib/krb5/libkadm5clnt.so target=./libkadm5clnt.so.1 diff --git a/usr/src/pkg/manifests/service-storage-ndmp.mf b/usr/src/pkg/manifests/service-storage-ndmp.mf index f4779f057d..cf34af22e6 100644 --- a/usr/src/pkg/manifests/service-storage-ndmp.mf +++ b/usr/src/pkg/manifests/service-storage-ndmp.mf @@ -44,7 +44,7 @@ dir path=lib/svc/method dir path=usr group=sys dir path=usr/include dir path=usr/lib -dir path=usr/lib/$(ARCH64) +dir path=usr/lib/$(ARCH32) dir path=usr/lib/ndmp dir path=usr/sbin dir path=usr/share/man @@ -53,7 +53,7 @@ dir path=usr/share/man/man8 file path=lib/svc/manifest/system/ndmp.xml group=sys mode=0444 file path=lib/svc/method/svc-ndmp mode=0555 file path=usr/include/libndmp.h -file path=usr/lib/$(ARCH64)/libndmp.so.1 +file path=usr/lib/$(ARCH32)/libndmp.so.1 file path=usr/lib/libndmp.so.1 file path=usr/lib/ndmp/ndmpd mode=0555 file path=usr/sbin/ndmpadm mode=0555 @@ -64,5 +64,5 @@ file path=usr/share/man/man8/ndmpd.8 file path=usr/share/man/man8/ndmpstat.8 license cr_Sun license=cr_Sun license usr/src/cmd/ndmpd/LICENSE license=usr/src/cmd/ndmpd/LICENSE -link path=usr/lib/$(ARCH64)/libndmp.so target=libndmp.so.1 +link path=usr/lib/$(ARCH32)/libndmp.so target=libndmp.so.1 link path=usr/lib/libndmp.so target=libndmp.so.1 diff --git a/usr/src/pkg/manifests/service-storage-removable-media.mf b/usr/src/pkg/manifests/service-storage-removable-media.mf index c17f9ead2a..8e7de63cbc 100644 --- a/usr/src/pkg/manifests/service-storage-removable-media.mf +++ b/usr/src/pkg/manifests/service-storage-removable-media.mf @@ -37,16 +37,16 @@ dir path=lib/svc/manifest/network group=sys dir path=lib/svc/manifest/network/rpc group=sys dir path=usr group=sys dir path=usr/lib -dir path=usr/lib/$(ARCH64) +dir path=usr/lib/$(ARCH32) dir path=usr/lib/smedia -dir path=usr/lib/smedia/$(ARCH64) +dir path=usr/lib/smedia/$(ARCH32) dir path=usr/share/man/man8 file path=lib/svc/manifest/network/rpc/smserver.xml group=sys mode=0444 -file path=usr/lib/$(ARCH64)/libsmedia.so.1 +file path=usr/lib/$(ARCH32)/libsmedia.so.1 file path=usr/lib/libsmedia.so.1 -file path=usr/lib/smedia/$(ARCH64)/sm_blkdev.so.1 mode=0555 -file path=usr/lib/smedia/$(ARCH64)/sm_fd.so.1 mode=0555 -file path=usr/lib/smedia/$(ARCH64)/sm_scsi.so.1 mode=0555 +file path=usr/lib/smedia/$(ARCH32)/sm_blkdev.so.1 mode=0555 +file path=usr/lib/smedia/$(ARCH32)/sm_fd.so.1 mode=0555 +file path=usr/lib/smedia/$(ARCH32)/sm_scsi.so.1 mode=0555 file path=usr/lib/smedia/rpc.smserverd mode=0555 file path=usr/lib/smedia/sm_blkdev.so.1 mode=0555 file path=usr/lib/smedia/sm_fd.so.1 mode=0555 @@ -54,5 +54,5 @@ file path=usr/lib/smedia/sm_scsi.so.1 mode=0555 file path=usr/share/man/man8/rpc.smserverd.8 license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL -link path=usr/lib/$(ARCH64)/libsmedia.so target=./libsmedia.so.1 +link path=usr/lib/$(ARCH32)/libsmedia.so target=./libsmedia.so.1 link path=usr/lib/libsmedia.so target=./libsmedia.so.1 diff --git a/usr/src/pkg/manifests/storage-stmf.mf b/usr/src/pkg/manifests/storage-stmf.mf index edf414ec25..ec90b71bda 100644 --- a/usr/src/pkg/manifests/storage-stmf.mf +++ b/usr/src/pkg/manifests/storage-stmf.mf @@ -43,7 +43,7 @@ dir path=usr group=sys dir path=usr/include dir path=usr/include/sys dir path=usr/lib -dir path=usr/lib/$(ARCH64) +dir path=usr/lib/$(ARCH32) dir path=usr/lib/mdb group=sys dir path=usr/lib/mdb/kvm group=sys dir path=usr/lib/mdb/kvm/$(ARCH64) group=sys @@ -81,7 +81,7 @@ file path=usr/include/sys/portif.h file path=usr/include/sys/stmf.h file path=usr/include/sys/stmf_defines.h file path=usr/include/sys/stmf_ioctl.h -file path=usr/lib/$(ARCH64)/libstmf.so.1 +file path=usr/lib/$(ARCH32)/libstmf.so.1 file path=usr/lib/libstmf.so.1 file path=usr/lib/mdb/kvm/$(ARCH64)/stmf.so group=sys mode=0555 file path=usr/lib/mdb/kvm/$(ARCH64)/stmf_sbd.so group=sys mode=0555 @@ -133,5 +133,5 @@ file path=usr/share/man/man8/sbdadm.8 file path=usr/share/man/man8/stmfadm.8 license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL -link path=usr/lib/$(ARCH64)/libstmf.so target=libstmf.so.1 +link path=usr/lib/$(ARCH32)/libstmf.so target=libstmf.so.1 link path=usr/lib/libstmf.so target=libstmf.so.1 diff --git a/usr/src/pkg/manifests/system-core-os.mf b/usr/src/pkg/manifests/system-core-os.mf index 7de908dab6..dff00b46e1 100644 --- a/usr/src/pkg/manifests/system-core-os.mf +++ b/usr/src/pkg/manifests/system-core-os.mf @@ -751,7 +751,7 @@ file path=usr/bin/wracct mode=0555 file path=usr/bin/write group=tty mode=2555 file path=usr/bin/xargs mode=0555 file path=usr/bin/xstr mode=0555 -file path=usr/lib/$(ARCH64)/libshare.so.1 +file path=usr/lib/$(ARCH32)/libshare.so.1 file path=usr/lib/class/FX/FXdispadmin mode=0555 file path=usr/lib/class/FX/FXpriocntl mode=0555 file path=usr/lib/class/IA/IAdispadmin mode=0555 @@ -1305,7 +1305,7 @@ link path=etc/ftpusers target=./ftpd/ftpusers link path=etc/hosts target=./inet/hosts link path=etc/inet/ipnodes target=./hosts link path=etc/inetd.conf target=./inet/inetd.conf -link path=etc/lib/ld.so.1 target=../../lib/ld.so.1 +link path=etc/lib/ld.so.1 target=../../usr/libexec/ld.so link path=etc/lib/libdl.so.1 target=../../lib/libdl.so.1 link path=etc/lib/nss_files.so.1 target=../../lib/nss_files.so.1 link path=etc/netmasks target=./inet/netmasks @@ -1326,14 +1326,14 @@ link path=usr/bin/strclean target=../sbin/strclean link path=usr/bin/strerr target=../sbin/strerr link path=usr/bin/sync target=../../sbin/sync link path=usr/bin/tar target=../sbin/tar -link path=usr/lib/$(ARCH64)/ld.so.1 target=../../../lib/$(ARCH64)/ld.so.1 +link path=usr/lib/$(ARCH64)/ld.so.1 target=../../libexec/ld.so link path=usr/lib/cron target=../../etc/cron.d link path=usr/lib/devfsadm/devfsadmd target=../../sbin/devfsadm link path=usr/lib/fs/dev/mount target=../../../../etc/fs/dev/mount link path=usr/lib/fs/hsfs/mount target=../../../../etc/fs/hsfs/mount link path=usr/lib/fs/ufs/mount target=../../../../etc/fs/ufs/mount link path=usr/lib/inet/in.mpathd target=../../../lib/inet/in.mpathd -link path=usr/lib/ld.so.1 target=../../lib/ld.so.1 +link path=usr/lib/ld.so.1 target=../libexec/$(ARCH32)/ld.so link path=usr/lib/secure/32 target=$(ARCH32) link path=usr/lib/secure/64 target=$(ARCH64) link path=usr/mail target=../var/mail diff --git a/usr/src/pkg/manifests/system-extended-system-utilities.mf b/usr/src/pkg/manifests/system-extended-system-utilities.mf index 7bf63cc218..341123f482 100644 --- a/usr/src/pkg/manifests/system-extended-system-utilities.mf +++ b/usr/src/pkg/manifests/system-extended-system-utilities.mf @@ -36,7 +36,7 @@ dir path=usr/bin dir path=usr/bin/$(ARCH32) dir path=usr/bin/$(ARCH64) dir path=usr/lib -dir path=usr/lib/$(ARCH64) +dir path=usr/lib/$(ARCH32) dir path=usr/lib/fs group=sys dir path=usr/lib/fs/pcfs group=sys dir path=usr/lib/spell @@ -132,8 +132,8 @@ file path=usr/bin/unpack mode=0555 file path=usr/bin/uudecode group=uucp mode=0555 file path=usr/bin/uuencode group=uucp mode=0555 file path=usr/bin/yes mode=0555 -file path=usr/lib/$(ARCH64)/madv.so.1 -file path=usr/lib/$(ARCH64)/mpss.so.1 +file path=usr/lib/$(ARCH32)/madv.so.1 +file path=usr/lib/$(ARCH32)/mpss.so.1 file path=usr/lib/diff3prog mode=0555 file path=usr/lib/fs/pcfs/fsck mode=0555 file path=usr/lib/fs/pcfs/fstyp.so.1 mode=0555 diff --git a/usr/src/pkg/manifests/system-ficl.inc b/usr/src/pkg/manifests/system-ficl.inc index dfe3cf121d..2e5ab1fb87 100644 --- a/usr/src/pkg/manifests/system-ficl.inc +++ b/usr/src/pkg/manifests/system-ficl.inc @@ -21,12 +21,12 @@ dir path=usr group=sys dir path=usr/bin group=bin dir path=usr/bin/$(ARCH32) group=bin -dir path=usr/bin/$(ARCH64) group=bin +dir path=usr/bin/$(ARCH32) group=bin dir path=usr/lib group=bin -dir path=usr/lib/$(ARCH64) group=bin +dir path=usr/lib/$(ARCH32) group=bin file path=usr/bin/$(ARCH32)/ficl-sys group=sys mode=0555 file path=usr/bin/$(ARCH64)/ficl-sys group=sys mode=0555 -file path=usr/lib/$(ARCH64)/libficl-sys.so.4.1.0 group=sys mode=0755 +file path=usr/lib/$(ARCH32)/libficl-sys.so.4.1.0 group=sys mode=0755 file path=usr/lib/libficl-sys.so.4.1.0 group=sys mode=0755 hardlink path=usr/bin/ficl-sys target=../../usr/lib/isaexec license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/system-file-system-smb.inc b/usr/src/pkg/manifests/system-file-system-smb.inc index 40fd9daed5..79ee066733 100644 --- a/usr/src/pkg/manifests/system-file-system-smb.inc +++ b/usr/src/pkg/manifests/system-file-system-smb.inc @@ -37,10 +37,10 @@ dir path=usr/kernel/drv group=sys dir path=usr/kernel/fs group=sys dir path=usr/kernel/kmdb group=sys dir path=usr/lib -dir path=usr/lib/$(ARCH64) +dir path=usr/lib/$(ARCH32) dir path=usr/lib/fs group=sys dir path=usr/lib/fs/smbfs group=sys -dir path=usr/lib/fs/smbfs/$(ARCH64) group=sys +dir path=usr/lib/fs/smbfs/$(ARCH32) group=sys dir path=usr/lib/mdb group=sys dir path=usr/lib/mdb/kvm group=sys dir path=usr/lib/mdb/kvm/$(ARCH64) group=sys @@ -62,7 +62,7 @@ file path=usr/kernel/drv/nsmb.conf group=sys file path=usr/kernel/fs/smbfs group=sys mode=0755 file path=usr/kernel/kmdb/nsmb group=sys mode=0555 file path=usr/kernel/kmdb/smbfs group=sys mode=0555 -file path=usr/lib/$(ARCH64)/libsmbfs.so.1 +file path=usr/lib/$(ARCH32)/libsmbfs.so.1 file path=usr/lib/fs/smbfs/$(ARCH64)/libshare_smbfs.so.1 file path=usr/lib/fs/smbfs/dfshares mode=0555 file path=usr/lib/fs/smbfs/libshare_smbfs.so.1 @@ -94,6 +94,6 @@ license usr/src/lib/libsmbfs/smb/THIRDPARTYLICENSE.bsd4 \ license=usr/src/lib/libsmbfs/smb/THIRDPARTYLICENSE.bsd4 license usr/src/lib/libsmbfs/smb/THIRDPARTYLICENSE.microsoft \ license=usr/src/lib/libsmbfs/smb/THIRDPARTYLICENSE.microsoft -link path=usr/lib/security/$(ARCH64)/pam_smbfs_login.so \ +link path=usr/lib/security/$(ARCH32)/pam_smbfs_login.so \ target=pam_smbfs_login.so.1 link path=usr/lib/security/pam_smbfs_login.so target=pam_smbfs_login.so.1 diff --git a/usr/src/pkg/manifests/system-file-system-zfs.inc b/usr/src/pkg/manifests/system-file-system-zfs.inc index e32bc32bfc..3b92d1726b 100644 --- a/usr/src/pkg/manifests/system-file-system-zfs.inc +++ b/usr/src/pkg/manifests/system-file-system-zfs.inc @@ -40,11 +40,11 @@ dir path=kernel/drv group=sys dir path=kernel/fs group=sys dir path=kernel/kmdb group=sys dir path=lib -dir path=lib/$(ARCH64) +dir path=lib/$(ARCH32) dir path=sbin group=sys dir path=usr group=sys dir path=usr/lib -dir path=usr/lib/$(ARCH64) +dir path=usr/lib/$(ARCH32) dir path=usr/lib/devfsadm group=sys dir path=usr/lib/devfsadm/linkmod group=sys dir path=usr/lib/fs group=sys @@ -53,13 +53,13 @@ dir path=usr/lib/mdb group=sys dir path=usr/lib/mdb/kvm group=sys dir path=usr/lib/mdb/kvm/$(ARCH64) group=sys dir path=usr/lib/mdb/proc group=sys -dir path=usr/lib/mdb/proc/$(ARCH64) +dir path=usr/lib/mdb/proc/$(ARCH32) dir path=usr/lib/sysevent dir path=usr/lib/sysevent/modules dir path=usr/lib/zfs dir path=usr/sbin dir path=usr/sbin/$(ARCH32) -dir path=usr/sbin/$(ARCH64) +dir path=usr/sbin/$(ARCH32) dir path=usr/share/man/man8 driver name=zfs perms="* 0600 root sys" perms="zfs 0666 root sys" file \ @@ -68,13 +68,13 @@ file \ file path=kernel/drv/zfs group=sys file path=kernel/drv/zfs.conf group=sys file path=kernel/kmdb/zfs group=sys mode=0555 -file path=lib/$(ARCH64)/libzfs.so.1 -file path=lib/$(ARCH64)/libzfs_core.so.1 +file path=lib/$(ARCH32)/libzfs.so.1 +file path=lib/$(ARCH32)/libzfs_core.so.1 file path=lib/libzfs.so.1 file path=lib/libzfs_core.so.1 file path=sbin/zfs mode=0555 file path=sbin/zpool mode=0555 -file path=usr/lib/$(ARCH64)/libzpool.so.1 +file path=usr/lib/$(ARCH32)/libzpool.so.1 file path=usr/lib/devfsadm/linkmod/SUNW_zfs_link.so group=sys file path=usr/lib/fs/zfs/bootinstall mode=0555 file path=usr/lib/fs/zfs/fstyp.so.1 mode=0555 @@ -103,19 +103,19 @@ license kernel/fs/zfs/THIRDPARTYLICENSE.lz4 \ license lic_CDDL license=lic_CDDL link path=etc/fs/zfs/mount target=../../../sbin/zfs link path=etc/fs/zfs/umount target=../../../sbin/zfs -link path=lib/$(ARCH64)/libzfs.so target=libzfs.so.1 -link path=lib/$(ARCH64)/libzfs_core.so target=libzfs_core.so.1 +link path=lib/$(ARCH32)/libzfs.so target=libzfs.so.1 +link path=lib/$(ARCH32)/libzfs_core.so target=libzfs_core.so.1 link path=lib/libzfs.so target=libzfs.so.1 link path=lib/libzfs_core.so target=libzfs_core.so.1 -link path=usr/lib/$(ARCH64)/libzfs.so \ - target=../../../lib/$(ARCH64)/libzfs.so.1 -link path=usr/lib/$(ARCH64)/libzfs.so.1 \ - target=../../../lib/$(ARCH64)/libzfs.so.1 -link path=usr/lib/$(ARCH64)/libzfs_core.so \ - target=../../../lib/$(ARCH64)/libzfs_core.so.1 -link path=usr/lib/$(ARCH64)/libzfs_core.so.1 \ - target=../../../lib/$(ARCH64)/libzfs_core.so.1 -link path=usr/lib/$(ARCH64)/libzpool.so target=libzpool.so.1 +link path=usr/lib/$(ARCH32)/libzfs.so \ + target=../../../lib/$(ARCH32)/libzfs.so.1 +link path=usr/lib/$(ARCH32)/libzfs.so.1 \ + target=../../../lib/$(ARCH32)/libzfs.so.1 +link path=usr/lib/$(ARCH32)/libzfs_core.so \ + target=../../../lib/$(ARCH32)/libzfs_core.so.1 +link path=usr/lib/$(ARCH32)/libzfs_core.so.1 \ + target=../../../lib/$(ARCH32)/libzfs_core.so.1 +link path=usr/lib/$(ARCH32)/libzpool.so target=libzpool.so.1 link path=usr/lib/fs/zfs/mount target=../../../../sbin/zfs link path=usr/lib/fs/zfs/umount target=../../../../sbin/zfs link path=usr/lib/libzfs.so target=../../lib/libzfs.so.1 diff --git a/usr/src/pkg/manifests/system-kernel-dynamic-reconfiguration-i86pc.inc b/usr/src/pkg/manifests/system-kernel-dynamic-reconfiguration-i86pc.inc index 3f549d4d28..85b5a4fa58 100644 --- a/usr/src/pkg/manifests/system-kernel-dynamic-reconfiguration-i86pc.inc +++ b/usr/src/pkg/manifests/system-kernel-dynamic-reconfiguration-i86pc.inc @@ -41,7 +41,7 @@ dir path=usr group=sys dir path=usr/platform group=sys dir path=usr/platform/lib dir path=usr/platform/lib/cfgadm -dir path=usr/platform/lib/cfgadm/$(ARCH64) +dir path=usr/platform/lib/cfgadm/$(ARCH32) driver name=dr alias=acpidr_sbd file path=lib/svc/manifest/platform/acpihpd.xml group=sys mode=0444 file path=lib/svc/method/svc-acpihpd mode=0555 diff --git a/usr/src/pkg/manifests/system-kernel-platform.inc b/usr/src/pkg/manifests/system-kernel-platform.inc index 50af4e61b9..95e97d50e0 100644 --- a/usr/src/pkg/manifests/system-kernel-platform.inc +++ b/usr/src/pkg/manifests/system-kernel-platform.inc @@ -31,7 +31,7 @@ # information about overriding the defaults. # dir path=platform group=sys -dir path=platform/$(ARCH64) group=sys +dir path=platform/$(ARCH32) group=sys dir path=platform/kernel group=sys dir path=platform/kernel/cpu group=sys dir path=platform/kernel/dacf group=sys diff --git a/usr/src/pkg/manifests/system-library-c-runtime.mf b/usr/src/pkg/manifests/system-library-c-runtime.mf index 8e9b19ab04..f05e9f1c86 100644 --- a/usr/src/pkg/manifests/system-library-c-runtime.mf +++ b/usr/src/pkg/manifests/system-library-c-runtime.mf @@ -15,15 +15,15 @@ set name=pkg.description value="C runtime objects" set name=pkg.summary value="C Runtime" set name=info.classification value=org.opensolaris.category.2008:Development/C set name=variant.arch value=$(ARCH) -file path=usr/lib/$(ARCH64)/crt1.o -file path=usr/lib/$(ARCH64)/crti.o -file path=usr/lib/$(ARCH64)/crtn.o -file path=usr/lib/$(ARCH64)/values-Xa.o -file path=usr/lib/$(ARCH64)/values-Xc.o -file path=usr/lib/$(ARCH64)/values-Xs.o -file path=usr/lib/$(ARCH64)/values-Xt.o -file path=usr/lib/$(ARCH64)/values-xpg4.o -file path=usr/lib/$(ARCH64)/values-xpg6.o +file path=usr/lib/$(ARCH32)/crt1.o +file path=usr/lib/$(ARCH32)/crti.o +file path=usr/lib/$(ARCH32)/crtn.o +file path=usr/lib/$(ARCH32)/values-Xa.o +file path=usr/lib/$(ARCH32)/values-Xc.o +file path=usr/lib/$(ARCH32)/values-Xs.o +file path=usr/lib/$(ARCH32)/values-Xt.o +file path=usr/lib/$(ARCH32)/values-xpg4.o +file path=usr/lib/$(ARCH32)/values-xpg6.o file path=usr/lib/crt1.o file path=usr/lib/crti.o file path=usr/lib/crtn.o @@ -35,5 +35,5 @@ file path=usr/lib/values-xpg4.o file path=usr/lib/values-xpg6.o license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL -link path=usr/lib/$(ARCH64)/gcrt1.o target=crt1.o +link path=usr/lib/$(ARCH32)/gcrt1.o target=crt1.o link path=usr/lib/gcrt1.o target=crt1.o diff --git a/usr/src/pkg/manifests/system-library-libdiskmgt.inc b/usr/src/pkg/manifests/system-library-libdiskmgt.inc index b85517f280..4c9cce193a 100644 --- a/usr/src/pkg/manifests/system-library-libdiskmgt.inc +++ b/usr/src/pkg/manifests/system-library-libdiskmgt.inc @@ -25,10 +25,10 @@ dir path=usr group=sys dir path=usr/lib -dir path=usr/lib/$(ARCH64) -file path=usr/lib/$(ARCH64)/libdiskmgt.so.1 +dir path=usr/lib/$(ARCH32) +file path=usr/lib/$(ARCH32)/libdiskmgt.so.1 file path=usr/lib/libdiskmgt.so.1 license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL -link path=usr/lib/$(ARCH64)/libdiskmgt.so target=./libdiskmgt.so.1 +link path=usr/lib/$(ARCH32)/libdiskmgt.so target=./libdiskmgt.so.1 link path=usr/lib/libdiskmgt.so target=./libdiskmgt.so.1 diff --git a/usr/src/pkg/manifests/system-library-libfcoe.mf b/usr/src/pkg/manifests/system-library-libfcoe.mf index be15392b39..9491f9f491 100644 --- a/usr/src/pkg/manifests/system-library-libfcoe.mf +++ b/usr/src/pkg/manifests/system-library-libfcoe.mf @@ -33,11 +33,11 @@ set name=variant.arch value=$(ARCH) dir path=usr group=sys dir path=usr/include dir path=usr/lib -dir path=usr/lib/$(ARCH64) +dir path=usr/lib/$(ARCH32) dir path=usr/share/man/man3fcoe dir path=usr/share/man/man3lib file path=usr/include/libfcoe.h -file path=usr/lib/$(ARCH64)/libfcoe.so.1 +file path=usr/lib/$(ARCH32)/libfcoe.so.1 file path=usr/lib/libfcoe.so.1 file path=usr/share/man/man3fcoe/FCOE_CreatePort.3fcoe file path=usr/share/man/man3fcoe/FCOE_DeletePort.3fcoe @@ -45,5 +45,5 @@ file path=usr/share/man/man3fcoe/FCOE_GetPortList.3fcoe file path=usr/share/man/man3lib/libfcoe.3lib license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL -link path=usr/lib/$(ARCH64)/libfcoe.so target=libfcoe.so.1 +link path=usr/lib/$(ARCH32)/libfcoe.so target=libfcoe.so.1 link path=usr/lib/libfcoe.so target=libfcoe.so.1 diff --git a/usr/src/pkg/manifests/system-library-math.inc b/usr/src/pkg/manifests/system-library-math.inc index 6ef9c5ff81..35a2a9ad42 100644 --- a/usr/src/pkg/manifests/system-library-math.inc +++ b/usr/src/pkg/manifests/system-library-math.inc @@ -16,21 +16,21 @@ dir path=lib -dir path=lib/$(ARCH64) -dir path=lib/libmvec +dir path=lib/$(ARCH32) +dir path=lib/$(ARCH32)/libmvec dir path=usr group=sys dir path=usr/include dir path=usr/include/iso dir path=usr/include/sys dir path=usr/lib -dir path=usr/lib/$(ARCH64) +dir path=usr/lib/$(ARCH32) dir path=usr/share/man/man3m dir path=usr/share/man/man3mvec -file path=lib/$(ARCH64)/libm.so.2 -file path=lib/$(ARCH64)/libmvec.so.1 +file path=lib/$(ARCH32)/libm.so.2 +file path=lib/$(ARCH32)/libmvec.so.1 +file path=lib/$(ARCH32)/libmvec/libmvec_hwcap1.so.1 file path=lib/libm.so.2 file path=lib/libmvec.so.1 -file path=lib/libmvec/libmvec_hwcap1.so.1 file path=usr/include/complex.h file path=usr/include/fenv.h file path=usr/include/floatingpoint.h @@ -39,16 +39,16 @@ file path=usr/include/iso/math_iso.h file path=usr/include/math.h file path=usr/include/sys/ieeefp.h file path=usr/include/tgmath.h -link path=lib/$(ARCH64)/libm.so target=libm.so.2 -link path=lib/$(ARCH64)/libmvec.so target=libmvec.so.1 +link path=lib/$(ARCH32)/libm.so target=libm.so.2 +link path=lib/$(ARCH32)/libmvec.so target=libmvec.so.1 link path=lib/libm.so target=libm.so.2 link path=lib/libmvec.so target=libmvec.so.1 -link path=usr/lib/$(ARCH64)/libm.so target=../../../lib/$(ARCH64)/libm.so.2 -link path=usr/lib/$(ARCH64)/libm.so.2 target=../../../lib/$(ARCH64)/libm.so.2 -link path=usr/lib/$(ARCH64)/libmvec.so \ - target=../../../lib/$(ARCH64)/libmvec.so.1 -link path=usr/lib/$(ARCH64)/libmvec.so.1 \ - target=../../../lib/$(ARCH64)/libmvec.so.1 +link path=usr/lib/$(ARCH32)/libm.so target=../../../lib/$(ARCH32)/libm.so.2 +link path=usr/lib/$(ARCH32)/libm.so.2 target=../../../lib/$(ARCH32)/libm.so.2 +link path=usr/lib/$(ARCH32)/libmvec.so \ + target=../../../lib/$(ARCH32)/libmvec.so.1 +link path=usr/lib/$(ARCH32)/libmvec.so.1 \ + target=../../../lib/$(ARCH32)/libmvec.so.1 link path=usr/lib/libm.so target=../../lib/libm.so.2 link path=usr/lib/libm.so.2 target=../../lib/libm.so.2 link path=usr/lib/libmvec.so target=../../lib/libmvec.so.1 diff --git a/usr/src/pkg/manifests/system-library-security-gss-diffie-hellman.inc b/usr/src/pkg/manifests/system-library-security-gss-diffie-hellman.inc index aac084768f..34001cb254 100644 --- a/usr/src/pkg/manifests/system-library-security-gss-diffie-hellman.inc +++ b/usr/src/pkg/manifests/system-library-security-gss-diffie-hellman.inc @@ -25,20 +25,20 @@ dir path=usr group=sys dir path=usr/lib -dir path=usr/lib/$(ARCH64) -dir path=usr/lib/$(ARCH64)/gss +dir path=usr/lib/$(ARCH32) +dir path=usr/lib/$(ARCH32)/gss dir path=usr/lib/gss -file path=usr/lib/$(ARCH64)/gss/dh1024-0.so.1 -file path=usr/lib/$(ARCH64)/gss/dh640-0.so.1 -file path=usr/lib/$(ARCH64)/gss/mech_dh.so.1 +file path=usr/lib/$(ARCH32)/gss/dh1024-0.so.1 +file path=usr/lib/$(ARCH32)/gss/dh640-0.so.1 +file path=usr/lib/$(ARCH32)/gss/mech_dh.so.1 file path=usr/lib/gss/dh1024-0.so.1 file path=usr/lib/gss/dh640-0.so.1 file path=usr/lib/gss/mech_dh.so.1 license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL -link path=usr/lib/$(ARCH64)/gss/dh1024-0.so target=dh1024-0.so.1 -link path=usr/lib/$(ARCH64)/gss/dh640-0.so target=dh640-0.so.1 -link path=usr/lib/$(ARCH64)/gss/mech_dh.so target=mech_dh.so.1 +link path=usr/lib/$(ARCH32)/gss/dh1024-0.so target=dh1024-0.so.1 +link path=usr/lib/$(ARCH32)/gss/dh640-0.so target=dh640-0.so.1 +link path=usr/lib/$(ARCH32)/gss/mech_dh.so target=mech_dh.so.1 link path=usr/lib/gss/dh1024-0.so target=dh1024-0.so.1 link path=usr/lib/gss/dh640-0.so target=dh640-0.so.1 link path=usr/lib/gss/mech_dh.so target=mech_dh.so.1 diff --git a/usr/src/pkg/manifests/system-library-security-gss-spnego.inc b/usr/src/pkg/manifests/system-library-security-gss-spnego.inc index 195784ffdd..821fcd9cfb 100644 --- a/usr/src/pkg/manifests/system-library-security-gss-spnego.inc +++ b/usr/src/pkg/manifests/system-library-security-gss-spnego.inc @@ -25,12 +25,12 @@ dir path=usr group=sys dir path=usr/lib -dir path=usr/lib/$(ARCH64) -dir path=usr/lib/$(ARCH64)/gss +dir path=usr/lib/$(ARCH32) +dir path=usr/lib/$(ARCH32)/gss dir path=usr/lib/gss dir path=usr/share/man dir path=usr/share/man/man5 -file path=usr/lib/$(ARCH64)/gss/mech_spnego.so.1 +file path=usr/lib/$(ARCH32)/gss/mech_spnego.so.1 file path=usr/lib/gss/mech_spnego.so.1 file path=usr/share/man/man5/mech_spnego.5 license cr_Sun license=cr_Sun diff --git a/usr/src/pkg/manifests/system-library-security-gss.inc b/usr/src/pkg/manifests/system-library-security-gss.inc index 250b83f767..81d64a67d8 100644 --- a/usr/src/pkg/manifests/system-library-security-gss.inc +++ b/usr/src/pkg/manifests/system-library-security-gss.inc @@ -25,16 +25,16 @@ dir path=usr group=sys dir path=usr/lib -dir path=usr/lib/$(ARCH64) -dir path=usr/lib/$(ARCH64)/gss +dir path=usr/lib/$(ARCH32) +dir path=usr/lib/$(ARCH32)/gss dir path=usr/lib/gss dir path=usr/lib/sasl -dir path=usr/lib/sasl/$(ARCH64) +dir path=usr/lib/sasl/$(ARCH32) dir path=usr/sbin dir path=usr/share/man/man8 dir path=usr/share/man/man3gss dir path=usr/share/man/man3lib -file path=usr/lib/$(ARCH64)/libgss.so.1 +file path=usr/lib/$(ARCH32)/libgss.so.1 file path=usr/lib/gss/gsscred_clean group=sys mode=0744 file path=usr/lib/gss/gssd mode=0555 file path=usr/lib/libgss.so.1 @@ -90,5 +90,5 @@ license usr/src/lib/sasl_plugins/gssapi/THIRDPARTYLICENSE \ license=usr/src/lib/sasl_plugins/gssapi/THIRDPARTYLICENSE license usr/src/uts/common/gssapi/mechs/krb5/THIRDPARTYLICENSE \ license=usr/src/uts/common/gssapi/mechs/krb5/THIRDPARTYLICENSE -link path=usr/lib/$(ARCH64)/libgss.so target=libgss.so.1 +link path=usr/lib/$(ARCH32)/libgss.so target=libgss.so.1 link path=usr/lib/libgss.so target=libgss.so.1 diff --git a/usr/src/pkg/manifests/system-library-security-libsasl.inc b/usr/src/pkg/manifests/system-library-security-libsasl.inc index 149e491afb..b926d47fc1 100644 --- a/usr/src/pkg/manifests/system-library-security-libsasl.inc +++ b/usr/src/pkg/manifests/system-library-security-libsasl.inc @@ -26,14 +26,14 @@ dir path=usr group=sys dir path=usr/lib -dir path=usr/lib/$(ARCH64) +dir path=usr/lib/$(ARCH32) dir path=usr/lib/sasl -dir path=usr/lib/sasl/$(ARCH64) +dir path=usr/lib/sasl/$(ARCH32) dir path=usr/share/man dir path=usr/share/man/man3lib dir path=usr/share/man/man3sasl dir path=usr/share/man/man4 -file path=usr/lib/$(ARCH64)/libsasl.so.1 +file path=usr/lib/$(ARCH32)/libsasl.so.1 file path=usr/lib/libsasl.so.1 file path=usr/lib/sasl/$(ARCH64)/crammd5.so.1 file path=usr/lib/sasl/$(ARCH64)/digestmd5.so.1 @@ -101,5 +101,5 @@ file path=usr/share/man/man4/sasl_appname.conf.4 license cr_Sun license=cr_Sun license usr/src/lib/libsasl/THIRDPARTYLICENSE \ license=usr/src/lib/libsasl/THIRDPARTYLICENSE -link path=usr/lib/$(ARCH64)/libsasl.so target=libsasl.so.1 +link path=usr/lib/$(ARCH32)/libsasl.so target=libsasl.so.1 link path=usr/lib/libsasl.so target=libsasl.so.1 diff --git a/usr/src/pkg/manifests/system-library-security-rpcsec.mf b/usr/src/pkg/manifests/system-library-security-rpcsec.mf index b184ba33d3..9b7f75e435 100644 --- a/usr/src/pkg/manifests/system-library-security-rpcsec.mf +++ b/usr/src/pkg/manifests/system-library-security-rpcsec.mf @@ -31,10 +31,10 @@ set name=info.classification \ set name=variant.arch value=$(ARCH) dir path=usr group=sys dir path=usr/lib -dir path=usr/lib/$(ARCH64) -file path=usr/lib/$(ARCH64)/rpcsec.so.1 +dir path=usr/lib/$(ARCH32) +file path=usr/lib/$(ARCH32)/rpcsec.so.1 file path=usr/lib/rpcsec.so.1 license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL -link path=usr/lib/$(ARCH64)/rpcsec.so target=rpcsec.so.1 +link path=usr/lib/$(ARCH32)/rpcsec.so target=rpcsec.so.1 link path=usr/lib/rpcsec.so target=rpcsec.so.1 diff --git a/usr/src/pkg/manifests/system-library-storage-fibre-channel-hbaapi.mf b/usr/src/pkg/manifests/system-library-storage-fibre-channel-hbaapi.mf index 11d520b583..5dc5976f97 100644 --- a/usr/src/pkg/manifests/system-library-storage-fibre-channel-hbaapi.mf +++ b/usr/src/pkg/manifests/system-library-storage-fibre-channel-hbaapi.mf @@ -35,18 +35,18 @@ dir path=etc group=sys dir path=usr group=sys dir path=usr/include dir path=usr/lib -dir path=usr/lib/$(ARCH64) +dir path=usr/lib/$(ARCH32) dir path=usr/share/man dir path=usr/share/man/man4 file path=etc/hba.conf preserve=true file path=usr/include/hbaapi.h -file path=usr/lib/$(ARCH64)/libHBAAPI.so.1 +file path=usr/lib/$(ARCH32)/libHBAAPI.so.1 file path=usr/lib/libHBAAPI.so.1 file path=usr/share/man/man4/hba.conf.4 license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL license usr/src/lib/hbaapi/THIRDPARTYLICENSE \ license=usr/src/lib/hbaapi/THIRDPARTYLICENSE -link path=usr/lib/$(ARCH64)/libHBAAPI.so target=libHBAAPI.so.1 +link path=usr/lib/$(ARCH32)/libHBAAPI.so target=libHBAAPI.so.1 link path=usr/lib/libHBAAPI.so target=libHBAAPI.so.1 depend fmri=system/library/storage/fibre-channel/libsun_fc type=require diff --git a/usr/src/pkg/manifests/system-library-storage-fibre-channel-libsun_fc.mf b/usr/src/pkg/manifests/system-library-storage-fibre-channel-libsun_fc.mf index 609ed309ba..22ce225c65 100644 --- a/usr/src/pkg/manifests/system-library-storage-fibre-channel-libsun_fc.mf +++ b/usr/src/pkg/manifests/system-library-storage-fibre-channel-libsun_fc.mf @@ -34,10 +34,10 @@ set name=variant.arch value=$(ARCH) dir path=etc group=sys dir path=usr group=sys dir path=usr/lib -dir path=usr/lib/$(ARCH64) -file path=usr/lib/$(ARCH64)/libsun_fc.so.1 +dir path=usr/lib/$(ARCH32) +file path=usr/lib/$(ARCH32)/libsun_fc.so.1 file path=usr/lib/libsun_fc.so.1 license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL -link path=usr/lib/$(ARCH64)/libsun_fc.so target=libsun_fc.so.1 +link path=usr/lib/$(ARCH32)/libsun_fc.so target=libsun_fc.so.1 link path=usr/lib/libsun_fc.so target=libsun_fc.so.1 diff --git a/usr/src/pkg/manifests/system-library-storage-ima-header-ima.mf b/usr/src/pkg/manifests/system-library-storage-ima-header-ima.mf index 0fbc91d77b..7c0ca8a040 100644 --- a/usr/src/pkg/manifests/system-library-storage-ima-header-ima.mf +++ b/usr/src/pkg/manifests/system-library-storage-ima-header-ima.mf @@ -34,16 +34,16 @@ dir path=etc group=sys dir path=usr group=sys dir path=usr/include dir path=usr/lib -dir path=usr/lib/$(ARCH64) +dir path=usr/lib/$(ARCH32) file path=etc/ima.conf preserve=true file path=usr/include/ima.h file path=usr/include/libsun_ima.h -file path=usr/lib/$(ARCH64)/libima.so.1 +file path=usr/lib/$(ARCH32)/libima.so.1 file path=usr/lib/libima.so.1 license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL license usr/src/lib/libima/THIRDPARTYLICENSE \ license=usr/src/lib/libima/THIRDPARTYLICENSE -link path=usr/lib/$(ARCH64)/libima.so target=libima.so.1 +link path=usr/lib/$(ARCH32)/libima.so target=libima.so.1 link path=usr/lib/libima.so target=libima.so.1 depend fmri=system/library/storage/ima type=require diff --git a/usr/src/pkg/manifests/system-library-storage-ima.mf b/usr/src/pkg/manifests/system-library-storage-ima.mf index d19bff8b62..4d35f3e917 100644 --- a/usr/src/pkg/manifests/system-library-storage-ima.mf +++ b/usr/src/pkg/manifests/system-library-storage-ima.mf @@ -33,12 +33,12 @@ set name=variant.arch value=$(ARCH) dir path=etc group=sys dir path=usr group=sys dir path=usr/lib -dir path=usr/lib/$(ARCH64) -file path=usr/lib/$(ARCH64)/libsun_ima.so.1 +dir path=usr/lib/$(ARCH32) +file path=usr/lib/$(ARCH32)/libsun_ima.so.1 file path=usr/lib/libsun_ima.so.1 license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL license usr/src/lib/libima/THIRDPARTYLICENSE \ license=usr/src/lib/libima/THIRDPARTYLICENSE -link path=usr/lib/$(ARCH64)/libsun_ima.so target=libsun_ima.so.1 +link path=usr/lib/$(ARCH32)/libsun_ima.so target=libsun_ima.so.1 link path=usr/lib/libsun_ima.so target=libsun_ima.so.1 diff --git a/usr/src/pkg/manifests/system-library-storage-libmpapi.mf b/usr/src/pkg/manifests/system-library-storage-libmpapi.mf index 6bf8e56890..cef6284f7a 100644 --- a/usr/src/pkg/manifests/system-library-storage-libmpapi.mf +++ b/usr/src/pkg/manifests/system-library-storage-libmpapi.mf @@ -33,7 +33,7 @@ set name=info.classification \ set name=variant.arch value=$(ARCH) dir path=etc group=sys variant.opensolaris.zone=global dir path=lib variant.opensolaris.zone=global -dir path=lib/$(ARCH64) variant.opensolaris.zone=global +dir path=lib/$(ARCH32) variant.opensolaris.zone=global dir path=usr group=sys dir path=usr/include dir path=usr/share/man @@ -41,7 +41,7 @@ dir path=usr/share/man/man3lib dir path=usr/share/man/man3mpapi dir path=usr/share/man/man4 file path=etc/mpapi.conf preserve=true -file path=lib/$(ARCH64)/libMPAPI.so.1 variant.opensolaris.zone=global +file path=lib/$(ARCH32)/libMPAPI.so.1 variant.opensolaris.zone=global file path=lib/libMPAPI.so.1 variant.opensolaris.zone=global file path=usr/include/mpapi-sun.h file path=usr/include/mpapi.h @@ -98,7 +98,7 @@ license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL license usr/src/lib/mpapi/libmpapi/THIRDPARTYLICENSE \ license=usr/src/lib/mpapi/libmpapi/THIRDPARTYLICENSE -link path=lib/$(ARCH64)/libMPAPI.so target=libMPAPI.so.1 \ +link path=lib/$(ARCH32)/libMPAPI.so target=libMPAPI.so.1 \ variant.opensolaris.zone=global link path=lib/libMPAPI.so target=libMPAPI.so.1 variant.opensolaris.zone=global depend fmri=system/library/storage/libmpscsi_vhci type=require diff --git a/usr/src/pkg/manifests/system-library-storage-libmpscsi_vhci.mf b/usr/src/pkg/manifests/system-library-storage-libmpscsi_vhci.mf index 753b9d36a1..f9e12e2143 100644 --- a/usr/src/pkg/manifests/system-library-storage-libmpscsi_vhci.mf +++ b/usr/src/pkg/manifests/system-library-storage-libmpscsi_vhci.mf @@ -38,10 +38,10 @@ set name=info.classification \ set name=variant.arch value=$(ARCH) dir path=etc group=sys dir path=lib -dir path=lib/$(ARCH64) -file path=lib/$(ARCH64)/libmpscsi_vhci.so.1 +dir path=lib/$(ARCH32) +file path=lib/$(ARCH32)/libmpscsi_vhci.so.1 file path=lib/libmpscsi_vhci.so.1 license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL -link path=lib/$(ARCH64)/libmpscsi_vhci.so target=libmpscsi_vhci.so.1 +link path=lib/$(ARCH32)/libmpscsi_vhci.so target=libmpscsi_vhci.so.1 link path=lib/libmpscsi_vhci.so target=libmpscsi_vhci.so.1 diff --git a/usr/src/pkg/manifests/system-library-storage-scsi-plugins.inc b/usr/src/pkg/manifests/system-library-storage-scsi-plugins.inc index 4ead5c1ddf..d2b9bfb957 100644 --- a/usr/src/pkg/manifests/system-library-storage-scsi-plugins.inc +++ b/usr/src/pkg/manifests/system-library-storage-scsi-plugins.inc @@ -29,20 +29,20 @@ dir path=usr/lib/scsi dir path=usr/lib/scsi/plugins dir path=usr/lib/scsi/plugins/ses dir path=usr/lib/scsi/plugins/ses/vendor -dir path=usr/lib/scsi/plugins/ses/vendor/$(ARCH64) -file path=usr/lib/scsi/plugins/ses/vendor/$(ARCH64)/LSILOGIC-SASX28-A.0.so -file path=usr/lib/scsi/plugins/ses/vendor/$(ARCH64)/SUN-Storage-J4400.so -file path=usr/lib/scsi/plugins/ses/vendor/$(ARCH64)/SUN-Storage-J4500.so -file path=usr/lib/scsi/plugins/ses/vendor/$(ARCH64)/SUN.so +dir path=usr/lib/scsi/plugins/ses/vendor/$(ARCH32) +file path=usr/lib/scsi/plugins/ses/vendor/$(ARCH32)/LSILOGIC-SASX28-A.0.so +file path=usr/lib/scsi/plugins/ses/vendor/$(ARCH32)/SUN-Storage-J4400.so +file path=usr/lib/scsi/plugins/ses/vendor/$(ARCH32)/SUN-Storage-J4500.so +file path=usr/lib/scsi/plugins/ses/vendor/$(ARCH32)/SUN.so file path=usr/lib/scsi/plugins/ses/vendor/LSILOGIC-SASX28-A.0.so file path=usr/lib/scsi/plugins/ses/vendor/SUN-Storage-J4400.so file path=usr/lib/scsi/plugins/ses/vendor/SUN-Storage-J4500.so file path=usr/lib/scsi/plugins/ses/vendor/SUN.so license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL -link path=usr/lib/scsi/plugins/ses/vendor/$(ARCH64)/LSILOGIC-SASX28-A.1.so \ +link path=usr/lib/scsi/plugins/ses/vendor/$(ARCH32)/LSILOGIC-SASX28-A.1.so \ target=LSILOGIC-SASX28-A.0.so -link path=usr/lib/scsi/plugins/ses/vendor/$(ARCH64)/SUN-Storage-J4200.so \ +link path=usr/lib/scsi/plugins/ses/vendor/$(ARCH32)/SUN-Storage-J4200.so \ target=SUN-Storage-J4400.so link path=usr/lib/scsi/plugins/ses/vendor/LSILOGIC-SASX28-A.1.so \ target=LSILOGIC-SASX28-A.0.so diff --git a/usr/src/pkg/manifests/system-library.inc b/usr/src/pkg/manifests/system-library.inc index a95e79f204..965b82aa10 100644 --- a/usr/src/pkg/manifests/system-library.inc +++ b/usr/src/pkg/manifests/system-library.inc @@ -77,43 +77,45 @@ dir path=etc/flash/postcreation group=sys mode=0700 dir path=etc/flash/precreation group=sys mode=0700 dir path=etc/flash/preexit group=sys mode=0700 dir path=lib -dir path=lib/$(ARCH32) dir path=lib/$(ARCH64) +dir path=lib/$(ARCH32) dir path=lib/crypto -dir path=lib/crypto/$(ARCH32) dir path=lib/crypto/$(ARCH64) +dir path=lib/crypto/$(ARCH32) dir path=lib/mpxio dir path=lib/secure -dir path=lib/secure/$(ARCH32) dir path=lib/secure/$(ARCH64) +dir path=lib/secure/$(ARCH32) dir path=usr group=sys dir path=usr/bin dir path=usr/lib -dir path=usr/lib/$(ARCH32) dir path=usr/lib/$(ARCH64) +dir path=usr/lib/$(ARCH32) dir path=usr/lib/cfgadm dir path=usr/lib/cfgadm/$(ARCH64) -dir path=usr/lib/iconv/$(ARCH64) +dir path=usr/lib/iconv/$(ARCH32) dir path=usr/lib/lwp -dir path=usr/lib/lwp/$(ARCH32) dir path=usr/lib/lwp/$(ARCH64) +dir path=usr/lib/lwp/$(ARCH32) dir path=usr/lib/scsi -dir path=usr/lib/scsi/$(ARCH64) +dir path=usr/lib/scsi/$(ARCH32) dir path=usr/lib/scsi/plugins dir path=usr/lib/scsi/plugins/scsi dir path=usr/lib/scsi/plugins/scsi/engines -dir path=usr/lib/scsi/plugins/scsi/engines/$(ARCH64) +dir path=usr/lib/scsi/plugins/scsi/engines/$(ARCH32) dir path=usr/lib/scsi/plugins/ses dir path=usr/lib/scsi/plugins/ses/framework -dir path=usr/lib/scsi/plugins/ses/framework/$(ARCH64) +dir path=usr/lib/scsi/plugins/ses/framework/$(ARCH32) dir path=usr/lib/scsi/plugins/ses/vendor dir path=usr/lib/scsi/plugins/smp dir path=usr/lib/scsi/plugins/smp/engine -dir path=usr/lib/scsi/plugins/smp/engine/$(ARCH64) +dir path=usr/lib/scsi/plugins/smp/engine/$(ARCH32) dir path=usr/lib/scsi/plugins/smp/framework -dir path=usr/lib/scsi/plugins/smp/framework/$(ARCH64) +dir path=usr/lib/scsi/plugins/smp/framework/$(ARCH32) dir path=usr/lib/security -dir path=usr/lib/security/$(ARCH64) +dir path=usr/lib/security/$(ARCH32) +dir path=usr/libexec +dir path=usr/libexec/$(ARCH32) dir path=usr/share/man dir path=usr/share/man/man3 dir path=usr/share/man/man3avl @@ -159,76 +161,83 @@ dir path=usr/share/man/man3xnet dir path=usr/share/man/man5 dir path=usr/share/man/man7p file path=etc/flash/precreation/caplib group=sys mode=0500 -file path=lib/$(ARCH64)/ld.so.1 -file path=lib/$(ARCH64)/libadm.so.1 -file path=lib/$(ARCH64)/libaio.so.1 -file path=lib/$(ARCH64)/libavl.so.1 -file path=lib/$(ARCH64)/libc.so.1 -file path=lib/$(ARCH64)/libc_db.so.1 -file path=lib/$(ARCH64)/libcmdutils.so.1 -file path=lib/$(ARCH64)/libcontract.so.1 -file path=lib/$(ARCH64)/libcryptoutil.so.1 -file path=lib/$(ARCH64)/libctf.so.1 -file path=lib/$(ARCH64)/libcustr.so.1 -file path=lib/$(ARCH64)/libdevice.so.1 -file path=lib/$(ARCH64)/libdevid.so.1 -file path=lib/$(ARCH64)/libdevinfo.so.1 -file path=lib/$(ARCH64)/libdhcputil.so.1 -file path=lib/$(ARCH64)/libdl.so.1 -file path=lib/$(ARCH64)/libdladm.so.1 -file path=lib/$(ARCH64)/libdlpi.so.1 -file path=lib/$(ARCH64)/libdoor.so.1 -file path=lib/$(ARCH64)/libdwarf.so.1 -file path=lib/$(ARCH64)/libefi.so.1 -file path=lib/$(ARCH64)/libelf.so.1 -file path=lib/$(ARCH64)/libfdisk.so.1 -file path=lib/$(ARCH64)/libgen.so.1 -file path=lib/$(ARCH64)/libinetutil.so.1 -file path=lib/$(ARCH64)/libintl.so.1 -file path=lib/$(ARCH64)/libkmf.so.1 -file path=lib/$(ARCH64)/libkmfberder.so.1 -file path=lib/$(ARCH64)/libkstat.so.1 -file path=lib/$(ARCH64)/libld.so.4 -file path=lib/$(ARCH64)/liblddbg.so.4 -file path=lib/$(ARCH64)/libmd.so.1 -file path=lib/$(ARCH64)/libmd5.so.1 -file path=lib/$(ARCH64)/libmp.so.2 -file path=lib/$(ARCH64)/libnsl.so.1 -file path=lib/$(ARCH64)/libnvpair.so.1 -file path=lib/$(ARCH64)/libofmt.so.1 -file path=lib/$(ARCH64)/libpam.so.1 -file path=lib/$(ARCH64)/libproc.so.1 -file path=lib/$(ARCH64)/libpthread.so.1 -file path=lib/$(ARCH64)/librcm.so.1 -file path=lib/$(ARCH64)/libresolv.so.2 -file path=lib/$(ARCH64)/librestart.so.1 -file path=lib/$(ARCH64)/librpcsvc.so.1 -file path=lib/$(ARCH64)/librt.so.1 -file path=lib/$(ARCH64)/librtld.so.1 -file path=lib/$(ARCH64)/librtld_db.so.1 -file path=lib/$(ARCH64)/libscf.so.1 -file path=lib/$(ARCH64)/libsec.so.1 -file path=lib/$(ARCH64)/libsecdb.so.1 -file path=lib/$(ARCH64)/libsendfile.so.1 -file path=lib/$(ARCH64)/libsysevent.so.1 -file path=lib/$(ARCH64)/libthread.so.1 -file path=lib/$(ARCH64)/libumem.so.1 -file path=lib/$(ARCH64)/libuuid.so.1 -file path=lib/$(ARCH64)/libw.so.1 -file path=lib/$(ARCH64)/nss_compat.so.1 -file path=lib/$(ARCH64)/nss_dns.so.1 -file path=lib/$(ARCH64)/nss_files.so.1 -file path=lib/$(ARCH64)/nss_nis.so.1 -file path=lib/$(ARCH64)/nss_user.so.1 -file path=lib/crypto/$(ARCH64)/kmf_mapper_cn.so.1 -file path=lib/crypto/$(ARCH64)/kmf_nss.so.1 -file path=lib/crypto/$(ARCH64)/kmf_openssl.so.1 -file path=lib/crypto/$(ARCH64)/kmf_pkcs11.so.1 +file path=lib/$(ARCH32)/libadm.so.1 +file path=lib/$(ARCH32)/libaio.so.1 +file path=lib/$(ARCH32)/libavl.so.1 +file path=lib/$(ARCH32)/libc.so.1 +file path=lib/$(ARCH32)/libc_db.so.1 +file path=lib/$(ARCH32)/libcmdutils.so.1 +file path=lib/$(ARCH32)/libcontract.so.1 +file path=lib/$(ARCH32)/libcryptoutil.so.1 +file path=lib/$(ARCH32)/libctf.so.1 +file path=lib/$(ARCH32)/libcustr.so.1 +file path=lib/$(ARCH32)/libdevice.so.1 +file path=lib/$(ARCH32)/libdevid.so.1 +file path=lib/$(ARCH32)/libdevinfo.so.1 +file path=lib/$(ARCH32)/libdhcpagent.so.1 +file path=lib/$(ARCH32)/libdhcputil.so.1 +file path=lib/$(ARCH32)/libdl.so.1 +file path=lib/$(ARCH32)/libdladm.so.1 +file path=lib/$(ARCH32)/libdlpi.so.1 +file path=lib/$(ARCH32)/libelfsign.so.1 +file path=lib/$(ARCH32)/libdoor.so.1 +file path=lib/$(ARCH32)/libdwarf.so.1 +file path=lib/$(ARCH32)/libefi.so.1 +file path=lib/$(ARCH32)/libelf.so.1 +file path=lib/$(ARCH32)/libfdisk.so.1 +file path=lib/$(ARCH32)/libgen.so.1 +file path=lib/$(ARCH32)/libinetutil.so.1 +file path=lib/$(ARCH32)/libintl.so.1 +file path=lib/$(ARCH32)/libipadm.so.1 +file path=lib/$(ARCH32)/libipmp.so.1 +file path=lib/$(ARCH32)/libkcfd.so.1 +file path=lib/$(ARCH32)/libkmf.so.1 +file path=lib/$(ARCH32)/libkmfberder.so.1 +file path=lib/$(ARCH32)/libkstat.so.1 +file path=lib/$(ARCH32)/libld.so.4 +file path=lib/$(ARCH32)/liblddbg.so.4 +file path=lib/$(ARCH32)/libmd.so.1 +file path=lib/$(ARCH32)/libmd5.so.1 +file path=lib/$(ARCH32)/libmp.so.1 +file path=lib/$(ARCH32)/libmp.so.2 +file path=lib/$(ARCH32)/libnsl.so.1 +file path=lib/$(ARCH32)/libnvpair.so.1 +file path=lib/$(ARCH32)/libnwam.so.1 +file path=lib/$(ARCH32)/libofmt.so.1 +file path=lib/$(ARCH32)/libpam.so.1 +file path=lib/$(ARCH32)/libproc.so.1 +file path=lib/$(ARCH32)/libpthread.so.1 +file path=lib/$(ARCH32)/librcm.so.1 +file path=lib/$(ARCH32)/libresolv.so.1 +file path=lib/$(ARCH32)/libresolv.so.2 +file path=lib/$(ARCH32)/librestart.so.1 +file path=lib/$(ARCH32)/librpcsvc.so.1 +file path=lib/$(ARCH32)/librt.so.1 +file path=lib/$(ARCH32)/librtld.so.1 +file path=lib/$(ARCH32)/librtld_db.so.1 +file path=lib/$(ARCH32)/libscf.so.1 +file path=lib/$(ARCH32)/libsec.so.1 +file path=lib/$(ARCH32)/libsecdb.so.1 +file path=lib/$(ARCH32)/libsendfile.so.1 +file path=lib/$(ARCH32)/libsqlite-sys.so.2.8.15 +file path=lib/$(ARCH32)/libsysevent.so.1 +file path=lib/$(ARCH32)/libthread.so.1 +file path=lib/$(ARCH32)/libumem.so.1 +file path=lib/$(ARCH32)/libuuid.so.1 +file path=lib/$(ARCH32)/libw.so.1 +file path=lib/$(ARCH32)/nss_compat.so.1 +file path=lib/$(ARCH32)/nss_dns.so.1 +file path=lib/$(ARCH32)/nss_files.so.1 +file path=lib/$(ARCH32)/nss_nis.so.1 +file path=lib/$(ARCH32)/nss_user.so.1 +file path=lib/crypto/$(ARCH32)/kmf_mapper_cn.so.1 +file path=lib/crypto/$(ARCH32)/kmf_nss.so.1 +file path=lib/crypto/$(ARCH32)/kmf_openssl.so.1 +file path=lib/crypto/$(ARCH32)/kmf_pkcs11.so.1 file path=lib/crypto/kmf_mapper_cn.so.1 file path=lib/crypto/kmf_nss.so.1 file path=lib/crypto/kmf_openssl.so.1 file path=lib/crypto/kmf_pkcs11.so.1 -file path=lib/ld.so.1 file path=lib/libadm.so.1 file path=lib/libaio.so.1 file path=lib/libavl.so.1 @@ -242,7 +251,6 @@ file path=lib/libcustr.so.1 file path=lib/libdevice.so.1 file path=lib/libdevid.so.1 file path=lib/libdevinfo.so.1 -file path=lib/libdhcpagent.so.1 file path=lib/libdhcputil.so.1 file path=lib/libdl.so.1 file path=lib/libdladm.so.1 @@ -251,14 +259,10 @@ file path=lib/libdoor.so.1 file path=lib/libdwarf.so.1 file path=lib/libefi.so.1 file path=lib/libelf.so.1 -file path=lib/libelfsign.so.1 file path=lib/libfdisk.so.1 file path=lib/libgen.so.1 file path=lib/libinetutil.so.1 file path=lib/libintl.so.1 -file path=lib/libipadm.so.1 -file path=lib/libipmp.so.1 -file path=lib/libkcfd.so.1 file path=lib/libkmf.so.1 file path=lib/libkmfberder.so.1 file path=lib/libkstat.so.1 @@ -266,17 +270,14 @@ file path=lib/libld.so.4 file path=lib/liblddbg.so.4 file path=lib/libmd.so.1 file path=lib/libmd5.so.1 -file path=lib/libmp.so.1 file path=lib/libmp.so.2 file path=lib/libnsl.so.1 file path=lib/libnvpair.so.1 -file path=lib/libnwam.so.1 file path=lib/libofmt.so.1 file path=lib/libpam.so.1 file path=lib/libproc.so.1 file path=lib/libpthread.so.1 file path=lib/librcm.so.1 -file path=lib/libresolv.so.1 file path=lib/libresolv.so.2 file path=lib/librestart.so.1 file path=lib/librpcsvc.so.1 @@ -287,7 +288,6 @@ file path=lib/libscf.so.1 file path=lib/libsec.so.1 file path=lib/libsecdb.so.1 file path=lib/libsendfile.so.1 -file path=lib/libsqlite-sys.so.2.8.15 file path=lib/libsysevent.so.1 file path=lib/libthread.so.1 file path=lib/libumem.so.1 @@ -299,54 +299,56 @@ file path=lib/nss_dns.so.1 file path=lib/nss_files.so.1 file path=lib/nss_nis.so.1 file path=lib/nss_user.so.1 -file path=usr/lib/$(ARCH64)/getloginx.so.1 -file path=usr/lib/$(ARCH64)/libads.so.1 -file path=usr/lib/$(ARCH64)/libadutils.so.1 -file path=usr/lib/$(ARCH64)/libbsdmalloc.so.1 -file path=usr/lib/$(ARCH64)/libcfgadm.so.1 -file path=usr/lib/$(ARCH64)/libcommputil.so.1 -file path=usr/lib/$(ARCH64)/libcrle.so.1 -file path=usr/lib/$(ARCH64)/libcrypt.so.1 -file path=usr/lib/$(ARCH64)/libdemangle-sys.so.1 mode=0555 -file path=usr/lib/$(ARCH64)/libdisasm.so.1 -file path=usr/lib/$(ARCH64)/libexacct.so.1 -file path=usr/lib/$(ARCH64)/libfstyp.so.1 -file path=usr/lib/$(ARCH64)/libhotplug.so.1 -file path=usr/lib/$(ARCH64)/libidmap.so.1 -file path=usr/lib/$(ARCH64)/libipmi.so.1 -file path=usr/lib/$(ARCH64)/libipp.so.1 -file path=usr/lib/$(ARCH64)/libipsecutil.so.1 -file path=usr/lib/$(ARCH64)/libkvm.so.1 -file path=usr/lib/$(ARCH64)/libl.so.1 -file path=usr/lib/$(ARCH64)/libldap.so.5 -file path=usr/lib/$(ARCH64)/liblgrp.so.1 -file path=usr/lib/$(ARCH64)/liblm.so.1 -file path=usr/lib/$(ARCH64)/libmail.so.1 -file path=usr/lib/$(ARCH64)/libmalloc.so.1 -file path=usr/lib/$(ARCH64)/libmapmalloc.so.1 -file path=usr/lib/$(ARCH64)/libmtmalloc.so.1 -file path=usr/lib/$(ARCH64)/libnls.so.1 -file path=usr/lib/$(ARCH64)/libpcidb.so.1 -file path=usr/lib/$(ARCH64)/libpkcs11.so.1 -file path=usr/lib/$(ARCH64)/libproject.so.1 -file path=usr/lib/$(ARCH64)/libraidcfg.so.1 -file path=usr/lib/$(ARCH64)/libreparse.so.1 -file path=usr/lib/$(ARCH64)/libsaveargs.so.1 -file path=usr/lib/$(ARCH64)/libsched.so.1 -file path=usr/lib/$(ARCH64)/libsctp.so.1 -file path=usr/lib/$(ARCH64)/libsff.so.1 -file path=usr/lib/$(ARCH64)/libsip.so.1 -file path=usr/lib/$(ARCH64)/libsldap.so.1 -file path=usr/lib/$(ARCH64)/libsmbios.so.1 -file path=usr/lib/$(ARCH64)/libsoftcrypto.so.1 -file path=usr/lib/$(ARCH64)/libuutil.so.1 mode=0555 -file path=usr/lib/$(ARCH64)/libvolmgt.so.1 -file path=usr/lib/$(ARCH64)/libwrap.so.1.0 -file path=usr/lib/$(ARCH64)/nss_ad.so.1 -file path=usr/lib/$(ARCH64)/nss_ldap.so.1 -file path=usr/lib/$(ARCH64)/passwdutil.so.1 -file path=usr/lib/$(ARCH64)/straddr.so.2 -file path=usr/lib/$(ARCH64)/watchmalloc.so.1 +file path=usr/lib/$(ARCH32)/extendedFILE.so.1 +file path=usr/lib/$(ARCH32)/getloginx.so.1 +file path=usr/lib/$(ARCH32)/libads.so.1 +file path=usr/lib/$(ARCH32)/libadutils.so.1 +file path=usr/lib/$(ARCH32)/libbsdmalloc.so.1 +file path=usr/lib/$(ARCH32)/libcfgadm.so.1 +file path=usr/lib/$(ARCH32)/libcommputil.so.1 +file path=usr/lib/$(ARCH32)/libcrle.so.1 +file path=usr/lib/$(ARCH32)/libcrypt.so.1 +file path=usr/lib/$(ARCH32)/libdemangle-sys.so.1 mode=0555 +file path=usr/lib/$(ARCH32)/libdisasm.so.1 +file path=usr/lib/$(ARCH32)/libexacct.so.1 +file path=usr/lib/$(ARCH32)/libfstyp.so.1 +file path=usr/lib/$(ARCH32)/libhotplug.so.1 +file path=usr/lib/$(ARCH32)/libidmap.so.1 +file path=usr/lib/$(ARCH32)/libinetsvc.so.1 +file path=usr/lib/$(ARCH32)/libipmi.so.1 +file path=usr/lib/$(ARCH32)/libipp.so.1 +file path=usr/lib/$(ARCH32)/libipsecutil.so.1 +file path=usr/lib/$(ARCH32)/libkvm.so.1 +file path=usr/lib/$(ARCH32)/libl.so.1 +file path=usr/lib/$(ARCH32)/libldap.so.5 +file path=usr/lib/$(ARCH32)/liblgrp.so.1 +file path=usr/lib/$(ARCH32)/liblm.so.1 +file path=usr/lib/$(ARCH32)/libmail.so.1 +file path=usr/lib/$(ARCH32)/libmalloc.so.1 +file path=usr/lib/$(ARCH32)/libmapmalloc.so.1 +file path=usr/lib/$(ARCH32)/libmtmalloc.so.1 +file path=usr/lib/$(ARCH32)/libnls.so.1 +file path=usr/lib/$(ARCH32)/libpcidb.so.1 +file path=usr/lib/$(ARCH32)/libpkcs11.so.1 +file path=usr/lib/$(ARCH32)/libproject.so.1 +file path=usr/lib/$(ARCH32)/libraidcfg.so.1 +file path=usr/lib/$(ARCH32)/libreparse.so.1 +file path=usr/lib/$(ARCH32)/libsched.so.1 +file path=usr/lib/$(ARCH32)/libsctp.so.1 +file path=usr/lib/$(ARCH32)/libsff.so.1 +file path=usr/lib/$(ARCH32)/libsip.so.1 +file path=usr/lib/$(ARCH32)/libsldap.so.1 +file path=usr/lib/$(ARCH32)/libsmbios.so.1 +file path=usr/lib/$(ARCH32)/libsoftcrypto.so.1 +file path=usr/lib/$(ARCH32)/libsys.so.1 +file path=usr/lib/$(ARCH32)/libuutil.so.1 mode=0555 +file path=usr/lib/$(ARCH32)/libvolmgt.so.1 +file path=usr/lib/$(ARCH32)/libwrap.so.1.0 +file path=usr/lib/$(ARCH32)/nss_ad.so.1 +file path=usr/lib/$(ARCH32)/nss_ldap.so.1 +file path=usr/lib/$(ARCH32)/passwdutil.so.1 +file path=usr/lib/$(ARCH32)/straddr.so.2 +file path=usr/lib/$(ARCH32)/watchmalloc.so.1 file path=usr/lib/cfgadm/$(ARCH64)/ib.so.1 file path=usr/lib/cfgadm/$(ARCH64)/pci.so.1 file path=usr/lib/cfgadm/$(ARCH64)/sata.so.1 @@ -359,7 +361,6 @@ file path=usr/lib/cfgadm/sata.so.1 file path=usr/lib/cfgadm/scsi.so.1 file path=usr/lib/cfgadm/shp.so.1 file path=usr/lib/cfgadm/usb.so.1 -file path=usr/lib/extendedFILE.so.1 file path=usr/lib/getloginx.so.1 file path=usr/lib/lib.b mode=0444 file path=usr/lib/libads.so.1 @@ -375,7 +376,6 @@ file path=usr/lib/libexacct.so.1 file path=usr/lib/libfstyp.so.1 file path=usr/lib/libhotplug.so.1 file path=usr/lib/libidmap.so.1 -file path=usr/lib/libinetsvc.so.1 file path=usr/lib/libipmi.so.1 file path=usr/lib/libipp.so.1 file path=usr/lib/libipsecutil.so.1 @@ -394,6 +394,7 @@ file path=usr/lib/libpkcs11.so.1 file path=usr/lib/libproject.so.1 file path=usr/lib/libraidcfg.so.1 file path=usr/lib/libreparse.so.1 +file path=usr/lib/libsaveargs.so.1 file path=usr/lib/libsched.so.1 file path=usr/lib/libsctp.so.1 file path=usr/lib/libsff.so.1 @@ -401,28 +402,27 @@ file path=usr/lib/libsip.so.1 file path=usr/lib/libsldap.so.1 file path=usr/lib/libsmbios.so.1 file path=usr/lib/libsoftcrypto.so.1 -file path=usr/lib/libsys.so.1 file path=usr/lib/libuutil.so.1 mode=0555 file path=usr/lib/libvolmgt.so.1 file path=usr/lib/libwrap.so.1.0 file path=usr/lib/nss_ad.so.1 file path=usr/lib/nss_ldap.so.1 file path=usr/lib/passwdutil.so.1 -file path=usr/lib/scsi/$(ARCH64)/libscsi.so.1 -file path=usr/lib/scsi/$(ARCH64)/libses.so.1 -file path=usr/lib/scsi/$(ARCH64)/libsmp.so.1 +file path=usr/lib/scsi/$(ARCH32)/libscsi.so.1 +file path=usr/lib/scsi/$(ARCH32)/libses.so.1 +file path=usr/lib/scsi/$(ARCH32)/libsmp.so.1 file path=usr/lib/scsi/libscsi.so.1 file path=usr/lib/scsi/libses.so.1 file path=usr/lib/scsi/libsmp.so.1 -file path=usr/lib/scsi/plugins/scsi/engines/$(ARCH64)/uscsi.so +file path=usr/lib/scsi/plugins/scsi/engines/$(ARCH32)/uscsi.so file path=usr/lib/scsi/plugins/scsi/engines/uscsi.so -file path=usr/lib/scsi/plugins/ses/framework/$(ARCH64)/libses.so -file path=usr/lib/scsi/plugins/ses/framework/$(ARCH64)/ses2.so +file path=usr/lib/scsi/plugins/ses/framework/$(ARCH32)/libses.so +file path=usr/lib/scsi/plugins/ses/framework/$(ARCH32)/ses2.so file path=usr/lib/scsi/plugins/ses/framework/libses.so file path=usr/lib/scsi/plugins/ses/framework/ses2.so -file path=usr/lib/scsi/plugins/smp/engine/$(ARCH64)/usmp.so +file path=usr/lib/scsi/plugins/smp/engine/$(ARCH32)/usmp.so file path=usr/lib/scsi/plugins/smp/engine/usmp.so -file path=usr/lib/scsi/plugins/smp/framework/$(ARCH64)/sas2.so +file path=usr/lib/scsi/plugins/smp/framework/$(ARCH32)/sas2.so file path=usr/lib/scsi/plugins/smp/framework/sas2.so file path=usr/lib/security/$(ARCH64)/crypt_bsdbf.so.1 file path=usr/lib/security/$(ARCH64)/crypt_bsdmd5.so.1 @@ -474,6 +474,8 @@ file path=usr/lib/security/pkcs11_kernel.so.1 file path=usr/lib/security/pkcs11_softtoken.so.1 file path=usr/lib/straddr.so.2 file path=usr/lib/watchmalloc.so.1 +file path=usr/libexec/ld.so mode=0555 +file path=usr/libexec/$(ARCH32)/ld.so mode=0555 license cr_Sun license=cr_Sun license include/sys/THIRDPARTYLICENSE.unicode \ license=include/sys/THIRDPARTYLICENSE.unicode @@ -519,62 +521,67 @@ license usr/src/lib/pam_modules/authtok_check/THIRDPARTYLICENSE \ license=usr/src/lib/pam_modules/authtok_check/THIRDPARTYLICENSE license usr/src/lib/passwdutil/THIRDPARTYLICENSE \ license=usr/src/lib/passwdutil/THIRDPARTYLICENSE -link path=lib/$(ARCH64)/libadm.so target=libadm.so.1 -link path=lib/$(ARCH64)/libaio.so target=libaio.so.1 -link path=lib/$(ARCH64)/libavl.so target=libavl.so.1 -link path=lib/$(ARCH64)/libc.so reboot-needed=true target=libc.so.1 -link path=lib/$(ARCH64)/libc_db.so target=libc_db.so.1 -link path=lib/$(ARCH64)/libcmdutils.so target=libcmdutils.so.1 -link path=lib/$(ARCH64)/libcontract.so target=libcontract.so.1 -link path=lib/$(ARCH64)/libcryptoutil.so target=libcryptoutil.so.1 -link path=lib/$(ARCH64)/libctf.so target=libctf.so.1 -link path=lib/$(ARCH64)/libdevice.so target=libdevice.so.1 -link path=lib/$(ARCH64)/libdevid.so target=libdevid.so.1 -link path=lib/$(ARCH64)/libdevinfo.so target=libdevinfo.so.1 -link path=lib/$(ARCH64)/libdl.so target=libdl.so.1 -link path=lib/$(ARCH64)/libdladm.so target=libdladm.so.1 -link path=lib/$(ARCH64)/libdlpi.so target=libdlpi.so.1 -link path=lib/$(ARCH64)/libdoor.so target=libdoor.so.1 -link path=lib/$(ARCH64)/libefi.so target=libefi.so.1 -link path=lib/$(ARCH64)/libelf.so target=libelf.so.1 -link path=lib/$(ARCH64)/libfdisk.so target=libfdisk.so.1 -link path=lib/$(ARCH64)/libgen.so target=libgen.so.1 -link path=lib/$(ARCH64)/libintl.so target=libintl.so.1 -link path=lib/$(ARCH64)/libkmf.so target=libkmf.so.1 -link path=lib/$(ARCH64)/libkmfberder.so target=libkmfberder.so.1 -link path=lib/$(ARCH64)/libkstat.so target=libkstat.so.1 -link path=lib/$(ARCH64)/libmd.so target=libmd.so.1 -link path=lib/$(ARCH64)/libmd5.so target=libmd5.so.1 -link path=lib/$(ARCH64)/libmp.so target=libmp.so.2 -link path=lib/$(ARCH64)/libnsl.so target=libnsl.so.1 -link path=lib/$(ARCH64)/libnvpair.so target=libnvpair.so.1 -link path=lib/$(ARCH64)/libofmt.so target=libofmt.so.1 -link path=lib/$(ARCH64)/libpam.so target=libpam.so.1 -link path=lib/$(ARCH64)/libposix4.so target=libposix4.so.1 -link path=lib/$(ARCH64)/libposix4.so.1 target=librt.so.1 -link path=lib/$(ARCH64)/libproc.so target=libproc.so.1 -link path=lib/$(ARCH64)/libpthread.so target=libpthread.so.1 -link path=lib/$(ARCH64)/librcm.so target=librcm.so.1 -link path=lib/$(ARCH64)/libresolv.so target=libresolv.so.2 -link path=lib/$(ARCH64)/librestart.so target=librestart.so.1 -link path=lib/$(ARCH64)/librpcsvc.so target=librpcsvc.so.1 -link path=lib/$(ARCH64)/librt.so target=librt.so.1 -link path=lib/$(ARCH64)/librtld_db.so target=librtld_db.so.1 -link path=lib/$(ARCH64)/libscf.so target=libscf.so.1 -link path=lib/$(ARCH64)/libsec.so target=libsec.so.1 -link path=lib/$(ARCH64)/libsecdb.so target=libsecdb.so.1 -link path=lib/$(ARCH64)/libsendfile.so target=libsendfile.so.1 -link path=lib/$(ARCH64)/libsysevent.so target=libsysevent.so.1 -link path=lib/$(ARCH64)/libthread.so target=libthread.so.1 -link path=lib/$(ARCH64)/libthread_db.so target=libc_db.so.1 -link path=lib/$(ARCH64)/libthread_db.so.1 target=libc_db.so.1 -link path=lib/$(ARCH64)/libumem.so target=libumem.so.1 -link path=lib/$(ARCH64)/libuuid.so target=libuuid.so.1 -link path=lib/$(ARCH64)/libw.so target=libw.so.1 +link path=lib/$(ARCH64)/ld.so.1 target=../../usr/libexec/ld.so +link path=lib/$(ARCH32)/libadm.so target=libadm.so.1 +link path=lib/$(ARCH32)/libaio.so target=libaio.so.1 +link path=lib/$(ARCH32)/libavl.so target=libavl.so.1 +link path=lib/$(ARCH32)/libc.so reboot-needed=true target=libc.so.1 +link path=lib/$(ARCH32)/libc_db.so target=libc_db.so.1 +link path=lib/$(ARCH32)/libcmdutils.so target=libcmdutils.so.1 +link path=lib/$(ARCH32)/libcontract.so target=libcontract.so.1 +link path=lib/$(ARCH32)/libcryptoutil.so target=libcryptoutil.so.1 +link path=lib/$(ARCH32)/libctf.so target=libctf.so.1 +link path=lib/$(ARCH32)/libdevice.so target=libdevice.so.1 +link path=lib/$(ARCH32)/libdevid.so target=libdevid.so.1 +link path=lib/$(ARCH32)/libdevinfo.so target=libdevinfo.so.1 +link path=lib/$(ARCH32)/libdl.so target=libdl.so.1 +link path=lib/$(ARCH32)/libdladm.so target=libdladm.so.1 +link path=lib/$(ARCH32)/libdlpi.so target=libdlpi.so.1 +link path=lib/$(ARCH32)/libdoor.so target=libdoor.so.1 +link path=lib/$(ARCH32)/libefi.so target=libefi.so.1 +link path=lib/$(ARCH32)/libelf.so target=libelf.so.1 +link path=lib/$(ARCH32)/libelfsign.so target=libelfsign.so.1 +link path=lib/$(ARCH32)/libfdisk.so target=libfdisk.so.1 +link path=lib/$(ARCH32)/libgen.so target=libgen.so.1 +link path=lib/$(ARCH32)/libintl.so target=libintl.so.1 +link path=lib/$(ARCH32)/libipmp.so target=libipmp.so.1 +link path=lib/$(ARCH32)/libkmf.so target=libkmf.so.1 +link path=lib/$(ARCH32)/libkmfberder.so target=libkmfberder.so.1 +link path=lib/$(ARCH32)/libkstat.so target=libkstat.so.1 +link path=lib/$(ARCH32)/libmd.so target=libmd.so.1 +link path=lib/$(ARCH32)/libmd5.so target=libmd5.so.1 +link path=lib/$(ARCH32)/libmp.so target=libmp.so.2 +link path=lib/$(ARCH32)/libnsl.so target=libnsl.so.1 +link path=lib/$(ARCH32)/libnvpair.so target=libnvpair.so.1 +link path=lib/$(ARCH32)/libnwam.so target=libnwam.so.1 +link path=lib/$(ARCH32)/libofmt.so target=libofmt.so.1 +link path=lib/$(ARCH32)/libpam.so target=libpam.so.1 +link path=lib/$(ARCH32)/libposix4.so target=libposix4.so.1 +link path=lib/$(ARCH32)/libposix4.so.1 target=librt.so.1 +link path=lib/$(ARCH32)/libproc.so target=libproc.so.1 +link path=lib/$(ARCH32)/libpthread.so target=libpthread.so.1 +link path=lib/$(ARCH32)/librcm.so target=librcm.so.1 +link path=lib/$(ARCH32)/libresolv.so target=libresolv.so.2 +link path=lib/$(ARCH32)/librestart.so target=librestart.so.1 +link path=lib/$(ARCH32)/librpcsvc.so target=librpcsvc.so.1 +link path=lib/$(ARCH32)/librt.so target=librt.so.1 +link path=lib/$(ARCH32)/librtld_db.so target=librtld_db.so.1 +link path=lib/$(ARCH32)/libscf.so target=libscf.so.1 +link path=lib/$(ARCH32)/libsec.so target=libsec.so.1 +link path=lib/$(ARCH32)/libsecdb.so target=libsecdb.so.1 +link path=lib/$(ARCH32)/libsendfile.so target=libsendfile.so.1 +link path=lib/$(ARCH32)/libsysevent.so target=libsysevent.so.1 +link path=lib/$(ARCH32)/libthread.so target=libthread.so.1 +link path=lib/$(ARCH32)/libthread_db.so target=libc_db.so.1 +link path=lib/$(ARCH32)/libthread_db.so.1 target=libc_db.so.1 +link path=lib/$(ARCH32)/libumem.so target=libumem.so.1 +link path=lib/$(ARCH32)/libuuid.so target=libuuid.so.1 +link path=lib/$(ARCH32)/libw.so target=libw.so.1 link path=lib/32 target=$(ARCH32) link path=lib/64 target=$(ARCH64) link path=lib/crypto/32 target=$(ARCH32) link path=lib/crypto/64 target=$(ARCH64) +link path=lib/ld.so.1 target=../usr/libexec/$(ARCH32)/ld.so link path=lib/libadm.so target=libadm.so.1 link path=lib/libaio.so target=libaio.so.1 link path=lib/libavl.so target=libavl.so.1 @@ -593,11 +600,9 @@ link path=lib/libdlpi.so target=libdlpi.so.1 link path=lib/libdoor.so target=libdoor.so.1 link path=lib/libefi.so target=libefi.so.1 link path=lib/libelf.so target=libelf.so.1 -link path=lib/libelfsign.so target=libelfsign.so.1 link path=lib/libfdisk.so target=libfdisk.so.1 link path=lib/libgen.so target=libgen.so.1 link path=lib/libintl.so target=libintl.so.1 -link path=lib/libipmp.so target=./libipmp.so.1 link path=lib/libkmf.so target=libkmf.so.1 link path=lib/libkmfberder.so target=libkmfberder.so.1 link path=lib/libkstat.so target=libkstat.so.1 @@ -606,7 +611,6 @@ link path=lib/libmd5.so target=libmd5.so.1 link path=lib/libmp.so target=libmp.so.2 link path=lib/libnsl.so target=libnsl.so.1 link path=lib/libnvpair.so target=libnvpair.so.1 -link path=lib/libnwam.so target=libnwam.so.1 link path=lib/libofmt.so target=libofmt.so.1 link path=lib/libpam.so target=libpam.so.1 link path=lib/libposix4.so target=libposix4.so.1 @@ -631,249 +635,251 @@ link path=lib/libuuid.so target=libuuid.so.1 link path=lib/libw.so target=libw.so.1 link path=lib/secure/32 target=$(ARCH32) link path=lib/secure/64 target=$(ARCH64) -link path=usr/lib/$(ARCH64)/libadm.so \ - target=../../../lib/$(ARCH64)/libadm.so.1 -link path=usr/lib/$(ARCH64)/libadm.so.1 \ - target=../../../lib/$(ARCH64)/libadm.so.1 -link path=usr/lib/$(ARCH64)/libads.so target=./libads.so.1 -link path=usr/lib/$(ARCH64)/libadutils.so target=./libadutils.so.1 -link path=usr/lib/$(ARCH64)/libaio.so \ - target=../../../lib/$(ARCH64)/libaio.so.1 -link path=usr/lib/$(ARCH64)/libaio.so.1 \ - target=../../../lib/$(ARCH64)/libaio.so.1 -link path=usr/lib/$(ARCH64)/libavl.so \ - target=../../../lib/$(ARCH64)/libavl.so.1 -link path=usr/lib/$(ARCH64)/libavl.so.1 \ - target=../../../lib/$(ARCH64)/libavl.so.1 -link path=usr/lib/$(ARCH64)/libbsdmalloc.so target=libbsdmalloc.so.1 -link path=usr/lib/$(ARCH64)/libc.so target=../../../lib/$(ARCH64)/libc.so.1 -link path=usr/lib/$(ARCH64)/libc.so.1 target=../../../lib/$(ARCH64)/libc.so.1 -link path=usr/lib/$(ARCH64)/libc_db.so \ - target=../../../lib/$(ARCH64)/libc_db.so.1 -link path=usr/lib/$(ARCH64)/libc_db.so.1 \ - target=../../../lib/$(ARCH64)/libc_db.so.1 -link path=usr/lib/$(ARCH64)/libcfgadm.so target=libcfgadm.so.1 -link path=usr/lib/$(ARCH64)/libcmdutils.so \ - target=../../../lib/$(ARCH64)/libcmdutils.so.1 -link path=usr/lib/$(ARCH64)/libcmdutils.so.1 \ - target=../../../lib/$(ARCH64)/libcmdutils.so.1 -link path=usr/lib/$(ARCH64)/libcommputil.so target=libcommputil.so.1 -link path=usr/lib/$(ARCH64)/libcontract.so \ - target=../../../lib/$(ARCH64)/libcontract.so.1 -link path=usr/lib/$(ARCH64)/libcontract.so.1 \ - target=../../../lib/$(ARCH64)/libcontract.so.1 -link path=usr/lib/$(ARCH64)/libcrypt.so target=./libcrypt.so.1 -link path=usr/lib/$(ARCH64)/libcrypt_d.so target=./libcrypt.so -link path=usr/lib/$(ARCH64)/libcrypt_d.so.1 target=./libcrypt.so.1 -link path=usr/lib/$(ARCH64)/libcrypt_i.so target=./libcrypt.so -link path=usr/lib/$(ARCH64)/libcrypt_i.so.1 target=./libcrypt.so.1 -link path=usr/lib/$(ARCH64)/libctf.so \ - target=../../../lib/$(ARCH64)/libctf.so.1 -link path=usr/lib/$(ARCH64)/libctf.so.1 \ - target=../../../lib/$(ARCH64)/libctf.so.1 -link path=usr/lib/$(ARCH64)/libdemangle-sys.so target=./libdemangle-sys.so.1 -link path=usr/lib/$(ARCH64)/libdevice.so \ - target=../../../lib/$(ARCH64)/libdevice.so.1 -link path=usr/lib/$(ARCH64)/libdevice.so.1 \ - target=../../../lib/$(ARCH64)/libdevice.so.1 -link path=usr/lib/$(ARCH64)/libdevid.so \ - target=../../../lib/$(ARCH64)/libdevid.so.1 -link path=usr/lib/$(ARCH64)/libdevid.so.1 \ - target=../../../lib/$(ARCH64)/libdevid.so.1 -link path=usr/lib/$(ARCH64)/libdevinfo.so \ - target=../../../lib/$(ARCH64)/libdevinfo.so.1 -link path=usr/lib/$(ARCH64)/libdevinfo.so.1 \ - target=../../../lib/$(ARCH64)/libdevinfo.so.1 -link path=usr/lib/$(ARCH64)/libdhcputil.so.1 \ - target=../../../lib/$(ARCH64)/libdhcputil.so.1 -link path=usr/lib/$(ARCH64)/libdisasm.so target=libdisasm.so.1 -link path=usr/lib/$(ARCH64)/libdl.so target=../../../lib/$(ARCH64)/libdl.so.1 -link path=usr/lib/$(ARCH64)/libdl.so.1 \ - target=../../../lib/$(ARCH64)/libdl.so.1 -link path=usr/lib/$(ARCH64)/libdlpi.so \ - target=../../../lib/$(ARCH64)/libdlpi.so.1 -link path=usr/lib/$(ARCH64)/libdlpi.so.1 \ - target=../../../lib/$(ARCH64)/libdlpi.so.1 -link path=usr/lib/$(ARCH64)/libdoor.so \ - target=../../../lib/$(ARCH64)/libdoor.so.1 -link path=usr/lib/$(ARCH64)/libdoor.so.1 \ - target=../../../lib/$(ARCH64)/libdoor.so.1 -link path=usr/lib/$(ARCH64)/libdwarf.so.1 \ - target=../../../lib/$(ARCH64)/libdwarf.so.1 -link path=usr/lib/$(ARCH64)/libefi.so \ - target=../../../lib/$(ARCH64)/libefi.so.1 -link path=usr/lib/$(ARCH64)/libefi.so.1 \ - target=../../../lib/$(ARCH64)/libefi.so.1 -link path=usr/lib/$(ARCH64)/libelf.so \ - target=../../../lib/$(ARCH64)/libelf.so.1 -link path=usr/lib/$(ARCH64)/libelf.so.1 \ - target=../../../lib/$(ARCH64)/libelf.so.1 -link path=usr/lib/$(ARCH64)/libexacct.so target=libexacct.so.1 -link path=usr/lib/$(ARCH64)/libfdisk.so \ - target=../../../lib/$(ARCH64)/libfdisk.so.1 -link path=usr/lib/$(ARCH64)/libfdisk.so.1 \ - target=../../../lib/$(ARCH64)/libfdisk.so.1 -link path=usr/lib/$(ARCH64)/libfstyp.so target=./libfstyp.so.1 -link path=usr/lib/$(ARCH64)/libgen.so \ - target=../../../lib/$(ARCH64)/libgen.so.1 -link path=usr/lib/$(ARCH64)/libgen.so.1 \ - target=../../../lib/$(ARCH64)/libgen.so.1 -link path=usr/lib/$(ARCH64)/libhotplug.so target=libhotplug.so.1 -link path=usr/lib/$(ARCH64)/libidmap.so target=./libidmap.so.1 -link path=usr/lib/$(ARCH64)/libinetutil.so.1 \ - target=../../../lib/$(ARCH64)/libinetutil.so.1 -link path=usr/lib/$(ARCH64)/libintl.so \ - target=../../../lib/$(ARCH64)/libintl.so.1 -link path=usr/lib/$(ARCH64)/libintl.so.1 \ - target=../../../lib/$(ARCH64)/libintl.so.1 -link path=usr/lib/$(ARCH64)/libipmi.so target=./libipmi.so.1 -link path=usr/lib/$(ARCH64)/libipp.so target=libipp.so.1 -link path=usr/lib/$(ARCH64)/libkstat.so \ - target=../../../lib/$(ARCH64)/libkstat.so.1 -link path=usr/lib/$(ARCH64)/libkstat.so.1 \ - target=../../../lib/$(ARCH64)/libkstat.so.1 -link path=usr/lib/$(ARCH64)/libkvm.so target=libkvm.so.1 -link path=usr/lib/$(ARCH64)/libl.so target=libl.so.1 -link path=usr/lib/$(ARCH64)/libldap.so target=libldap.so.5 -link path=usr/lib/$(ARCH64)/liblddbg.so.4 \ - target=../../../lib/$(ARCH64)/liblddbg.so.4 -link path=usr/lib/$(ARCH64)/liblgrp.so target=liblgrp.so.1 -link path=usr/lib/$(ARCH64)/liblm.so target=liblm.so.1 -link path=usr/lib/$(ARCH64)/libmail.so target=libmail.so.1 -link path=usr/lib/$(ARCH64)/libmalloc.so target=libmalloc.so.1 -link path=usr/lib/$(ARCH64)/libmapmalloc.so target=libmapmalloc.so.1 -link path=usr/lib/$(ARCH64)/libmd.so target=../../../lib/$(ARCH64)/libmd.so.1 -link path=usr/lib/$(ARCH64)/libmd.so.1 \ - target=../../../lib/$(ARCH64)/libmd.so.1 -link path=usr/lib/$(ARCH64)/libmd5.so \ - target=../../../lib/$(ARCH64)/libmd5.so.1 -link path=usr/lib/$(ARCH64)/libmd5.so.1 \ - target=../../../lib/$(ARCH64)/libmd5.so.1 -link path=usr/lib/$(ARCH64)/libmp.so target=../../../lib/$(ARCH64)/libmp.so.2 -link path=usr/lib/$(ARCH64)/libmp.so.2 \ - target=../../../lib/$(ARCH64)/libmp.so.2 -link path=usr/lib/$(ARCH64)/libmtmalloc.so target=libmtmalloc.so.1 -link path=usr/lib/$(ARCH64)/libnls.so target=libnls.so.1 -link path=usr/lib/$(ARCH64)/libnsl.so \ - target=../../../lib/$(ARCH64)/libnsl.so.1 -link path=usr/lib/$(ARCH64)/libnsl.so.1 \ - target=../../../lib/$(ARCH64)/libnsl.so.1 -link path=usr/lib/$(ARCH64)/libnvpair.so \ - target=../../../lib/$(ARCH64)/libnvpair.so.1 -link path=usr/lib/$(ARCH64)/libnvpair.so.1 \ - target=../../../lib/$(ARCH64)/libnvpair.so.1 -link path=usr/lib/$(ARCH64)/libpam.so \ - target=../../../lib/$(ARCH64)/libpam.so.1 -link path=usr/lib/$(ARCH64)/libpam.so.1 \ - target=../../../lib/$(ARCH64)/libpam.so.1 -link path=usr/lib/$(ARCH64)/libpkcs11.so target=libpkcs11.so.1 -link path=usr/lib/$(ARCH64)/libposix4.so \ - target=../../../lib/$(ARCH64)/librt.so.1 -link path=usr/lib/$(ARCH64)/libposix4.so.1 \ - target=../../../lib/$(ARCH64)/librt.so.1 -link path=usr/lib/$(ARCH64)/libproc.so \ - target=../../../lib/$(ARCH64)/libproc.so.1 -link path=usr/lib/$(ARCH64)/libproc.so.1 \ - target=../../../lib/$(ARCH64)/libproc.so.1 -link path=usr/lib/$(ARCH64)/libproject.so target=libproject.so.1 -link path=usr/lib/$(ARCH64)/libpthread.so \ - target=../../../lib/$(ARCH64)/libpthread.so.1 -link path=usr/lib/$(ARCH64)/libpthread.so.1 \ - target=../../../lib/$(ARCH64)/libpthread.so.1 -link path=usr/lib/$(ARCH64)/librcm.so \ - target=../../../lib/$(ARCH64)/librcm.so.1 -link path=usr/lib/$(ARCH64)/librcm.so.1 \ - target=../../../lib/$(ARCH64)/librcm.so.1 -link path=usr/lib/$(ARCH64)/libreparse.so target=libreparse.so.1 -link path=usr/lib/$(ARCH64)/libresolv.so \ - target=../../../lib/$(ARCH64)/libresolv.so.2 -link path=usr/lib/$(ARCH64)/libresolv.so.2 \ - target=../../../lib/$(ARCH64)/libresolv.so.2 -link path=usr/lib/$(ARCH64)/librestart.so \ - target=../../../lib/$(ARCH64)/librestart.so.1 -link path=usr/lib/$(ARCH64)/librestart.so.1 \ - target=../../../lib/$(ARCH64)/librestart.so.1 -link path=usr/lib/$(ARCH64)/librpcsvc.so \ - target=../../../lib/$(ARCH64)/librpcsvc.so.1 -link path=usr/lib/$(ARCH64)/librpcsvc.so.1 \ - target=../../../lib/$(ARCH64)/librpcsvc.so.1 -link path=usr/lib/$(ARCH64)/librt.so target=../../../lib/$(ARCH64)/librt.so.1 -link path=usr/lib/$(ARCH64)/librt.so.1 \ - target=../../../lib/$(ARCH64)/librt.so.1 -link path=usr/lib/$(ARCH64)/librtld.so.1 \ - target=../../../lib/$(ARCH64)/librtld.so.1 -link path=usr/lib/$(ARCH64)/librtld_db.so \ - target=../../../lib/$(ARCH64)/librtld_db.so.1 -link path=usr/lib/$(ARCH64)/librtld_db.so.1 \ - target=../../../lib/$(ARCH64)/librtld_db.so.1 -link path=usr/lib/$(ARCH64)/libscf.so \ - target=../../../lib/$(ARCH64)/libscf.so.1 -link path=usr/lib/$(ARCH64)/libscf.so.1 \ - target=../../../lib/$(ARCH64)/libscf.so.1 -link path=usr/lib/$(ARCH64)/libsched.so target=libsched.so.1 -link path=usr/lib/$(ARCH64)/libsctp.so target=./libsctp.so.1 -link path=usr/lib/$(ARCH64)/libsec.so \ - target=../../../lib/$(ARCH64)/libsec.so.1 -link path=usr/lib/$(ARCH64)/libsec.so.1 \ - target=../../../lib/$(ARCH64)/libsec.so.1 -link path=usr/lib/$(ARCH64)/libsecdb.so \ - target=../../../lib/$(ARCH64)/libsecdb.so.1 -link path=usr/lib/$(ARCH64)/libsecdb.so.1 \ - target=../../../lib/$(ARCH64)/libsecdb.so.1 -link path=usr/lib/$(ARCH64)/libsendfile.so \ - target=../../../lib/$(ARCH64)/libsendfile.so.1 -link path=usr/lib/$(ARCH64)/libsendfile.so.1 \ - target=../../../lib/$(ARCH64)/libsendfile.so.1 -link path=usr/lib/$(ARCH64)/libsip.so target=./libsip.so.1 -link path=usr/lib/$(ARCH64)/libsldap.so target=libsldap.so.1 -link path=usr/lib/$(ARCH64)/libsmbios.so target=libsmbios.so.1 -link path=usr/lib/$(ARCH64)/libsoftcrypto.so target=./libsoftcrypto.so.1 -link path=usr/lib/$(ARCH64)/libsysevent.so \ - target=../../../lib/$(ARCH64)/libsysevent.so.1 -link path=usr/lib/$(ARCH64)/libsysevent.so.1 \ - target=../../../lib/$(ARCH64)/libsysevent.so.1 -link path=usr/lib/$(ARCH64)/libthread.so \ - target=../../../lib/$(ARCH64)/libthread.so.1 -link path=usr/lib/$(ARCH64)/libthread.so.1 \ - target=../../../lib/$(ARCH64)/libthread.so.1 -link path=usr/lib/$(ARCH64)/libthread_db.so \ - target=../../../lib/$(ARCH64)/libc_db.so.1 -link path=usr/lib/$(ARCH64)/libthread_db.so.1 \ - target=../../../lib/$(ARCH64)/libc_db.so.1 -link path=usr/lib/$(ARCH64)/libumem.so \ - target=../../../lib/$(ARCH64)/libumem.so.1 -link path=usr/lib/$(ARCH64)/libumem.so.1 \ - target=../../../lib/$(ARCH64)/libumem.so.1 -link path=usr/lib/$(ARCH64)/libuuid.so \ - target=../../../lib/$(ARCH64)/libuuid.so.1 -link path=usr/lib/$(ARCH64)/libuuid.so.1 \ - target=../../../lib/$(ARCH64)/libuuid.so.1 -link path=usr/lib/$(ARCH64)/libuutil.so \ +link path=usr/lib/$(ARCH32)/libadm.so \ + target=../../../lib/$(ARCH32)/libadm.so.1 +link path=usr/lib/$(ARCH32)/libadm.so.1 \ + target=../../../lib/$(ARCH32)/libadm.so.1 +link path=usr/lib/$(ARCH32)/libads.so target=./libads.so.1 +link path=usr/lib/$(ARCH32)/libadutils.so target=./libadutils.so.1 +link path=usr/lib/$(ARCH32)/libaio.so \ + target=../../../lib/$(ARCH32)/libaio.so.1 +link path=usr/lib/$(ARCH32)/libaio.so.1 \ + target=../../../lib/$(ARCH32)/libaio.so.1 +link path=usr/lib/$(ARCH32)/libavl.so \ + target=../../../lib/$(ARCH32)/libavl.so.1 +link path=usr/lib/$(ARCH32)/libavl.so.1 \ + target=../../../lib/$(ARCH32)/libavl.so.1 +link path=usr/lib/$(ARCH32)/libbsdmalloc.so target=libbsdmalloc.so.1 +link path=usr/lib/$(ARCH32)/libc.so target=../../../lib/$(ARCH32)/libc.so.1 +link path=usr/lib/$(ARCH32)/libc.so.1 target=../../../lib/$(ARCH32)/libc.so.1 +link path=usr/lib/$(ARCH32)/libc_db.so \ + target=../../../lib/$(ARCH32)/libc_db.so.1 +link path=usr/lib/$(ARCH32)/libc_db.so.1 \ + target=../../../lib/$(ARCH32)/libc_db.so.1 +link path=usr/lib/$(ARCH32)/libcfgadm.so target=libcfgadm.so.1 +link path=usr/lib/$(ARCH32)/libcmdutils.so \ + target=../../../lib/$(ARCH32)/libcmdutils.so.1 +link path=usr/lib/$(ARCH32)/libcmdutils.so.1 \ + target=../../../lib/$(ARCH32)/libcmdutils.so.1 +link path=usr/lib/$(ARCH32)/libcommputil.so target=libcommputil.so.1 +link path=usr/lib/$(ARCH32)/libcontract.so \ + target=../../../lib/$(ARCH32)/libcontract.so.1 +link path=usr/lib/$(ARCH32)/libcontract.so.1 \ + target=../../../lib/$(ARCH32)/libcontract.so.1 +link path=usr/lib/$(ARCH32)/libcrypt.so target=./libcrypt.so.1 +link path=usr/lib/$(ARCH32)/libcrypt_d.so target=./libcrypt.so +link path=usr/lib/$(ARCH32)/libcrypt_d.so.1 target=./libcrypt.so.1 +link path=usr/lib/$(ARCH32)/libcrypt_i.so target=./libcrypt.so +link path=usr/lib/$(ARCH32)/libcrypt_i.so.1 target=./libcrypt.so.1 +link path=usr/lib/$(ARCH32)/libctf.so \ + target=../../../lib/$(ARCH32)/libctf.so.1 +link path=usr/lib/$(ARCH32)/libctf.so.1 \ + target=../../../lib/$(ARCH32)/libctf.so.1 +link path=usr/lib/$(ARCH32)/libdemangle-sys.so target=./libdemangle-sys.so.1 +link path=usr/lib/$(ARCH32)/libdevice.so \ + target=../../../lib/$(ARCH32)/libdevice.so.1 +link path=usr/lib/$(ARCH32)/libdevice.so.1 \ + target=../../../lib/$(ARCH32)/libdevice.so.1 +link path=usr/lib/$(ARCH32)/libdevid.so \ + target=../../../lib/$(ARCH32)/libdevid.so.1 +link path=usr/lib/$(ARCH32)/libdevid.so.1 \ + target=../../../lib/$(ARCH32)/libdevid.so.1 +link path=usr/lib/$(ARCH32)/libdevinfo.so \ + target=../../../lib/$(ARCH32)/libdevinfo.so.1 +link path=usr/lib/$(ARCH32)/libdevinfo.so.1 \ + target=../../../lib/$(ARCH32)/libdevinfo.so.1 +link path=usr/lib/$(ARCH32)/libdhcputil.so.1 \ + target=../../../lib/$(ARCH32)/libdhcputil.so.1 +link path=usr/lib/$(ARCH32)/libdisasm.so target=libdisasm.so.1 +link path=usr/lib/$(ARCH32)/libdhcpagent.so.1 target=../../....//lib/$(MACH32)/libdhcpagent.so.1 +link path=usr/lib/$(ARCH32)/libdl.so target=../../../lib/$(ARCH32)/libdl.so.1 +link path=usr/lib/$(ARCH32)/libdl.so.1 \ + target=../../../lib/$(ARCH32)/libdl.so.1 +link path=usr/lib/$(ARCH32)/libdlpi.so \ + target=../../../lib/$(ARCH32)/libdlpi.so.1 +link path=usr/lib/$(ARCH32)/libdlpi.so.1 \ + target=../../../lib/$(ARCH32)/libdlpi.so.1 +link path=usr/lib/$(ARCH32)/libdoor.so \ + target=../../../lib/$(ARCH32)/libdoor.so.1 +link path=usr/lib/$(ARCH32)/libdoor.so.1 \ + target=../../../lib/$(ARCH32)/libdoor.so.1 +link path=usr/lib/$(ARCH32)/libdwarf.so.1 \ + target=../../../lib/$(ARCH32)/libdwarf.so.1 +link path=usr/lib/$(ARCH32)/libefi.so \ + target=../../../lib/$(ARCH32)/libefi.so.1 +link path=usr/lib/$(ARCH32)/libefi.so.1 \ + target=../../../lib/$(ARCH32)/libefi.so.1 +link path=usr/lib/$(ARCH32)/libelf.so \ + target=../../../lib/$(ARCH32)/libelf.so.1 +link path=usr/lib/$(ARCH32)/libelf.so.1 \ + target=../../../lib/$(ARCH32)/libelf.so.1 +link path=usr/lib/$(ARCH32)/libexacct.so target=libexacct.so.1 +link path=usr/lib/$(ARCH32)/libfdisk.so \ + target=../../../lib/$(ARCH32)/libfdisk.so.1 +link path=usr/lib/$(ARCH32)/libfdisk.so.1 \ + target=../../../lib/$(ARCH32)/libfdisk.so.1 +link path=usr/lib/$(ARCH32)/libfstyp.so target=./libfstyp.so.1 +link path=usr/lib/$(ARCH32)/libgen.so \ + target=../../../lib/$(ARCH32)/libgen.so.1 +link path=usr/lib/$(ARCH32)/libgen.so.1 \ + target=../../../lib/$(ARCH32)/libgen.so.1 +link path=usr/lib/$(ARCH32)/libhotplug.so target=libhotplug.so.1 +link path=usr/lib/$(ARCH32)/libidmap.so target=./libidmap.so.1 +link path=usr/lib/$(ARCH32)/libinetutil.so.1 \ + target=../../../lib/$(ARCH32)/libinetutil.so.1 +link path=usr/lib/$(ARCH32)/libintl.so \ + target=../../../lib/$(ARCH32)/libintl.so.1 +link path=usr/lib/$(ARCH32)/libintl.so.1 \ + target=../../../lib/$(ARCH32)/libintl.so.1 +link path=usr/lib/$(ARCH32)/libipmi.so target=./libipmi.so.1 +link path=usr/lib/$(ARCH32)/libipp.so target=libipp.so.1 +link path=usr/lib/$(ARCH32)/libkstat.so \ + target=../../../lib/$(ARCH32)/libkstat.so.1 +link path=usr/lib/$(ARCH32)/libkstat.so.1 \ + target=../../../lib/$(ARCH32)/libkstat.so.1 +link path=usr/lib/$(ARCH32)/libkvm.so target=libkvm.so.1 +link path=usr/lib/$(ARCH32)/libl.so target=libl.so.1 +link path=usr/lib/$(ARCH32)/libldap.so target=libldap.so.5 +link path=usr/lib/$(ARCH32)/liblddbg.so.4 \ + target=../../../lib/$(ARCH32)/liblddbg.so.4 +link path=usr/lib/$(ARCH32)/liblgrp.so target=liblgrp.so.1 +link path=usr/lib/$(ARCH32)/liblm.so target=liblm.so.1 +link path=usr/lib/$(ARCH32)/libmail.so target=libmail.so.1 +link path=usr/lib/$(ARCH32)/libmalloc.so target=libmalloc.so.1 +link path=usr/lib/$(ARCH32)/libmapmalloc.so target=libmapmalloc.so.1 +link path=usr/lib/$(ARCH32)/libmd.so target=../../../lib/$(ARCH32)/libmd.so.1 +link path=usr/lib/$(ARCH32)/libmd.so.1 \ + target=../../../lib/$(ARCH32)/libmd.so.1 +link path=usr/lib/$(ARCH32)/libmd5.so \ + target=../../../lib/$(ARCH32)/libmd5.so.1 +link path=usr/lib/$(ARCH32)/libmd5.so.1 \ + target=../../../lib/$(ARCH32)/libmd5.so.1 +link path=usr/lib/$(ARCH32)/libmp.so target=../../../lib/$(ARCH32)/libmp.so.2 +link path=usr/lib/$(ARCH32)/libmp.so.2 \ + target=../../../lib/$(ARCH32)/libmp.so.2 +link path=usr/lib/$(ARCH32)/libmtmalloc.so target=libmtmalloc.so.1 +link path=usr/lib/$(ARCH32)/libnls.so target=libnls.so.1 +link path=usr/lib/$(ARCH32)/libnsl.so \ + target=../../../lib/$(ARCH32)/libnsl.so.1 +link path=usr/lib/$(ARCH32)/libnsl.so.1 \ + target=../../../lib/$(ARCH32)/libnsl.so.1 +link path=usr/lib/$(ARCH32)/libnvpair.so \ + target=../../../lib/$(ARCH32)/libnvpair.so.1 +link path=usr/lib/$(ARCH32)/libnvpair.so.1 \ + target=../../../lib/$(ARCH32)/libnvpair.so.1 +link path=usr/lib/$(ARCH32)/libpam.so \ + target=../../../lib/$(ARCH32)/libpam.so.1 +link path=usr/lib/$(ARCH32)/libpam.so.1 \ + target=../../../lib/$(ARCH32)/libpam.so.1 +link path=usr/lib/$(ARCH32)/libpkcs11.so target=libpkcs11.so.1 +link path=usr/lib/$(ARCH32)/libposix4.so \ + target=../../../lib/$(ARCH32)/librt.so.1 +link path=usr/lib/$(ARCH32)/libposix4.so.1 \ + target=../../../lib/$(ARCH32)/librt.so.1 +link path=usr/lib/$(ARCH32)/libproc.so \ + target=../../../lib/$(ARCH32)/libproc.so.1 +link path=usr/lib/$(ARCH32)/libproc.so.1 \ + target=../../../lib/$(ARCH32)/libproc.so.1 +link path=usr/lib/$(ARCH32)/libproject.so target=libproject.so.1 +link path=usr/lib/$(ARCH32)/libpthread.so \ + target=../../../lib/$(ARCH32)/libpthread.so.1 +link path=usr/lib/$(ARCH32)/libpthread.so.1 \ + target=../../../lib/$(ARCH32)/libpthread.so.1 +link path=usr/lib/$(ARCH32)/librcm.so \ + target=../../../lib/$(ARCH32)/librcm.so.1 +link path=usr/lib/$(ARCH32)/librcm.so.1 \ + target=../../../lib/$(ARCH32)/librcm.so.1 +link path=usr/lib/$(ARCH32)/libreparse.so target=libreparse.so.1 +link path=usr/lib/$(ARCH32)/libresolv.so \ + target=../../../lib/$(ARCH32)/libresolv.so.2 +link path=usr/lib/$(ARCH32)/libresolv.so.2 \ + target=../../../lib/$(ARCH32)/libresolv.so.2 +link path=usr/lib/$(ARCH32)/librestart.so \ + target=../../../lib/$(ARCH32)/librestart.so.1 +link path=usr/lib/$(ARCH32)/librestart.so.1 \ + target=../../../lib/$(ARCH32)/librestart.so.1 +link path=usr/lib/$(ARCH32)/librpcsvc.so \ + target=../../../lib/$(ARCH32)/librpcsvc.so.1 +link path=usr/lib/$(ARCH32)/librpcsvc.so.1 \ + target=../../../lib/$(ARCH32)/librpcsvc.so.1 +link path=usr/lib/$(ARCH32)/librt.so target=../../../lib/$(ARCH32)/librt.so.1 +link path=usr/lib/$(ARCH32)/librt.so.1 \ + target=../../../lib/$(ARCH32)/librt.so.1 +link path=usr/lib/$(ARCH32)/librtld.so.1 \ + target=../../../lib/$(ARCH32)/librtld.so.1 +link path=usr/lib/$(ARCH32)/librtld_db.so \ + target=../../../lib/$(ARCH32)/librtld_db.so.1 +link path=usr/lib/$(ARCH32)/librtld_db.so.1 \ + target=../../../lib/$(ARCH32)/librtld_db.so.1 +link path=usr/lib/$(ARCH32)/libscf.so \ + target=../../../lib/$(ARCH32)/libscf.so.1 +link path=usr/lib/$(ARCH32)/libscf.so.1 \ + target=../../../lib/$(ARCH32)/libscf.so.1 +link path=usr/lib/$(ARCH32)/libsched.so target=libsched.so.1 +link path=usr/lib/$(ARCH32)/libsctp.so target=./libsctp.so.1 +link path=usr/lib/$(ARCH32)/libsec.so \ + target=../../../lib/$(ARCH32)/libsec.so.1 +link path=usr/lib/$(ARCH32)/libsec.so.1 \ + target=../../../lib/$(ARCH32)/libsec.so.1 +link path=usr/lib/$(ARCH32)/libsecdb.so \ + target=../../../lib/$(ARCH32)/libsecdb.so.1 +link path=usr/lib/$(ARCH32)/libsecdb.so.1 \ + target=../../../lib/$(ARCH32)/libsecdb.so.1 +link path=usr/lib/$(ARCH32)/libsendfile.so \ + target=../../../lib/$(ARCH32)/libsendfile.so.1 +link path=usr/lib/$(ARCH32)/libsendfile.so.1 \ + target=../../../lib/$(ARCH32)/libsendfile.so.1 +link path=usr/lib/$(ARCH32)/libsip.so target=./libsip.so.1 +link path=usr/lib/$(ARCH32)/libsldap.so target=libsldap.so.1 +link path=usr/lib/$(ARCH32)/libsmbios.so target=libsmbios.so.1 +link path=usr/lib/$(ARCH32)/libsoftcrypto.so target=./libsoftcrypto.so.1 +link path=usr/lib/$(ARCH32)/libsys.so target=libsys.so.1 +link path=usr/lib/$(ARCH32)/libsysevent.so \ + target=../../../lib/$(ARCH32)/libsysevent.so.1 +link path=usr/lib/$(ARCH32)/libsysevent.so.1 \ + target=../../../lib/$(ARCH32)/libsysevent.so.1 +link path=usr/lib/$(ARCH32)/libthread.so \ + target=../../../lib/$(ARCH32)/libthread.so.1 +link path=usr/lib/$(ARCH32)/libthread.so.1 \ + target=../../../lib/$(ARCH32)/libthread.so.1 +link path=usr/lib/$(ARCH32)/libthread_db.so \ + target=../../../lib/$(ARCH32)/libc_db.so.1 +link path=usr/lib/$(ARCH32)/libthread_db.so.1 \ + target=../../../lib/$(ARCH32)/libc_db.so.1 +link path=usr/lib/$(ARCH32)/libumem.so \ + target=../../../lib/$(ARCH32)/libumem.so.1 +link path=usr/lib/$(ARCH32)/libumem.so.1 \ + target=../../../lib/$(ARCH32)/libumem.so.1 +link path=usr/lib/$(ARCH32)/libuuid.so \ + target=../../../lib/$(ARCH32)/libuuid.so.1 +link path=usr/lib/$(ARCH32)/libuuid.so.1 \ + target=../../../lib/$(ARCH32)/libuuid.so.1 +link path=usr/lib/$(ARCH32)/libuutil.so \ target=libuutil.so.1 -link path=usr/lib/$(ARCH64)/libvolmgt.so target=libvolmgt.so.1 -link path=usr/lib/$(ARCH64)/libw.so target=../../../lib/$(ARCH64)/libw.so.1 -link path=usr/lib/$(ARCH64)/libw.so.1 target=../../../lib/$(ARCH64)/libw.so.1 -link path=usr/lib/$(ARCH64)/libwrap.so target=libwrap.so.1.0 -link path=usr/lib/$(ARCH64)/libwrap.so.1 target=libwrap.so.1.0 -link path=usr/lib/$(ARCH64)/nss_compat.so.1 \ - target=../../../lib/$(ARCH64)/nss_compat.so.1 -link path=usr/lib/$(ARCH64)/nss_dns.so.1 \ - target=../../../lib/$(ARCH64)/nss_dns.so.1 -link path=usr/lib/$(ARCH64)/nss_files.so.1 \ - target=../../../lib/$(ARCH64)/nss_files.so.1 -link path=usr/lib/$(ARCH64)/nss_nis.so.1 \ - target=../../../lib/$(ARCH64)/nss_nis.so.1 -link path=usr/lib/$(ARCH64)/nss_user.so.1 \ - target=../../../lib/$(ARCH64)/nss_user.so.1 -link path=usr/lib/$(ARCH64)/straddr.so target=straddr.so.2 +link path=usr/lib/$(ARCH32)/libvolmgt.so target=libvolmgt.so.1 +link path=usr/lib/$(ARCH32)/libw.so target=../../../lib/$(ARCH32)/libw.so.1 +link path=usr/lib/$(ARCH32)/libw.so.1 target=../../../lib/$(ARCH32)/libw.so.1 +link path=usr/lib/$(ARCH32)/libwrap.so target=libwrap.so.1.0 +link path=usr/lib/$(ARCH32)/libwrap.so.1 target=libwrap.so.1.0 +link path=usr/lib/$(ARCH32)/nss_compat.so.1 \ + target=../../../lib/$(ARCH32)/nss_compat.so.1 +link path=usr/lib/$(ARCH32)/nss_dns.so.1 \ + target=../../../lib/$(ARCH32)/nss_dns.so.1 +link path=usr/lib/$(ARCH32)/nss_files.so.1 \ + target=../../../lib/$(ARCH32)/nss_files.so.1 +link path=usr/lib/$(ARCH32)/nss_nis.so.1 \ + target=../../../lib/$(ARCH32)/nss_nis.so.1 +link path=usr/lib/$(ARCH32)/nss_user.so.1 \ + target=../../../lib/$(ARCH32)/nss_user.so.1 +link path=usr/lib/$(ARCH32)/straddr.so target=straddr.so.2 link path=usr/lib/32 target=$(ARCH32) link path=usr/lib/64 target=$(ARCH64) -link path=usr/lib/cfgadm/$(ARCH64)/ib.so target=./ib.so.1 -link path=usr/lib/cfgadm/$(ARCH64)/pci.so target=./pci.so.1 -link path=usr/lib/cfgadm/$(ARCH64)/sata.so target=./sata.so.1 -link path=usr/lib/cfgadm/$(ARCH64)/scsi.so target=./scsi.so.1 -link path=usr/lib/cfgadm/$(ARCH64)/shp.so target=./shp.so.1 -link path=usr/lib/cfgadm/$(ARCH64)/usb.so target=./usb.so.1 +link path=usr/lib/cfgadm/$(ARCH32)/ib.so target=./ib.so.1 +link path=usr/lib/cfgadm/$(ARCH32)/pci.so target=./pci.so.1 +link path=usr/lib/cfgadm/$(ARCH32)/sata.so target=./sata.so.1 +link path=usr/lib/cfgadm/$(ARCH32)/scsi.so target=./scsi.so.1 +link path=usr/lib/cfgadm/$(ARCH32)/shp.so target=./shp.so.1 +link path=usr/lib/cfgadm/$(ARCH32)/usb.so target=./usb.so.1 link path=usr/lib/cfgadm/ib.so target=./ib.so.1 link path=usr/lib/cfgadm/pci.so target=./pci.so.1 link path=usr/lib/cfgadm/sata.so target=./sata.so.1 @@ -913,7 +919,6 @@ link path=usr/lib/libdevid.so target=../../lib/libdevid.so.1 link path=usr/lib/libdevid.so.1 target=../../lib/libdevid.so.1 link path=usr/lib/libdevinfo.so target=../../lib/libdevinfo.so.1 link path=usr/lib/libdevinfo.so.1 target=../../lib/libdevinfo.so.1 -link path=usr/lib/libdhcpagent.so.1 target=../../lib/libdhcpagent.so.1 link path=usr/lib/libdhcputil.so.1 target=../../lib/libdhcputil.so.1 link path=usr/lib/libdisasm.so target=./libdisasm.so.1 link path=usr/lib/libdl.so target=../../lib/libdl.so.1 @@ -956,7 +961,6 @@ link path=usr/lib/libmd.so.1 target=../../lib/libmd.so.1 link path=usr/lib/libmd5.so target=../../lib/libmd5.so.1 link path=usr/lib/libmd5.so.1 target=../../lib/libmd5.so.1 link path=usr/lib/libmp.so target=../../lib/libmp.so.2 -link path=usr/lib/libmp.so.1 target=../../lib/libmp.so.1 link path=usr/lib/libmp.so.2 target=../../lib/libmp.so.2 link path=usr/lib/libmtmalloc.so target=./libmtmalloc.so.1 link path=usr/lib/libnls.so target=./libnls.so.1 @@ -978,7 +982,6 @@ link path=usr/lib/librcm.so target=../../lib/librcm.so.1 link path=usr/lib/librcm.so.1 target=../../lib/librcm.so.1 link path=usr/lib/libreparse.so target=./libreparse.so.1 link path=usr/lib/libresolv.so target=../../lib/libresolv.so.2 -link path=usr/lib/libresolv.so.1 target=../../lib/libresolv.so.1 link path=usr/lib/libresolv.so.2 target=../../lib/libresolv.so.2 link path=usr/lib/librestart.so.1 target=../../lib/librestart.so.1 link path=usr/lib/librpcsvc.so target=../../lib/librpcsvc.so.1 @@ -1002,7 +1005,6 @@ link path=usr/lib/libsip.so target=./libsip.so.1 link path=usr/lib/libsldap.so target=libsldap.so.1 link path=usr/lib/libsmbios.so target=libsmbios.so.1 link path=usr/lib/libsoftcrypto.so target=./libsoftcrypto.so.1 -link path=usr/lib/libsys.so target=./libsys.so.1 link path=usr/lib/libsysevent.so target=../../lib/libsysevent.so.1 link path=usr/lib/libsysevent.so.1 target=../../lib/libsysevent.so.1 link path=usr/lib/libthread.so target=../../lib/libthread.so.1 @@ -1019,10 +1021,10 @@ link path=usr/lib/libw.so target=../../lib/libw.so.1 link path=usr/lib/libw.so.1 target=../../lib/libw.so.1 link path=usr/lib/libwrap.so target=libwrap.so.1.0 link path=usr/lib/libwrap.so.1 target=libwrap.so.1.0 -link path=usr/lib/lwp/$(ARCH64)/libthread.so.1 \ - target=../../$(ARCH64)/libthread.so.1 -link path=usr/lib/lwp/$(ARCH64)/libthread_db.so.1 \ - target=../../$(ARCH64)/libthread_db.so.1 +link path=usr/lib/lwp/$(ARCH32)/libthread.so.1 \ + target=../../$(ARCH32)/libthread.so.1 +link path=usr/lib/lwp/$(ARCH32)/libthread_db.so.1 \ + target=../../$(ARCH32)/libthread_db.so.1 link path=usr/lib/lwp/32 target=$(ARCH32) link path=usr/lib/lwp/64 target=$(ARCH64) link path=usr/lib/lwp/libthread.so.1 target=../libthread.so.1 @@ -1032,51 +1034,51 @@ link path=usr/lib/nss_dns.so.1 target=../../lib/nss_dns.so.1 link path=usr/lib/nss_files.so.1 target=../../lib/nss_files.so.1 link path=usr/lib/nss_nis.so.1 target=../../lib/nss_nis.so.1 link path=usr/lib/nss_user.so.1 target=../../lib/nss_user.so.1 -link path=usr/lib/scsi/$(ARCH64)/libscsi.so target=./libscsi.so.1 -link path=usr/lib/scsi/$(ARCH64)/libses.so target=./libses.so.1 -link path=usr/lib/scsi/$(ARCH64)/libsmp.so target=./libsmp.so.1 +link path=usr/lib/scsi/$(ARCH32)/libscsi.so target=./libscsi.so.1 +link path=usr/lib/scsi/$(ARCH32)/libses.so target=./libses.so.1 +link path=usr/lib/scsi/$(ARCH32)/libsmp.so target=./libsmp.so.1 link path=usr/lib/scsi/libscsi.so target=./libscsi.so.1 link path=usr/lib/scsi/libses.so target=./libses.so.1 link path=usr/lib/scsi/libsmp.so target=./libsmp.so.1 -link path=usr/lib/security/$(ARCH64)/crypt_bsdbf.so target=./crypt_bsdbf.so.1 -link path=usr/lib/security/$(ARCH64)/crypt_bsdmd5.so \ +link path=usr/lib/security/$(ARCH32)/crypt_bsdbf.so target=./crypt_bsdbf.so.1 +link path=usr/lib/security/$(ARCH32)/crypt_bsdmd5.so \ target=./crypt_bsdmd5.so.1 -link path=usr/lib/security/$(ARCH64)/crypt_sha256.so \ +link path=usr/lib/security/$(ARCH32)/crypt_sha256.so \ target=./crypt_sha256.so.1 -link path=usr/lib/security/$(ARCH64)/crypt_sha512.so \ +link path=usr/lib/security/$(ARCH32)/crypt_sha512.so \ target=./crypt_sha512.so.1 -link path=usr/lib/security/$(ARCH64)/crypt_sunmd5.so \ +link path=usr/lib/security/$(ARCH32)/crypt_sunmd5.so \ target=./crypt_sunmd5.so.1 -link path=usr/lib/security/$(ARCH64)/pam_allow.so target=./pam_allow.so.1 -link path=usr/lib/security/$(ARCH64)/pam_authtok_check.so \ +link path=usr/lib/security/$(ARCH32)/pam_allow.so target=./pam_allow.so.1 +link path=usr/lib/security/$(ARCH32)/pam_authtok_check.so \ target=./pam_authtok_check.so.1 -link path=usr/lib/security/$(ARCH64)/pam_authtok_get.so \ +link path=usr/lib/security/$(ARCH32)/pam_authtok_get.so \ target=./pam_authtok_get.so.1 -link path=usr/lib/security/$(ARCH64)/pam_authtok_store.so \ +link path=usr/lib/security/$(ARCH32)/pam_authtok_store.so \ target=./pam_authtok_store.so.1 -link path=usr/lib/security/$(ARCH64)/pam_deny.so target=./pam_deny.so.1 -link path=usr/lib/security/$(ARCH64)/pam_dhkeys.so target=./pam_dhkeys.so.1 -link path=usr/lib/security/$(ARCH64)/pam_dial_auth.so \ +link path=usr/lib/security/$(ARCH32)/pam_deny.so target=./pam_deny.so.1 +link path=usr/lib/security/$(ARCH32)/pam_dhkeys.so target=./pam_dhkeys.so.1 +link path=usr/lib/security/$(ARCH32)/pam_dial_auth.so \ target=./pam_dial_auth.so.1 -link path=usr/lib/security/$(ARCH64)/pam_ldap.so target=./pam_ldap.so.1 -link path=usr/lib/security/$(ARCH64)/pam_list.so target=./pam_list.so.1 -link path=usr/lib/security/$(ARCH64)/pam_passwd_auth.so \ +link path=usr/lib/security/$(ARCH32)/pam_ldap.so target=./pam_ldap.so.1 +link path=usr/lib/security/$(ARCH32)/pam_list.so target=./pam_list.so.1 +link path=usr/lib/security/$(ARCH32)/pam_passwd_auth.so \ target=./pam_passwd_auth.so.1 -link path=usr/lib/security/$(ARCH64)/pam_roles.so target=./pam_roles.so.1 -link path=usr/lib/security/$(ARCH64)/pam_sample.so target=./pam_sample.so.1 -link path=usr/lib/security/$(ARCH64)/pam_timestamp.so \ +link path=usr/lib/security/$(ARCH32)/pam_roles.so target=./pam_roles.so.1 +link path=usr/lib/security/$(ARCH32)/pam_sample.so target=./pam_sample.so.1 +link path=usr/lib/security/$(ARCH32)/pam_timestamp.so \ target=./pam_timestamp.so.1 -link path=usr/lib/security/$(ARCH64)/pam_unix_account.so \ +link path=usr/lib/security/$(ARCH32)/pam_unix_account.so \ target=./pam_unix_account.so.1 -link path=usr/lib/security/$(ARCH64)/pam_unix_auth.so \ +link path=usr/lib/security/$(ARCH32)/pam_unix_auth.so \ target=./pam_unix_auth.so.1 -link path=usr/lib/security/$(ARCH64)/pam_unix_cred.so \ +link path=usr/lib/security/$(ARCH32)/pam_unix_cred.so \ target=./pam_unix_cred.so.1 -link path=usr/lib/security/$(ARCH64)/pam_unix_session.so \ +link path=usr/lib/security/$(ARCH32)/pam_unix_session.so \ target=./pam_unix_session.so.1 -link path=usr/lib/security/$(ARCH64)/pkcs11_kernel.so \ +link path=usr/lib/security/$(ARCH32)/pkcs11_kernel.so \ target=./pkcs11_kernel.so.1 -link path=usr/lib/security/$(ARCH64)/pkcs11_softtoken.so \ +link path=usr/lib/security/$(ARCH32)/pkcs11_softtoken.so \ target=./pkcs11_softtoken.so.1 link path=usr/lib/security/64 target=$(ARCH64) link path=usr/lib/security/crypt_bsdbf.so target=./crypt_bsdbf.so.1 diff --git a/usr/src/pkg/manifests/system-management-wbem-data-management.mf b/usr/src/pkg/manifests/system-management-wbem-data-management.mf index a2a45a0bc0..ceb3a1f8af 100644 --- a/usr/src/pkg/manifests/system-management-wbem-data-management.mf +++ b/usr/src/pkg/manifests/system-management-wbem-data-management.mf @@ -31,7 +31,8 @@ set name=info.classification \ set name=variant.arch value=$(ARCH) dir path=usr group=sys dir path=usr/lib -file path=usr/lib/libfsmgt.so.1 +dir path=usr/lib/$(ARCH32) +file path=usr/lib/$(ARCH32)/libfsmgt.so.1 license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL -link path=usr/lib/libfsmgt.so target=./libfsmgt.so.1 +link path=usr/lib/$(ARCH32)/libfsmgt.so target=libfsmgt.so.1 diff --git a/usr/src/pkg/manifests/system-network-nis.mf b/usr/src/pkg/manifests/system-network-nis.mf index 66cbcf62d6..7319f63a6b 100644 --- a/usr/src/pkg/manifests/system-network-nis.mf +++ b/usr/src/pkg/manifests/system-network-nis.mf @@ -63,9 +63,9 @@ file path=usr/bin/ypcat group=other mode=0555 file path=usr/bin/ypmatch group=other mode=0555 file path=usr/bin/yppasswd mode=0555 file path=usr/bin/ypwhich group=other mode=0555 +file path=usr/lib/$(ARCH32)/libnisdb.so.2 file path=usr/lib/ldap/idsconfig mode=0555 file path=usr/lib/ldap/ldap_cachemgr mode=0555 -file path=usr/lib/libnisdb.so.2 file path=usr/lib/netsvc/yp/ypbind mode=0555 file path=usr/lib/netsvc/yp/ypstart mode=0555 file path=usr/lib/netsvc/yp/ypstop mode=0555 @@ -100,5 +100,5 @@ file path=var/yp/aliases mode=0555 preserve=true file path=var/yp/nicknames preserve=true license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL -link path=usr/lib/libnisdb.so target=./libnisdb.so.2 +link path=usr/lib/$(ARCH32)/libnisdb.so target=libnisdb.so.2 depend fmri=pkg:/developer/build/make type=require diff --git a/usr/src/pkg/manifests/system-network-routing-vrrp.mf b/usr/src/pkg/manifests/system-network-routing-vrrp.mf index 18a083c24f..39123c970f 100644 --- a/usr/src/pkg/manifests/system-network-routing-vrrp.mf +++ b/usr/src/pkg/manifests/system-network-routing-vrrp.mf @@ -38,13 +38,13 @@ dir path=lib/svc/manifest/network group=sys dir path=lib/svc/method dir path=usr group=sys dir path=usr/lib -dir path=usr/lib/$(ARCH64) +dir path=usr/lib/$(ARCH32) dir path=usr/lib/inet dir path=usr/sbin file path=etc/inet/vrrp.conf group=sys file path=lib/svc/manifest/network/vrrp.xml group=sys mode=0444 file path=lib/svc/method/svc-vrrp mode=0555 -file path=usr/lib/$(ARCH64)/libvrrpadm.so.1 +file path=usr/lib/$(ARCH32)/libvrrpadm.so.1 file path=usr/lib/inet/vrrpd mode=0555 file path=usr/lib/libvrrpadm.so.1 file path=usr/sbin/vrrpadm mode=0555 diff --git a/usr/src/pkg/manifests/system-network-udapl-udapl-tavor.mf b/usr/src/pkg/manifests/system-network-udapl-udapl-tavor.mf index 3c35012da7..8d44cd183d 100644 --- a/usr/src/pkg/manifests/system-network-udapl-udapl-tavor.mf +++ b/usr/src/pkg/manifests/system-network-udapl-udapl-tavor.mf @@ -42,14 +42,14 @@ dir path=kernel group=sys dir path=kernel/drv group=sys dir path=usr group=sys dir path=usr/lib -dir path=usr/lib/$(ARCH64) +dir path=usr/lib/$(ARCH32) dir path=usr/share dir path=usr/share/dat group=sys driver name=daplt perms="* 0644 root sys" file path=etc/init.d/dodatadm.udaplt group=sys mode=0744 preserve=true file path=kernel/drv/daplt group=sys file path=kernel/drv/daplt.conf group=sys -file path=usr/lib/$(ARCH64)/udapl_tavor.so.1 +file path=usr/lib/$(ARCH32)/udapl_tavor.so.1 file path=usr/lib/udapl_tavor.so.1 file path=usr/share/dat/SUNWudaplt.conf group=sys mode=0644 hardlink path=etc/rc2.d/S81dodatadm.udaplt \ diff --git a/usr/src/pkg/manifests/system-network-udapl.mf b/usr/src/pkg/manifests/system-network-udapl.mf index 7607c5e690..f3dded32b1 100644 --- a/usr/src/pkg/manifests/system-network-udapl.mf +++ b/usr/src/pkg/manifests/system-network-udapl.mf @@ -39,7 +39,7 @@ dir path=etc group=sys dir path=etc/dat group=sys dir path=usr group=sys dir path=usr/lib -dir path=usr/lib/$(ARCH64) +dir path=usr/lib/$(ARCH32) dir path=usr/sbin dir path=usr/share/man dir path=usr/share/man/man3dat @@ -47,7 +47,7 @@ dir path=usr/share/man/man3lib dir path=usr/share/man/man4 dir path=usr/share/man/man8 file path=etc/dat/dat.conf group=sys preserve=true -file path=usr/lib/$(ARCH64)/libdat.so.1 +file path=usr/lib/$(ARCH32)/libdat.so.1 file path=usr/lib/libdat.so.1 file path=usr/sbin/datadm mode=0555 file path=usr/share/man/man3dat/dat_cno_create.3dat @@ -128,5 +128,5 @@ file path=usr/share/man/man4/dat.conf.4 file path=usr/share/man/man8/datadm.8 license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL -link path=usr/lib/$(ARCH64)/libdat.so target=libdat.so.1 +link path=usr/lib/$(ARCH32)/libdat.so target=libdat.so.1 link path=usr/lib/libdat.so target=libdat.so.1 diff --git a/usr/src/pkg/manifests/system-remote-shared-memory.mf b/usr/src/pkg/manifests/system-remote-shared-memory.mf index 1e27e89ae8..08b2cdd4c9 100644 --- a/usr/src/pkg/manifests/system-remote-shared-memory.mf +++ b/usr/src/pkg/manifests/system-remote-shared-memory.mf @@ -33,14 +33,14 @@ dir path=usr group=sys dir path=usr/kernel group=sys dir path=usr/kernel/drv group=sys dir path=usr/lib -dir path=usr/lib/$(ARCH64) +dir path=usr/lib/$(ARCH32) dir path=usr/share/man dir path=usr/share/man/man3lib dir path=usr/share/man/man3rsm driver name=rsm perms="* 0666 root sys" file path=usr/kernel/drv/rsm group=sys file path=usr/kernel/drv/rsm.conf group=sys -file path=usr/lib/$(ARCH64)/librsm.so.2 +file path=usr/lib/$(ARCH32)/librsm.so.2 file path=usr/lib/librsm.so.2 file path=usr/share/man/man3lib/librsm.3lib file path=usr/share/man/man3rsm/rsm_create_localmemory_handle.3rsm @@ -62,5 +62,5 @@ file path=usr/share/man/man3rsm/rsm_memseg_import_putv.3rsm file path=usr/share/man/man3rsm/rsm_memseg_import_set_mode.3rsm license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL -link path=usr/lib/$(ARCH64)/librsm.so target=librsm.so.2 +link path=usr/lib/$(ARCH32)/librsm.so target=librsm.so.2 link path=usr/lib/librsm.so target=librsm.so.2 diff --git a/usr/src/pkg/manifests/system-storage-sasinfo.mf b/usr/src/pkg/manifests/system-storage-sasinfo.mf index ae6c600ce7..2468a5a26f 100644 --- a/usr/src/pkg/manifests/system-storage-sasinfo.mf +++ b/usr/src/pkg/manifests/system-storage-sasinfo.mf @@ -41,7 +41,7 @@ dir path=etc group=sys dir path=usr group=sys dir path=usr/include dir path=usr/lib -dir path=usr/lib/$(ARCH64) +dir path=usr/lib/$(ARCH32) dir path=usr/sbin dir path=usr/share/man dir path=usr/share/man/man3lib @@ -49,8 +49,8 @@ dir path=usr/share/man/man4 dir path=usr/share/man/man8 file path=etc/smhba.conf group=sys preserve=true file path=usr/include/smhbaapi.h -file path=usr/lib/$(ARCH64)/libSMHBAAPI.so.1 -file path=usr/lib/$(ARCH64)/libsun_sas.so.1 +file path=usr/lib/$(ARCH32)/libSMHBAAPI.so.1 +file path=usr/lib/$(ARCH32)/libsun_sas.so.1 file path=usr/lib/libSMHBAAPI.so.1 file path=usr/lib/libsun_sas.so.1 file path=usr/sbin/sasinfo mode=0555 @@ -61,7 +61,7 @@ license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL license usr/src/lib/smhba/THIRDPARTYLICENSE \ license=usr/src/lib/smhba/THIRDPARTYLICENSE -link path=usr/lib/$(ARCH64)/libSMHBAAPI.so target=libSMHBAAPI.so.1 -link path=usr/lib/$(ARCH64)/libsun_sas.so target=libsun_sas.so.1 +link path=usr/lib/$(ARCH32)/libSMHBAAPI.so target=libSMHBAAPI.so.1 +link path=usr/lib/$(ARCH32)/libsun_sas.so target=libsun_sas.so.1 link path=usr/lib/libSMHBAAPI.so target=libSMHBAAPI.so.1 link path=usr/lib/libsun_sas.so target=libsun_sas.so.1 diff --git a/usr/src/pkg/manifests/system-zones-brand-sn1.mf b/usr/src/pkg/manifests/system-zones-brand-sn1.mf index bf623af9d1..076b4192ba 100644 --- a/usr/src/pkg/manifests/system-zones-brand-sn1.mf +++ b/usr/src/pkg/manifests/system-zones-brand-sn1.mf @@ -35,13 +35,13 @@ dir path=usr group=sys dir path=usr/kernel group=sys dir path=usr/kernel/brand group=sys dir path=usr/lib -dir path=usr/lib/$(ARCH64) +dir path=usr/lib/$(ARCH32) dir path=usr/lib/brand dir path=usr/lib/brand/sn1 group=sys dir path=usr/lib/brand/sn1/$(ARCH64) file path=etc/zones/SUNWsn1.xml mode=0444 file path=usr/kernel/brand/sn1_brand group=sys mode=0755 -file path=usr/lib/$(ARCH64)/sn1_brand.so.1 +file path=usr/lib/$(ARCH32)/sn1_brand.so.1 file path=usr/lib/brand/sn1/$(ARCH64)/sn1_librtld_db.so.1 file path=usr/lib/brand/sn1/config.xml mode=0444 file path=usr/lib/brand/sn1/platform.xml mode=0444 diff --git a/usr/src/pkg/manifests/system-zones.inc b/usr/src/pkg/manifests/system-zones.inc index 416a1bc045..3269a676b0 100644 --- a/usr/src/pkg/manifests/system-zones.inc +++ b/usr/src/pkg/manifests/system-zones.inc @@ -36,7 +36,7 @@ dir path=usr/bin dir path=usr/kernel group=sys dir path=usr/kernel/drv group=sys dir path=usr/lib -dir path=usr/lib/$(ARCH64) +dir path=usr/lib/$(ARCH32) dir path=usr/lib/brand dir path=usr/lib/brand/ipkg group=bin dir path=usr/lib/brand/shared group=sys @@ -69,9 +69,9 @@ file path=lib/svc/method/svc-zonestat mode=0555 \ variant.opensolaris.zone=global file path=usr/bin/zonestat mode=0555 file path=usr/kernel/drv/zcons group=sys -file path=usr/lib/$(ARCH64)/libbrand.so.1 -file path=usr/lib/$(ARCH64)/libzonecfg.so.1 -file path=usr/lib/$(ARCH64)/libzonestat.so.1 +file path=usr/lib/$(ARCH32)/libbrand.so.1 +file path=usr/lib/$(ARCH32)/libzonecfg.so.1 +file path=usr/lib/$(ARCH32)/libzonestat.so.1 file path=usr/lib/brand/ipkg/config.xml mode=0444 file path=usr/lib/brand/ipkg/platform.xml mode=0444 file path=usr/lib/brand/shared/common.ksh mode=0444 -- 2.11.4.GIT