From 241c90a06e8d1708235651863df515a2d522a03a Mon Sep 17 00:00:00 2001 From: Richard Lowe Date: Thu, 26 Mar 2020 21:07:34 -0400 Subject: 12454 remove lint library machinery Reviewed by: Andy Fiddaman Reviewed by: Gordon Ross Approved by: Dan McDonald --- usr/src/lib/libc/Makefile | 2 -- usr/src/lib/libc/capabilities/Makefile | 1 - usr/src/lib/libc/capabilities/sun4u-opl/Makefile | 1 - usr/src/lib/libc/capabilities/sun4u-us3-hwcap1/Makefile | 1 - usr/src/lib/libc/capabilities/sun4u-us3-hwcap2/Makefile | 1 - usr/src/lib/libc/capabilities/sun4u/Makefile | 1 - usr/src/lib/libc/capabilities/sun4v-hwcap1/Makefile | 1 - usr/src/lib/libc/capabilities/sun4v-hwcap2/Makefile | 1 - usr/src/lib/libc/i386/etc/Makefile | 2 -- 9 files changed, 11 deletions(-) (limited to 'usr/src/lib/libc') diff --git a/usr/src/lib/libc/Makefile b/usr/src/lib/libc/Makefile index ca51968519..7853c742c5 100644 --- a/usr/src/lib/libc/Makefile +++ b/usr/src/lib/libc/Makefile @@ -209,7 +209,6 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint .PARALLEL: $(SUBDIRS) @@ -221,7 +220,6 @@ clobber: $(SUBDIRS) etc clobber_local clobber_local: $(RM) $(CLOBBERFILES) -lint: _msg: $(MSGDOMAIN) catalog diff --git a/usr/src/lib/libc/capabilities/Makefile b/usr/src/lib/libc/capabilities/Makefile index ab390454fd..ca514f03e9 100644 --- a/usr/src/lib/libc/capabilities/Makefile +++ b/usr/src/lib/libc/capabilities/Makefile @@ -47,7 +47,6 @@ install := TARGET= install all clean clobber install: \ $(SUBDIRS) -lint: $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/libc/capabilities/sun4u-opl/Makefile b/usr/src/lib/libc/capabilities/sun4u-opl/Makefile index 247f7c3456..cccb8eeab5 100644 --- a/usr/src/lib/libc/capabilities/sun4u-opl/Makefile +++ b/usr/src/lib/libc/capabilities/sun4u-opl/Makefile @@ -37,7 +37,6 @@ install := TARGET= install all clean clobber install: \ $(SUBDIRS) -lint: $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/libc/capabilities/sun4u-us3-hwcap1/Makefile b/usr/src/lib/libc/capabilities/sun4u-us3-hwcap1/Makefile index 77aed04fa7..dddbce3b10 100644 --- a/usr/src/lib/libc/capabilities/sun4u-us3-hwcap1/Makefile +++ b/usr/src/lib/libc/capabilities/sun4u-us3-hwcap1/Makefile @@ -39,7 +39,6 @@ install := TARGET= install all clean clobber install: \ $(SUBDIRS) -lint: $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/libc/capabilities/sun4u-us3-hwcap2/Makefile b/usr/src/lib/libc/capabilities/sun4u-us3-hwcap2/Makefile index 77aed04fa7..dddbce3b10 100644 --- a/usr/src/lib/libc/capabilities/sun4u-us3-hwcap2/Makefile +++ b/usr/src/lib/libc/capabilities/sun4u-us3-hwcap2/Makefile @@ -39,7 +39,6 @@ install := TARGET= install all clean clobber install: \ $(SUBDIRS) -lint: $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/libc/capabilities/sun4u/Makefile b/usr/src/lib/libc/capabilities/sun4u/Makefile index 77aed04fa7..dddbce3b10 100644 --- a/usr/src/lib/libc/capabilities/sun4u/Makefile +++ b/usr/src/lib/libc/capabilities/sun4u/Makefile @@ -39,7 +39,6 @@ install := TARGET= install all clean clobber install: \ $(SUBDIRS) -lint: $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/libc/capabilities/sun4v-hwcap1/Makefile b/usr/src/lib/libc/capabilities/sun4v-hwcap1/Makefile index a23938e6d9..44ad706cab 100644 --- a/usr/src/lib/libc/capabilities/sun4v-hwcap1/Makefile +++ b/usr/src/lib/libc/capabilities/sun4v-hwcap1/Makefile @@ -38,7 +38,6 @@ install := TARGET= install all clean clobber install: \ $(SUBDIRS) -lint: $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/libc/capabilities/sun4v-hwcap2/Makefile b/usr/src/lib/libc/capabilities/sun4v-hwcap2/Makefile index 77aed04fa7..dddbce3b10 100644 --- a/usr/src/lib/libc/capabilities/sun4v-hwcap2/Makefile +++ b/usr/src/lib/libc/capabilities/sun4v-hwcap2/Makefile @@ -39,7 +39,6 @@ install := TARGET= install all clean clobber install: \ $(SUBDIRS) -lint: $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/libc/i386/etc/Makefile b/usr/src/lib/libc/i386/etc/Makefile index 98506e66f6..616190a7e8 100644 --- a/usr/src/lib/libc/i386/etc/Makefile +++ b/usr/src/lib/libc/i386/etc/Makefile @@ -35,7 +35,6 @@ all:= TARGET= all install:= TARGET= install clean:= TARGET= clean clobber:= TARGET= clobber -lint:= TARGET= lint ROOTETC= $(ROOT)/etc ETCFLASHD= $(ROOTETC)/flash @@ -61,7 +60,6 @@ install: all .WAIT $(DIRS) .WAIT $(ETCFLASHPREPROG) cstyle: -lint: $(FLASHPREPROG): $(FLASHPRESRC) $(CP) $@.ksh $@ -- cgit v1.2.3 From cd61ae21816e53b94bc1673f3f1aa651fc3115e8 Mon Sep 17 00:00:00 2001 From: Richard Lowe Date: Thu, 4 Jul 2019 01:48:24 +0000 Subject: 12447 should install library compat symlinks from library makefiles, not Targetdirs Reviewed by: Gordon Ross Reviewed by: Robert Mustacchi Approved by: Dan McDonald --- usr/src/Targetdirs | 858 ------------------------- usr/src/cmd/sgs/Makefile.targ | 12 - usr/src/cmd/sgs/Makefile.var | 5 - usr/src/cmd/sgs/lex/Makefile.com | 7 + usr/src/cmd/sgs/lex/Makefile.targ | 3 + usr/src/cmd/sgs/lex/amd64/Makefile | 4 +- usr/src/cmd/sgs/lex/i386/Makefile | 2 +- usr/src/cmd/sgs/lex/sparc/Makefile | 2 +- usr/src/cmd/sgs/lex/sparcv9/Makefile | 6 +- usr/src/cmd/sgs/libdl/Makefile.com | 3 + usr/src/cmd/sgs/libdl/amd64/Makefile | 3 +- usr/src/cmd/sgs/libdl/i386/Makefile | 2 +- usr/src/cmd/sgs/libdl/sparc/Makefile | 2 +- usr/src/cmd/sgs/libdl/sparcv9/Makefile | 3 +- usr/src/cmd/sgs/libelf/Makefile.com | 8 +- usr/src/cmd/sgs/libelf/amd64/Makefile | 2 +- usr/src/cmd/sgs/libelf/i386/Makefile | 4 +- usr/src/cmd/sgs/libelf/sparc/Makefile | 4 +- usr/src/cmd/sgs/libelf/sparcv9/Makefile | 2 +- usr/src/cmd/sgs/liblddbg/Makefile.com | 7 +- usr/src/cmd/sgs/liblddbg/amd64/Makefile | 7 +- usr/src/cmd/sgs/liblddbg/i386/Makefile | 4 +- usr/src/cmd/sgs/liblddbg/sparc/Makefile | 4 +- usr/src/cmd/sgs/liblddbg/sparcv9/Makefile | 9 +- usr/src/cmd/sgs/librtld/Makefile.com | 8 +- usr/src/cmd/sgs/librtld/amd64/Makefile | 5 +- usr/src/cmd/sgs/librtld/i386/Makefile | 2 +- usr/src/cmd/sgs/librtld/sparc/Makefile | 2 +- usr/src/cmd/sgs/librtld/sparcv9/Makefile | 5 +- usr/src/cmd/sgs/librtld_db/Makefile.com | 1 + usr/src/cmd/sgs/librtld_db/amd64/Makefile | 2 +- usr/src/cmd/sgs/librtld_db/i386/Makefile | 2 +- usr/src/cmd/sgs/librtld_db/sparc/Makefile | 2 +- usr/src/cmd/sgs/librtld_db/sparcv9/Makefile | 2 +- usr/src/cmd/sgs/rtld/Makefile.com | 8 + usr/src/cmd/sgs/rtld/amd64/Makefile | 2 +- usr/src/cmd/sgs/rtld/i386/Makefile | 2 +- usr/src/cmd/sgs/rtld/sparc/Makefile | 2 +- usr/src/cmd/sgs/rtld/sparcv9/Makefile | 2 +- usr/src/cmd/sgs/yacc/Makefile.com | 7 + usr/src/cmd/sgs/yacc/Makefile.targ | 3 + usr/src/cmd/sgs/yacc/amd64/Makefile | 4 +- usr/src/cmd/sgs/yacc/i386/Makefile | 2 +- usr/src/cmd/sgs/yacc/sparc/Makefile | 2 +- usr/src/cmd/sgs/yacc/sparcv9/Makefile | 6 +- usr/src/lib/Makefile.lib | 16 +- usr/src/lib/Makefile.mach | 10 +- usr/src/lib/Makefile.rootfs | 20 +- usr/src/lib/Makefile.targ | 10 +- usr/src/lib/README.Makefiles | 17 + usr/src/lib/crt/Makefile.com | 36 +- usr/src/lib/crt/amd64/Makefile | 2 +- usr/src/lib/crt/i386/Makefile | 2 +- usr/src/lib/crt/sparc/Makefile | 2 +- usr/src/lib/crt/sparcv9/Makefile | 2 +- usr/src/lib/fm/libfmevent/Makefile.com | 15 + usr/src/lib/fm/libfmevent/amd64/Makefile | 2 +- usr/src/lib/fm/libfmevent/i386/Makefile | 2 +- usr/src/lib/fm/libfmevent/sparc/Makefile | 2 +- usr/src/lib/fm/libfmevent/sparcv9/Makefile | 2 +- usr/src/lib/libadm/amd64/Makefile | 4 +- usr/src/lib/libadm/i386/Makefile | 2 +- usr/src/lib/libadm/sparc/Makefile | 2 +- usr/src/lib/libadm/sparcv9/Makefile | 4 +- usr/src/lib/libaio/amd64/Makefile | 3 +- usr/src/lib/libaio/i386/Makefile | 3 +- usr/src/lib/libaio/sparc/Makefile | 3 +- usr/src/lib/libaio/sparcv9/Makefile | 3 +- usr/src/lib/libavl/amd64/Makefile | 4 +- usr/src/lib/libavl/i386/Makefile | 2 +- usr/src/lib/libavl/sparc/Makefile | 2 +- usr/src/lib/libavl/sparcv9/Makefile | 4 +- usr/src/lib/libbsm/amd64/Makefile | 4 +- usr/src/lib/libbsm/i386/Makefile | 2 +- usr/src/lib/libbsm/sparc/Makefile | 2 +- usr/src/lib/libbsm/sparcv9/Makefile | 4 +- usr/src/lib/libc/Makefile | 21 +- usr/src/lib/libc_db/amd64/Makefile | 3 +- usr/src/lib/libc_db/i386/Makefile | 3 +- usr/src/lib/libc_db/sparc/Makefile | 3 +- usr/src/lib/libc_db/sparcv9/Makefile | 3 +- usr/src/lib/libcmdutils/amd64/Makefile | 4 +- usr/src/lib/libcmdutils/i386/Makefile | 2 +- usr/src/lib/libcmdutils/sparc/Makefile | 2 +- usr/src/lib/libcmdutils/sparcv9/Makefile | 4 +- usr/src/lib/libcontract/amd64/Makefile | 2 +- usr/src/lib/libcontract/i386/Makefile | 2 +- usr/src/lib/libcontract/sparc/Makefile | 2 +- usr/src/lib/libcontract/sparcv9/Makefile | 4 +- usr/src/lib/libcrypt/Makefile.com | 36 +- usr/src/lib/libcrypt/amd64/Makefile | 2 +- usr/src/lib/libcrypt/i386/Makefile | 2 +- usr/src/lib/libcrypt/sparc/Makefile | 2 +- usr/src/lib/libcrypt/sparcv9/Makefile | 5 +- usr/src/lib/libctf/amd64/Makefile | 2 +- usr/src/lib/libctf/i386/Makefile | 2 +- usr/src/lib/libctf/sparc/Makefile | 2 +- usr/src/lib/libctf/sparcv9/Makefile | 2 +- usr/src/lib/libcurses/Makefile.com | 49 +- usr/src/lib/libcurses/amd64/Makefile | 2 +- usr/src/lib/libcurses/i386/Makefile | 2 +- usr/src/lib/libcurses/sparc/Makefile | 2 +- usr/src/lib/libcurses/sparcv9/Makefile | 2 +- usr/src/lib/libdevice/amd64/Makefile | 4 +- usr/src/lib/libdevice/i386/Makefile | 2 +- usr/src/lib/libdevice/sparc/Makefile | 2 +- usr/src/lib/libdevice/sparcv9/Makefile | 4 +- usr/src/lib/libdevid/amd64/Makefile | 2 +- usr/src/lib/libdevid/i386/Makefile | 2 +- usr/src/lib/libdevid/sparc/Makefile | 2 +- usr/src/lib/libdevid/sparcv9/Makefile | 4 +- usr/src/lib/libdevinfo/amd64/Makefile | 4 +- usr/src/lib/libdevinfo/i386/Makefile | 2 +- usr/src/lib/libdevinfo/sparc/Makefile | 2 +- usr/src/lib/libdevinfo/sparcv9/Makefile | 4 +- usr/src/lib/libdhcpagent/amd64/Makefile | 2 +- usr/src/lib/libdhcpagent/i386/Makefile | 2 +- usr/src/lib/libdhcpagent/sparc/Makefile | 2 +- usr/src/lib/libdhcpagent/sparcv9/Makefile | 2 +- usr/src/lib/libdhcputil/amd64/Makefile | 2 +- usr/src/lib/libdhcputil/i386/Makefile | 2 +- usr/src/lib/libdhcputil/sparc/Makefile | 2 +- usr/src/lib/libdhcputil/sparcv9/Makefile | 2 +- usr/src/lib/libdlpi/amd64/Makefile | 4 +- usr/src/lib/libdlpi/i386/Makefile | 2 +- usr/src/lib/libdlpi/sparc/Makefile | 2 +- usr/src/lib/libdlpi/sparcv9/Makefile | 4 +- usr/src/lib/libdoor/amd64/Makefile | 3 +- usr/src/lib/libdoor/i386/Makefile | 3 +- usr/src/lib/libdoor/sparc/Makefile | 3 +- usr/src/lib/libdoor/sparcv9/Makefile | 3 +- usr/src/lib/libdscp/sparc/Makefile | 2 +- usr/src/lib/libdwarf/amd64/Makefile | 2 +- usr/src/lib/libdwarf/i386/Makefile | 2 +- usr/src/lib/libdwarf/sparc/Makefile | 2 +- usr/src/lib/libdwarf/sparcv9/Makefile | 2 +- usr/src/lib/libefi/amd64/Makefile | 2 +- usr/src/lib/libefi/i386/Makefile | 2 +- usr/src/lib/libefi/sparc/Makefile | 2 +- usr/src/lib/libefi/sparcv9/Makefile | 2 +- usr/src/lib/libeti/form/Makefile.com | 7 + usr/src/lib/libeti/form/amd64/Makefile | 2 +- usr/src/lib/libeti/form/i386/Makefile | 3 +- usr/src/lib/libeti/form/sparc/Makefile | 3 +- usr/src/lib/libeti/form/sparcv9/Makefile | 2 +- usr/src/lib/libeti/menu/Makefile.com | 7 + usr/src/lib/libeti/menu/amd64/Makefile | 4 +- usr/src/lib/libeti/menu/i386/Makefile | 3 +- usr/src/lib/libeti/menu/sparc/Makefile | 3 +- usr/src/lib/libeti/menu/sparcv9/Makefile | 4 +- usr/src/lib/libeti/panel/Makefile.com | 7 + usr/src/lib/libeti/panel/amd64/Makefile | 4 +- usr/src/lib/libeti/panel/i386/Makefile | 3 +- usr/src/lib/libeti/panel/sparc/Makefile | 3 +- usr/src/lib/libeti/panel/sparcv9/Makefile | 4 +- usr/src/lib/libfakekernel/amd64/Makefile | 2 +- usr/src/lib/libfakekernel/i386/Makefile | 2 +- usr/src/lib/libfakekernel/sparc/Makefile | 2 +- usr/src/lib/libfakekernel/sparcv9/Makefile | 2 +- usr/src/lib/libfdisk/amd64/Makefile | 2 +- usr/src/lib/libfdisk/i386/Makefile | 2 +- usr/src/lib/libfdisk/sparcv9/Makefile | 2 +- usr/src/lib/libgen/Makefile.com | 7 + usr/src/lib/libgen/amd64/Makefile | 2 +- usr/src/lib/libgen/i386/Makefile | 2 +- usr/src/lib/libgen/sparc/Makefile | 2 +- usr/src/lib/libgen/sparcv9/Makefile | 2 +- usr/src/lib/libinetutil/amd64/Makefile | 4 +- usr/src/lib/libinetutil/i386/Makefile | 2 +- usr/src/lib/libinetutil/sparc/Makefile | 2 +- usr/src/lib/libinetutil/sparcv9/Makefile | 4 +- usr/src/lib/libintl/amd64/Makefile | 3 +- usr/src/lib/libintl/i386/Makefile | 3 +- usr/src/lib/libintl/sparc/Makefile | 3 +- usr/src/lib/libintl/sparcv9/Makefile | 3 +- usr/src/lib/libkstat/amd64/Makefile | 4 +- usr/src/lib/libkstat/i386/Makefile | 2 +- usr/src/lib/libkstat/sparc/Makefile | 2 +- usr/src/lib/libkstat/sparcv9/Makefile | 4 +- usr/src/lib/libm/amd64/Makefile | 2 +- usr/src/lib/libm/i386/Makefile | 2 +- usr/src/lib/libm/sparc/Makefile | 2 +- usr/src/lib/libm/sparcv9/Makefile | 2 +- usr/src/lib/libm1/Makefile.com | 3 + usr/src/lib/libm1/amd64/Makefile | 2 +- usr/src/lib/libm1/i386/Makefile | 2 +- usr/src/lib/libm1/sparc/Makefile | 2 +- usr/src/lib/libm1/sparcv9/Makefile | 2 +- usr/src/lib/libmalloc/Makefile.com | 7 + usr/src/lib/libmalloc/amd64/Makefile | 4 +- usr/src/lib/libmalloc/i386/Makefile | 3 +- usr/src/lib/libmalloc/sparc/Makefile | 3 +- usr/src/lib/libmalloc/sparcv9/Makefile | 4 +- usr/src/lib/libmd/amd64/Makefile | 3 +- usr/src/lib/libmd/i386/Makefile | 2 +- usr/src/lib/libmd/sparc/Makefile | 2 +- usr/src/lib/libmd/sparcv9/Makefile | 2 +- usr/src/lib/libmd5/amd64/Makefile | 3 +- usr/src/lib/libmd5/i386/Makefile | 3 +- usr/src/lib/libmd5/sparc/Makefile | 3 +- usr/src/lib/libmd5/sparcv9/Makefile | 3 +- usr/src/lib/libmp/Makefile.com | 3 + usr/src/lib/libmp/amd64/Makefile | 4 +- usr/src/lib/libmp/i386/Makefile | 5 +- usr/src/lib/libmp/sparc/Makefile | 5 +- usr/src/lib/libmp/sparcv9/Makefile | 4 +- usr/src/lib/libmvec/amd64/Makefile | 6 +- usr/src/lib/libmvec/i386/Makefile | 6 +- usr/src/lib/libmvec/sparc/Makefile | 6 +- usr/src/lib/libmvec/sparcv9/Makefile | 6 +- usr/src/lib/libnsl/amd64/Makefile | 4 +- usr/src/lib/libnsl/i386/Makefile | 2 +- usr/src/lib/libnsl/sparc/Makefile | 2 +- usr/src/lib/libnsl/sparcv9/Makefile | 2 +- usr/src/lib/libnvpair/amd64/Makefile | 4 +- usr/src/lib/libnvpair/i386/Makefile | 2 +- usr/src/lib/libnvpair/sparc/Makefile | 2 +- usr/src/lib/libnvpair/sparcv9/Makefile | 4 +- usr/src/lib/libpam/amd64/Makefile | 4 +- usr/src/lib/libpam/i386/Makefile | 2 +- usr/src/lib/libpam/sparc/Makefile | 2 +- usr/src/lib/libpam/sparcv9/Makefile | 4 +- usr/src/lib/libproc/amd64/Makefile | 2 +- usr/src/lib/libproc/i386/Makefile | 2 +- usr/src/lib/libproc/sparc/Makefile | 2 +- usr/src/lib/libproc/sparcv9/Makefile | 2 +- usr/src/lib/libpthread/amd64/Makefile | 3 +- usr/src/lib/libpthread/i386/Makefile | 3 +- usr/src/lib/libpthread/sparc/Makefile | 3 +- usr/src/lib/libpthread/sparcv9/Makefile | 3 +- usr/src/lib/librcm/amd64/Makefile | 4 +- usr/src/lib/librcm/i386/Makefile | 2 +- usr/src/lib/librcm/sparc/Makefile | 2 +- usr/src/lib/librcm/sparcv9/Makefile | 4 +- usr/src/lib/libresolv/Makefile | 4 +- usr/src/lib/libresolv2/amd64/Makefile | 4 +- usr/src/lib/libresolv2/i386/Makefile | 2 +- usr/src/lib/libresolv2/sparc/Makefile | 2 +- usr/src/lib/libresolv2/sparcv9/Makefile | 2 +- usr/src/lib/librestart/amd64/Makefile | 2 +- usr/src/lib/librestart/i386/Makefile | 2 +- usr/src/lib/librestart/sparc/Makefile | 2 +- usr/src/lib/librestart/sparcv9/Makefile | 2 +- usr/src/lib/librpcsvc/amd64/Makefile | 4 +- usr/src/lib/librpcsvc/i386/Makefile | 2 +- usr/src/lib/librpcsvc/sparc/Makefile | 2 +- usr/src/lib/librpcsvc/sparcv9/Makefile | 4 +- usr/src/lib/librt/Makefile.com | 25 + usr/src/lib/librt/amd64/Makefile | 3 +- usr/src/lib/librt/i386/Makefile | 3 +- usr/src/lib/librt/sparc/Makefile | 3 +- usr/src/lib/librt/sparcv9/Makefile | 3 +- usr/src/lib/libscf/amd64/Makefile | 2 +- usr/src/lib/libscf/i386/Makefile | 2 +- usr/src/lib/libscf/sparc/Makefile | 2 +- usr/src/lib/libscf/sparcv9/Makefile | 2 +- usr/src/lib/libsec/amd64/Makefile | 2 +- usr/src/lib/libsec/i386/Makefile | 2 +- usr/src/lib/libsec/sparc/Makefile | 2 +- usr/src/lib/libsec/sparcv9/Makefile | 2 +- usr/src/lib/libsecdb/amd64/Makefile | 4 +- usr/src/lib/libsecdb/i386/Makefile | 2 +- usr/src/lib/libsecdb/sparc/Makefile | 2 +- usr/src/lib/libsecdb/sparcv9/Makefile | 4 +- usr/src/lib/libsendfile/amd64/Makefile | 4 +- usr/src/lib/libsendfile/i386/Makefile | 2 +- usr/src/lib/libsendfile/sparc/Makefile | 2 +- usr/src/lib/libsendfile/sparcv9/Makefile | 4 +- usr/src/lib/libsocket/amd64/Makefile | 4 +- usr/src/lib/libsocket/i386/Makefile | 2 +- usr/src/lib/libsocket/sparc/Makefile | 2 +- usr/src/lib/libsocket/sparcv9/Makefile | 4 +- usr/src/lib/libsysevent/amd64/Makefile | 2 +- usr/src/lib/libsysevent/i386/Makefile | 2 +- usr/src/lib/libsysevent/sparc/Makefile | 2 +- usr/src/lib/libsysevent/sparcv9/Makefile | 2 +- usr/src/lib/libtermcap/Makefile.com | 12 +- usr/src/lib/libtermcap/amd64/Makefile | 4 +- usr/src/lib/libtermcap/i386/Makefile | 2 +- usr/src/lib/libtermcap/sparc/Makefile | 2 +- usr/src/lib/libtermcap/sparcv9/Makefile | 4 +- usr/src/lib/libthread/Makefile.com | 31 + usr/src/lib/libthread/amd64/Makefile | 3 +- usr/src/lib/libthread/i386/Makefile | 3 +- usr/src/lib/libthread/sparc/Makefile | 3 +- usr/src/lib/libthread/sparcv9/Makefile | 3 +- usr/src/lib/libtsnet/amd64/Makefile | 2 +- usr/src/lib/libtsnet/i386/Makefile | 2 +- usr/src/lib/libtsnet/sparc/Makefile | 2 +- usr/src/lib/libtsnet/sparcv9/Makefile | 2 +- usr/src/lib/libtsol/amd64/Makefile | 2 +- usr/src/lib/libtsol/i386/Makefile | 3 +- usr/src/lib/libtsol/sparc/Makefile | 2 +- usr/src/lib/libtsol/sparcv9/Makefile | 2 +- usr/src/lib/libumem/Makefile.com | 2 +- usr/src/lib/libumem/amd64/Makefile | 3 +- usr/src/lib/libumem/sparcv9/Makefile | 3 +- usr/src/lib/libuuid/amd64/Makefile | 2 +- usr/src/lib/libuuid/i386/Makefile | 2 +- usr/src/lib/libuuid/sparc/Makefile | 2 +- usr/src/lib/libuuid/sparcv9/Makefile | 2 +- usr/src/lib/libuutil/amd64/Makefile | 2 +- usr/src/lib/libuutil/i386/Makefile | 2 +- usr/src/lib/libuutil/sparc/Makefile | 2 +- usr/src/lib/libuutil/sparcv9/Makefile | 2 +- usr/src/lib/libw/amd64/Makefile | 3 +- usr/src/lib/libw/i386/Makefile | 2 +- usr/src/lib/libw/sparc/Makefile | 2 +- usr/src/lib/libw/sparcv9/Makefile | 3 +- usr/src/lib/libxnet/amd64/Makefile | 3 +- usr/src/lib/libxnet/i386/Makefile | 3 +- usr/src/lib/libxnet/sparc/Makefile | 3 +- usr/src/lib/libxnet/sparcv9/Makefile | 3 +- usr/src/lib/libzfs/amd64/Makefile | 4 +- usr/src/lib/libzfs/i386/Makefile | 2 +- usr/src/lib/libzfs/sparc/Makefile | 2 +- usr/src/lib/libzfs/sparcv9/Makefile | 2 +- usr/src/lib/libzfs_core/amd64/Makefile | 2 +- usr/src/lib/libzfs_core/i386/Makefile | 2 +- usr/src/lib/libzfs_core/sparc/Makefile | 2 +- usr/src/lib/libzfs_core/sparcv9/Makefile | 2 +- usr/src/lib/libzutil/amd64/Makefile | 2 +- usr/src/lib/libzutil/i386/Makefile | 2 +- usr/src/lib/libzutil/sparc/Makefile | 2 +- usr/src/lib/libzutil/sparcv9/Makefile | 2 +- usr/src/lib/nsswitch/compat/Makefile.com | 14 +- usr/src/lib/nsswitch/compat/amd64/Makefile | 4 +- usr/src/lib/nsswitch/compat/i386/Makefile | 4 +- usr/src/lib/nsswitch/compat/sparc/Makefile | 4 +- usr/src/lib/nsswitch/compat/sparcv9/Makefile | 4 +- usr/src/lib/nsswitch/dns/Makefile.com | 11 +- usr/src/lib/nsswitch/dns/amd64/Makefile | 4 +- usr/src/lib/nsswitch/dns/i386/Makefile | 4 +- usr/src/lib/nsswitch/dns/sparc/Makefile | 4 +- usr/src/lib/nsswitch/dns/sparcv9/Makefile | 4 +- usr/src/lib/nsswitch/files/Makefile.com | 14 + usr/src/lib/nsswitch/files/amd64/Makefile | 4 +- usr/src/lib/nsswitch/files/i386/Makefile | 4 +- usr/src/lib/nsswitch/files/sparc/Makefile | 4 +- usr/src/lib/nsswitch/files/sparcv9/Makefile | 4 +- usr/src/lib/nsswitch/nis/Makefile.com | 10 +- usr/src/lib/nsswitch/nis/amd64/Makefile | 4 +- usr/src/lib/nsswitch/nis/i386/Makefile | 4 +- usr/src/lib/nsswitch/nis/sparc/Makefile | 4 +- usr/src/lib/nsswitch/nis/sparcv9/Makefile | 4 +- usr/src/lib/nsswitch/user/Makefile.com | 11 +- usr/src/lib/nsswitch/user/amd64/Makefile | 4 +- usr/src/lib/nsswitch/user/i386/Makefile | 4 +- usr/src/lib/nsswitch/user/sparc/Makefile | 4 +- usr/src/lib/nsswitch/user/sparcv9/Makefile | 4 +- usr/src/lib/print/libhttp-core/Makefile.com | 1 - usr/src/lib/print/libipp-core/Makefile.com | 3 - usr/src/lib/print/libipp-listener/Makefile.com | 3 - usr/src/lib/print/libpapi-common/Makefile.com | 3 - usr/src/lib/print/libpapi-dynamic/Makefile.com | 3 - usr/src/lib/print/libpapi-ipp/Makefile.com | 2 - usr/src/lib/print/libpapi-lpd/Makefile.com | 1 - usr/src/lib/print/libprint/Makefile.com | 3 - usr/src/lib/storage/libg_fc/sparcv9/Makefile | 2 +- 359 files changed, 817 insertions(+), 1408 deletions(-) (limited to 'usr/src/lib/libc') diff --git a/usr/src/Targetdirs b/usr/src/Targetdirs index 32863f0e42..f8c65e8829 100644 --- a/usr/src/Targetdirs +++ b/usr/src/Targetdirs @@ -41,9 +41,6 @@ DIRLINKS= $(SYM.DIRS) $(BUILD64) DIRLINKS += $(SYM.DIRS64) -FILELINKS= $(SYM.USRCCSLIB) $(SYM.USRLIB) -$(BUILD64) FILELINKS += $(SYM.USRCCSLIB64) $(SYM.USRLIB64) - TARGETDIRS= $(DIRS) $(BUILD64) TARGETDIRS += $(DIRS64) @@ -500,9 +497,6 @@ SYM.DIRS= \ /dev/stdin \ /dev/stdout \ /dev/stderr \ - /etc/lib/ld.so.1 \ - /etc/lib/libdl.so.1 \ - /etc/lib/nss_files.so.1 \ /etc/log \ /lib/32 \ /lib/crypto/32 \ @@ -617,9 +611,6 @@ $(ROOT)/usr/pub:= LINKDEST=share/lib/pub $(ROOT)/usr/man:= LINKDEST=share/man $(ROOT)/usr/src:= LINKDEST=share/src $(ROOT)/usr/adm:= LINKDEST=../var/adm -$(ROOT)/etc/lib/ld.so.1:= LINKDEST=../../lib/ld.so.1 -$(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)/etc/log:= LINKDEST=../var/adm/log $(ROOT)/usr/mail:= LINKDEST=../var/mail $(ROOT)/usr/news:= LINKDEST=../var/news @@ -658,852 +649,3 @@ $(BUILD64) $(ROOT)/usr/ucblib/64:= LINKDEST=$(MACH64) # $(DIRLINKS:%=$(ROOT)%):= \ INS.dir= -$(RM) -r $@; $(SYMLINK) $(LINKDEST) $@ - -# Special symlinks to populate usr/ccs/lib, whose objects -# have actually been moved to usr/lib -# Rather than adding another set of rules, we add usr/lib/lwp files here -$(ROOT)/usr/ccs/lib/libcurses.so:= REALPATH=../../../lib/libcurses.so.1 -$(ROOT)/usr/ccs/lib/libform.so:= REALPATH=../../lib/libform.so.1 -$(ROOT)/usr/ccs/lib/libgen.so:= REALPATH=../../../lib/libgen.so.1 -$(ROOT)/usr/ccs/lib/libmalloc.so:= REALPATH=../../lib/libmalloc.so.1 -$(ROOT)/usr/ccs/lib/libmenu.so:= REALPATH=../../lib/libmenu.so.1 -$(ROOT)/usr/ccs/lib/libpanel.so:= REALPATH=../../lib/libpanel.so.1 -$(ROOT)/usr/ccs/lib/libtermlib.so:= REALPATH=../../../lib/libcurses.so.1 -$(ROOT)/usr/ccs/lib/libtermcap.so:= REALPATH=../../../lib/libtermcap.so.1 -$(ROOT)/usr/ccs/lib/values-Xa.o:= REALPATH=../../lib/values-Xa.o -$(ROOT)/usr/ccs/lib/values-Xc.o:= REALPATH=../../lib/values-Xc.o -$(ROOT)/usr/ccs/lib/values-Xs.o:= REALPATH=../../lib/values-Xs.o -$(ROOT)/usr/ccs/lib/values-Xt.o:= REALPATH=../../lib/values-Xt.o -$(ROOT)/usr/ccs/lib/values-xpg4.o:= REALPATH=../../lib/values-xpg4.o -$(ROOT)/usr/ccs/lib/values-xpg6.o:= REALPATH=../../lib/values-xpg6.o -$(ROOT)/usr/ccs/lib/libl.so:= REALPATH=../../lib/libl.so.1 -$(ROOT)/usr/ccs/lib/liby.so:= REALPATH=../../lib/liby.so.1 -$(ROOT)/usr/lib/lwp/libthread.so.1:= REALPATH=../libthread.so.1 -$(ROOT)/usr/lib/lwp/libthread_db.so.1:= REALPATH=../libthread_db.so.1 - -# symlinks to populate usr/ccs/lib/$(MACH64) -$(ROOT)/usr/ccs/lib/$(MACH64)/libcurses.so:= \ - REALPATH=../../../../lib/$(MACH64)/libcurses.so.1 -$(ROOT)/usr/ccs/lib/$(MACH64)/libform.so:= \ - REALPATH=../../../lib/$(MACH64)/libform.so.1 -$(ROOT)/usr/ccs/lib/$(MACH64)/libgen.so:= \ - REALPATH=../../../../lib/$(MACH64)/libgen.so.1 -$(ROOT)/usr/ccs/lib/$(MACH64)/libmalloc.so:= \ - REALPATH=../../../lib/$(MACH64)/libmalloc.so.1 -$(ROOT)/usr/ccs/lib/$(MACH64)/libmenu.so:= \ - REALPATH=../../../lib/$(MACH64)/libmenu.so.1 -$(ROOT)/usr/ccs/lib/$(MACH64)/libpanel.so:= \ - REALPATH=../../../lib/$(MACH64)/libpanel.so.1 -$(ROOT)/usr/ccs/lib/$(MACH64)/libtermlib.so:= \ - REALPATH=../../../../lib/$(MACH64)/libcurses.so.1 -$(ROOT)/usr/ccs/lib/$(MACH64)/libtermcap.so:= \ - REALPATH=../../../../lib/$(MACH64)/libtermcap.so.1 -$(ROOT)/usr/ccs/lib/$(MACH64)/values-Xa.o:= \ - REALPATH=../../../lib/$(MACH64)/values-Xa.o -$(ROOT)/usr/ccs/lib/$(MACH64)/values-Xc.o:= \ - REALPATH=../../../lib/$(MACH64)/values-Xc.o -$(ROOT)/usr/ccs/lib/$(MACH64)/values-Xs.o:= \ - REALPATH=../../../lib/$(MACH64)/values-Xs.o -$(ROOT)/usr/ccs/lib/$(MACH64)/values-Xt.o:= \ - REALPATH=../../../lib/$(MACH64)/values-Xt.o -$(ROOT)/usr/ccs/lib/$(MACH64)/values-xpg4.o:= \ - REALPATH=../../../lib/$(MACH64)/values-xpg4.o -$(ROOT)/usr/ccs/lib/$(MACH64)/values-xpg6.o:= \ - REALPATH=../../../lib/$(MACH64)/values-xpg6.o -$(ROOT)/usr/ccs/lib/$(MACH64)/libl.so:= \ - REALPATH=../../../lib/$(MACH64)/libl.so.1 -$(ROOT)/usr/ccs/lib/$(MACH64)/liby.so:= \ - REALPATH=../../../lib/$(MACH64)/liby.so.1 -$(ROOT)/usr/lib/lwp/$(MACH64)/libthread.so.1:= \ - REALPATH=../../$(MACH64)/libthread.so.1 -$(ROOT)/usr/lib/lwp/$(MACH64)/libthread_db.so.1:= \ - REALPATH=../../$(MACH64)/libthread_db.so.1 - -SYM.USRCCSLIB= \ - /usr/ccs/lib/libcurses.so \ - /usr/ccs/lib/libform.so \ - /usr/ccs/lib/libgen.so \ - /usr/ccs/lib/libmalloc.so \ - /usr/ccs/lib/libmenu.so \ - /usr/ccs/lib/libpanel.so \ - /usr/ccs/lib/libtermlib.so \ - /usr/ccs/lib/libtermcap.so \ - /usr/ccs/lib/values-Xa.o \ - /usr/ccs/lib/values-Xc.o \ - /usr/ccs/lib/values-Xs.o \ - /usr/ccs/lib/values-Xt.o \ - /usr/ccs/lib/values-xpg4.o \ - /usr/ccs/lib/values-xpg6.o \ - /usr/ccs/lib/libl.so \ - /usr/ccs/lib/liby.so \ - /usr/lib/lwp/libthread.so.1 \ - /usr/lib/lwp/libthread_db.so.1 - -SYM.USRCCSLIB64= \ - /usr/ccs/lib/$(MACH64)/libcurses.so \ - /usr/ccs/lib/$(MACH64)/libform.so \ - /usr/ccs/lib/$(MACH64)/libgen.so \ - /usr/ccs/lib/$(MACH64)/libmalloc.so \ - /usr/ccs/lib/$(MACH64)/libmenu.so \ - /usr/ccs/lib/$(MACH64)/libpanel.so \ - /usr/ccs/lib/$(MACH64)/libtermlib.so \ - /usr/ccs/lib/$(MACH64)/libtermcap.so \ - /usr/ccs/lib/$(MACH64)/values-Xa.o \ - /usr/ccs/lib/$(MACH64)/values-Xc.o \ - /usr/ccs/lib/$(MACH64)/values-Xs.o \ - /usr/ccs/lib/$(MACH64)/values-Xt.o \ - /usr/ccs/lib/$(MACH64)/values-xpg4.o \ - /usr/ccs/lib/$(MACH64)/values-xpg6.o \ - /usr/ccs/lib/$(MACH64)/libl.so \ - /usr/ccs/lib/$(MACH64)/liby.so \ - /usr/lib/lwp/$(MACH64)/libthread.so.1 \ - /usr/lib/lwp/$(MACH64)/libthread_db.so.1 - -# Special symlinks to direct libraries that have been moved -# from /usr/lib to /lib in order to live in the root filesystem. -$(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/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 -$(ROOT)/usr/lib/libaio.so:= REALPATH=../../lib/libaio.so.1 -$(ROOT)/usr/lib/libavl.so.1:= REALPATH=../../lib/libavl.so.1 -$(ROOT)/usr/lib/libavl.so:= REALPATH=../../lib/libavl.so.1 -$(ROOT)/usr/lib/libbsm.so.1:= REALPATH=../../lib/libbsm.so.1 -$(ROOT)/usr/lib/libbsm.so:= REALPATH=../../lib/libbsm.so.1 -$(ROOT)/usr/lib/libc.so.1:= REALPATH=../../lib/libc.so.1 -$(ROOT)/usr/lib/libc.so:= REALPATH=../../lib/libc.so.1 -$(ROOT)/usr/lib/libc_db.so.1:= REALPATH=../../lib/libc_db.so.1 -$(ROOT)/usr/lib/libc_db.so:= REALPATH=../../lib/libc_db.so.1 -$(ROOT)/usr/lib/libcmdutils.so.1:= REALPATH=../../lib/libcmdutils.so.1 -$(ROOT)/usr/lib/libcmdutils.so:= REALPATH=../../lib/libcmdutils.so.1 -$(ROOT)/usr/lib/libcontract.so.1:= REALPATH=../../lib/libcontract.so.1 -$(ROOT)/usr/lib/libcontract.so:= REALPATH=../../lib/libcontract.so.1 -$(ROOT)/usr/lib/libcryptoutil.so.1:= REALPATH=../../lib/libcryptoutil.so.1 -$(ROOT)/usr/lib/libcryptoutil.so:= REALPATH=../../lib/libcryptoutil.so.1 -$(ROOT)/usr/lib/libctf.so.1:= REALPATH=../../lib/libctf.so.1 -$(ROOT)/usr/lib/libctf.so:= REALPATH=../../lib/libctf.so.1 -$(ROOT)/usr/lib/libcurses.so.1:= REALPATH=../../lib/libcurses.so.1 -$(ROOT)/usr/lib/libcurses.so:= REALPATH=../../lib/libcurses.so.1 -$(ROOT)/usr/lib/libdevice.so.1:= REALPATH=../../lib/libdevice.so.1 -$(ROOT)/usr/lib/libdevice.so:= REALPATH=../../lib/libdevice.so.1 -$(ROOT)/usr/lib/libdevid.so.1:= REALPATH=../../lib/libdevid.so.1 -$(ROOT)/usr/lib/libdevid.so:= REALPATH=../../lib/libdevid.so.1 -$(ROOT)/usr/lib/libdevinfo.so.1:= REALPATH=../../lib/libdevinfo.so.1 -$(ROOT)/usr/lib/libdevinfo.so:= REALPATH=../../lib/libdevinfo.so.1 -$(ROOT)/usr/lib/libdhcpagent.so.1:= REALPATH=../../lib/libdhcpagent.so.1 -$(ROOT)/usr/lib/libdhcpagent.so:= REALPATH=../../lib/libdhcpagent.so.1 -$(ROOT)/usr/lib/libdhcputil.so.1:= REALPATH=../../lib/libdhcputil.so.1 -$(ROOT)/usr/lib/libdhcputil.so:= REALPATH=../../lib/libdhcputil.so.1 -$(ROOT)/usr/lib/libdl.so.1:= REALPATH=../../lib/libdl.so.1 -$(ROOT)/usr/lib/libdl.so:= REALPATH=../../lib/libdl.so.1 -$(ROOT)/usr/lib/libdlpi.so.1:= REALPATH=../../lib/libdlpi.so.1 -$(ROOT)/usr/lib/libdlpi.so:= REALPATH=../../lib/libdlpi.so.1 -$(ROOT)/usr/lib/libdoor.so.1:= REALPATH=../../lib/libdoor.so.1 -$(ROOT)/usr/lib/libdoor.so:= REALPATH=../../lib/libdoor.so.1 -$(ROOT)/usr/lib/libdwarf.so.1:= REALPATH=../../lib/libdwarf.so.1 -$(ROOT)/usr/lib/libdwarf.so:= REALPATH=../../lib/libdwarf.so.1 -$(ROOT)/usr/lib/libefi.so.1:= REALPATH=../../lib/libefi.so.1 -$(ROOT)/usr/lib/libefi.so:= REALPATH=../../lib/libefi.so.1 -$(ROOT)/usr/lib/libelf.so.1:= REALPATH=../../lib/libelf.so.1 -$(ROOT)/usr/lib/libelf.so:= REALPATH=../../lib/libelf.so.1 -$(ROOT)/usr/lib/libfakekernel.so.1:= REALPATH=../../lib/libfakekernel.so.1 -$(ROOT)/usr/lib/libfakekernel.so:= REALPATH=../../lib/libfakekernel.so.1 -$(ROOT)/usr/lib/libfdisk.so.1:= REALPATH=../../lib/libfdisk.so.1 -$(ROOT)/usr/lib/libfdisk.so:= REALPATH=../../lib/libfdisk.so.1 -$(ROOT)/usr/lib/libgen.so.1:= REALPATH=../../lib/libgen.so.1 -$(ROOT)/usr/lib/libgen.so:= REALPATH=../../lib/libgen.so.1 -$(ROOT)/usr/lib/libinetutil.so.1:= REALPATH=../../lib/libinetutil.so.1 -$(ROOT)/usr/lib/libinetutil.so:= REALPATH=../../lib/libinetutil.so.1 -$(ROOT)/usr/lib/libintl.so.1:= REALPATH=../../lib/libintl.so.1 -$(ROOT)/usr/lib/libintl.so:= REALPATH=../../lib/libintl.so.1 -$(ROOT)/usr/lib/libkmf.so.1:= REALPATH=../../lib/libkmf.so.1 -$(ROOT)/usr/lib/libkmf.so:= REALPATH=../../lib/libkmf.so.1 -$(ROOT)/usr/lib/libkmfberder.so.1:= REALPATH=../../lib/libkmfberder.so.1 -$(ROOT)/usr/lib/libkmfberder.so:= REALPATH=../../lib/libkmfberder.so.1 -$(ROOT)/usr/lib/libkstat.so.1:= REALPATH=../../lib/libkstat.so.1 -$(ROOT)/usr/lib/libkstat.so:= REALPATH=../../lib/libkstat.so.1 -$(ROOT)/usr/lib/liblddbg.so.4:= REALPATH=../../lib/liblddbg.so.4 -$(ROOT)/usr/lib/libm.so.1:= REALPATH=../../lib/libm.so.1 -$(ROOT)/usr/lib/libm.so.2:= REALPATH=../../lib/libm.so.2 -$(ROOT)/usr/lib/libm.so:= REALPATH=../../lib/libm.so.2 -$(ROOT)/usr/lib/libmd.so.1:= REALPATH=../../lib/libmd.so.1 -$(ROOT)/usr/lib/libmd.so:= REALPATH=../../lib/libmd.so.1 -$(ROOT)/usr/lib/libmd5.so.1:= REALPATH=../../lib/libmd5.so.1 -$(ROOT)/usr/lib/libmd5.so:= REALPATH=../../lib/libmd5.so.1 -$(ROOT)/usr/lib/libmp.so.1:= REALPATH=../../lib/libmp.so.1 -$(ROOT)/usr/lib/libmp.so.2:= REALPATH=../../lib/libmp.so.2 -$(ROOT)/usr/lib/libmp.so:= REALPATH=../../lib/libmp.so.2 -$(ROOT)/usr/lib/libmvec.so.1:= REALPATH=../../lib/libmvec.so.1 -$(ROOT)/usr/lib/libmvec.so:= REALPATH=../../lib/libmvec.so.1 -$(ROOT)/usr/lib/libnsl.so.1:= REALPATH=../../lib/libnsl.so.1 -$(ROOT)/usr/lib/libnsl.so:= REALPATH=../../lib/libnsl.so.1 -$(ROOT)/usr/lib/libnvpair.so.1:= REALPATH=../../lib/libnvpair.so.1 -$(ROOT)/usr/lib/libnvpair.so:= REALPATH=../../lib/libnvpair.so.1 -$(ROOT)/usr/lib/libpam.so.1:= REALPATH=../../lib/libpam.so.1 -$(ROOT)/usr/lib/libpam.so:= REALPATH=../../lib/libpam.so.1 -$(ROOT)/usr/lib/libposix4.so.1:= REALPATH=../../lib/librt.so.1 -$(ROOT)/usr/lib/libposix4.so:= REALPATH=../../lib/librt.so.1 -$(ROOT)/usr/lib/libproc.so.1:= REALPATH=../../lib/libproc.so.1 -$(ROOT)/usr/lib/libproc.so:= REALPATH=../../lib/libproc.so.1 -$(ROOT)/usr/lib/libpthread.so.1:= REALPATH=../../lib/libpthread.so.1 -$(ROOT)/usr/lib/libpthread.so:= REALPATH=../../lib/libpthread.so.1 -$(ROOT)/usr/lib/librcm.so.1:= REALPATH=../../lib/librcm.so.1 -$(ROOT)/usr/lib/librcm.so:= REALPATH=../../lib/librcm.so.1 -$(ROOT)/usr/lib/libresolv.so.1:= REALPATH=../../lib/libresolv.so.1 -$(ROOT)/usr/lib/libresolv.so.2:= REALPATH=../../lib/libresolv.so.2 -$(ROOT)/usr/lib/libresolv.so:= REALPATH=../../lib/libresolv.so.2 -$(ROOT)/usr/lib/librestart.so.1:= REALPATH=../../lib/librestart.so.1 -$(ROOT)/usr/lib/librestart.so:= REALPATH=../../lib/librestart.so.1 -$(ROOT)/usr/lib/librpcsvc.so.1:= REALPATH=../../lib/librpcsvc.so.1 -$(ROOT)/usr/lib/librpcsvc.so:= REALPATH=../../lib/librpcsvc.so.1 -$(ROOT)/usr/lib/librt.so.1:= REALPATH=../../lib/librt.so.1 -$(ROOT)/usr/lib/librt.so:= REALPATH=../../lib/librt.so.1 -$(ROOT)/usr/lib/librtld.so.1:= REALPATH=../../lib/librtld.so.1 -$(ROOT)/usr/lib/librtld_db.so.1:= REALPATH=../../lib/librtld_db.so.1 -$(ROOT)/usr/lib/librtld_db.so:= REALPATH=../../lib/librtld_db.so.1 -$(ROOT)/usr/lib/libscf.so.1:= REALPATH=../../lib/libscf.so.1 -$(ROOT)/usr/lib/libscf.so:= REALPATH=../../lib/libscf.so.1 -$(ROOT)/usr/lib/libsec.so.1:= REALPATH=../../lib/libsec.so.1 -$(ROOT)/usr/lib/libsec.so:= REALPATH=../../lib/libsec.so.1 -$(ROOT)/usr/lib/libsecdb.so.1:= REALPATH=../../lib/libsecdb.so.1 -$(ROOT)/usr/lib/libsecdb.so:= REALPATH=../../lib/libsecdb.so.1 -$(ROOT)/usr/lib/libsendfile.so.1:= REALPATH=../../lib/libsendfile.so.1 -$(ROOT)/usr/lib/libsendfile.so:= REALPATH=../../lib/libsendfile.so.1 -$(ROOT)/usr/lib/libsocket.so.1:= REALPATH=../../lib/libsocket.so.1 -$(ROOT)/usr/lib/libsocket.so:= REALPATH=../../lib/libsocket.so.1 -$(ROOT)/usr/lib/libsysevent.so.1:= REALPATH=../../lib/libsysevent.so.1 -$(ROOT)/usr/lib/libsysevent.so:= REALPATH=../../lib/libsysevent.so.1 -$(ROOT)/usr/lib/libtermcap.so.1:= REALPATH=../../lib/libtermcap.so.1 -$(ROOT)/usr/lib/libtermcap.so:= REALPATH=../../lib/libtermcap.so.1 -$(ROOT)/usr/lib/libtermlib.so.1:= REALPATH=../../lib/libcurses.so.1 -$(ROOT)/usr/lib/libtermlib.so:= REALPATH=../../lib/libcurses.so.1 -$(ROOT)/usr/lib/libthread.so.1:= REALPATH=../../lib/libthread.so.1 -$(ROOT)/usr/lib/libthread.so:= REALPATH=../../lib/libthread.so.1 -$(ROOT)/usr/lib/libthread_db.so.1:= REALPATH=../../lib/libc_db.so.1 -$(ROOT)/usr/lib/libthread_db.so:= REALPATH=../../lib/libc_db.so.1 -$(ROOT)/usr/lib/libtsnet.so.1:= REALPATH=../../lib/libtsnet.so.1 -$(ROOT)/usr/lib/libtsnet.so:= REALPATH=../../lib/libtsnet.so.1 -$(ROOT)/usr/lib/libtsol.so.2:= REALPATH=../../lib/libtsol.so.2 -$(ROOT)/usr/lib/libtsol.so:= REALPATH=../../lib/libtsol.so.2 -$(ROOT)/usr/lib/libumem.so.1:= REALPATH=../../lib/libumem.so.1 -$(ROOT)/usr/lib/libumem.so:= REALPATH=../../lib/libumem.so.1 -$(ROOT)/usr/lib/libuuid.so.1:= REALPATH=../../lib/libuuid.so.1 -$(ROOT)/usr/lib/libuuid.so:= REALPATH=../../lib/libuuid.so.1 -$(ROOT)/usr/lib/libuutil.so.1:= REALPATH=../../lib/libuutil.so.1 -$(ROOT)/usr/lib/libuutil.so:= REALPATH=../../lib/libuutil.so.1 -$(ROOT)/usr/lib/libw.so.1:= REALPATH=../../lib/libw.so.1 -$(ROOT)/usr/lib/libw.so:= REALPATH=../../lib/libw.so.1 -$(ROOT)/usr/lib/libxnet.so.1:= REALPATH=../../lib/libxnet.so.1 -$(ROOT)/usr/lib/libxnet.so:= REALPATH=../../lib/libxnet.so.1 -$(ROOT)/usr/lib/libzfs.so.1:= REALPATH=../../lib/libzfs.so.1 -$(ROOT)/usr/lib/libzfs.so:= REALPATH=../../lib/libzfs.so.1 -$(ROOT)/usr/lib/libzfs_core.so.1:= REALPATH=../../lib/libzfs_core.so.1 -$(ROOT)/usr/lib/libzfs_core.so:= REALPATH=../../lib/libzfs_core.so.1 -$(ROOT)/usr/lib/libzutil.so.1:= REALPATH=../../lib/libzutil.so.1 -$(ROOT)/usr/lib/libzutil.so:= REALPATH=../../lib/libzutil.so.1 -$(ROOT)/usr/lib/nss_compat.so.1:= REALPATH=../../lib/nss_compat.so.1 -$(ROOT)/usr/lib/nss_dns.so.1:= REALPATH=../../lib/nss_dns.so.1 -$(ROOT)/usr/lib/nss_files.so.1:= REALPATH=../../lib/nss_files.so.1 -$(ROOT)/usr/lib/nss_nis.so.1:= REALPATH=../../lib/nss_nis.so.1 -$(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:= \ - REALPATH=librt.so.1 -$(ROOT)/lib/$(MACH64)/libposix4.so:= \ - REALPATH=libposix4.so.1 -$(ROOT)/lib/$(MACH64)/libthread_db.so.1:= \ - REALPATH=libc_db.so.1 -$(ROOT)/lib/$(MACH64)/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)/libbsm.so.1:= \ - REALPATH=../../../lib/$(MACH64)/libbsm.so.1 -$(ROOT)/usr/lib/$(MACH64)/libbsm.so:= \ - REALPATH=../../../lib/$(MACH64)/libbsm.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)/libcurses.so.1:= \ - REALPATH=../../../lib/$(MACH64)/libcurses.so.1 -$(ROOT)/usr/lib/$(MACH64)/libcurses.so:= \ - REALPATH=../../../lib/$(MACH64)/libcurses.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)/libdhcpagent.so.1:= \ - REALPATH=../../../lib/$(MACH64)/libdhcpagent.so.1 -$(ROOT)/usr/lib/$(MACH64)/libdhcpagent.so:= \ - REALPATH=../../../lib/$(MACH64)/libdhcpagent.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.1:= \ - REALPATH=../../../lib/$(MACH64)/libm.so.1 -$(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)/libsocket.so.1:= \ - REALPATH=../../../lib/$(MACH64)/libsocket.so.1 -$(ROOT)/usr/lib/$(MACH64)/libsocket.so:= \ - REALPATH=../../../lib/$(MACH64)/libsocket.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)/libtermcap.so.1:= \ - REALPATH=../../../lib/$(MACH64)/libtermcap.so.1 -$(ROOT)/usr/lib/$(MACH64)/libtermcap.so:= \ - REALPATH=../../../lib/$(MACH64)/libtermcap.so.1 -$(ROOT)/usr/lib/$(MACH64)/libtermlib.so.1:= \ - REALPATH=../../../lib/$(MACH64)/libcurses.so.1 -$(ROOT)/usr/lib/$(MACH64)/libtermlib.so:= \ - REALPATH=../../../lib/$(MACH64)/libcurses.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)/libtsnet.so.1:= \ - REALPATH=../../../lib/$(MACH64)/libtsnet.so.1 -$(ROOT)/usr/lib/$(MACH64)/libtsnet.so:= \ - REALPATH=../../../lib/$(MACH64)/libtsnet.so.1 -$(ROOT)/usr/lib/$(MACH64)/libtsol.so.2:= \ - REALPATH=../../../lib/$(MACH64)/libtsol.so.2 -$(ROOT)/usr/lib/$(MACH64)/libtsol.so:= \ - REALPATH=../../../lib/$(MACH64)/libtsol.so.2 -$(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)/libuutil.so.1:= \ - REALPATH=../../../lib/$(MACH64)/libuutil.so.1 -$(ROOT)/usr/lib/$(MACH64)/libuutil.so:= \ - REALPATH=../../../lib/$(MACH64)/libuutil.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)/libxnet.so.1:= \ - REALPATH=../../../lib/$(MACH64)/libxnet.so.1 -$(ROOT)/usr/lib/$(MACH64)/libxnet.so:= \ - REALPATH=../../../lib/$(MACH64)/libxnet.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)/libzutil.so:= \ - REALPATH=../../../lib/$(MACH64)/libzutil.so.1 -$(ROOT)/usr/lib/$(MACH64)/libzutil.so.1:= \ - REALPATH=../../../lib/$(MACH64)/libzutil.so.1 -$(ROOT)/usr/lib/$(MACH64)/libfakekernel.so:= \ - REALPATH=../../../lib/$(MACH64)/libfakekernel.so.1 -$(ROOT)/usr/lib/$(MACH64)/libfakekernel.so.1:= \ - REALPATH=../../../lib/$(MACH64)/libfakekernel.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 - -i386_SYM.USRLIB= \ - /usr/lib/libfdisk.so \ - /usr/lib/libfdisk.so.1 - -SYM.USRLIB= \ - $($(MACH)_SYM.USRLIB) \ - /lib/libposix4.so \ - /lib/libposix4.so.1 \ - /lib/libthread_db.so \ - /lib/libthread_db.so.1 \ - /usr/lib/ld.so.1 \ - /usr/lib/libadm.so \ - /usr/lib/libadm.so.1 \ - /usr/lib/libaio.so \ - /usr/lib/libaio.so.1 \ - /usr/lib/libavl.so \ - /usr/lib/libavl.so.1 \ - /usr/lib/libbsm.so \ - /usr/lib/libbsm.so.1 \ - /usr/lib/libc.so \ - /usr/lib/libc.so.1 \ - /usr/lib/libc_db.so \ - /usr/lib/libc_db.so.1 \ - /usr/lib/libcmdutils.so \ - /usr/lib/libcmdutils.so.1 \ - /usr/lib/libcontract.so \ - /usr/lib/libcontract.so.1 \ - /usr/lib/libctf.so \ - /usr/lib/libctf.so.1 \ - /usr/lib/libcurses.so \ - /usr/lib/libcurses.so.1 \ - /usr/lib/libdevice.so \ - /usr/lib/libdevice.so.1 \ - /usr/lib/libdevid.so \ - /usr/lib/libdevid.so.1 \ - /usr/lib/libdevinfo.so \ - /usr/lib/libdevinfo.so.1 \ - /usr/lib/libdhcpagent.so \ - /usr/lib/libdhcpagent.so.1 \ - /usr/lib/libdhcputil.so \ - /usr/lib/libdhcputil.so.1 \ - /usr/lib/libdl.so \ - /usr/lib/libdl.so.1 \ - /usr/lib/libdlpi.so \ - /usr/lib/libdlpi.so.1 \ - /usr/lib/libdoor.so \ - /usr/lib/libdoor.so.1 \ - /usr/lib/libdwarf.so \ - /usr/lib/libdwarf.so.1 \ - /usr/lib/libefi.so \ - /usr/lib/libefi.so.1 \ - /usr/lib/libelf.so \ - /usr/lib/libelf.so.1 \ - /usr/lib/libfakekernel.so \ - /usr/lib/libfakekernel.so.1 \ - /usr/lib/libgen.so \ - /usr/lib/libgen.so.1 \ - /usr/lib/libinetutil.so \ - /usr/lib/libinetutil.so.1 \ - /usr/lib/libintl.so \ - /usr/lib/libintl.so.1 \ - /usr/lib/libkstat.so \ - /usr/lib/libkstat.so.1 \ - /usr/lib/liblddbg.so.4 \ - /usr/lib/libm.so.1 \ - /usr/lib/libm.so.2 \ - /usr/lib/libm.so \ - /usr/lib/libmd.so \ - /usr/lib/libmd.so.1 \ - /usr/lib/libmd5.so \ - /usr/lib/libmd5.so.1 \ - /usr/lib/libmp.so \ - /usr/lib/libmp.so.1 \ - /usr/lib/libmp.so.2 \ - /usr/lib/libmvec.so.1 \ - /usr/lib/libmvec.so \ - /usr/lib/libnsl.so \ - /usr/lib/libnsl.so.1 \ - /usr/lib/libnvpair.so \ - /usr/lib/libnvpair.so.1 \ - /usr/lib/libpam.so \ - /usr/lib/libpam.so.1 \ - /usr/lib/libposix4.so \ - /usr/lib/libposix4.so.1 \ - /usr/lib/libproc.so \ - /usr/lib/libproc.so.1 \ - /usr/lib/libpthread.so \ - /usr/lib/libpthread.so.1 \ - /usr/lib/librcm.so \ - /usr/lib/librcm.so.1 \ - /usr/lib/libresolv.so \ - /usr/lib/libresolv.so.1 \ - /usr/lib/libresolv.so.2 \ - /usr/lib/librestart.so \ - /usr/lib/librestart.so.1 \ - /usr/lib/librpcsvc.so \ - /usr/lib/librpcsvc.so.1 \ - /usr/lib/librt.so \ - /usr/lib/librt.so.1 \ - /usr/lib/librtld.so.1 \ - /usr/lib/librtld_db.so \ - /usr/lib/librtld_db.so.1 \ - /usr/lib/libscf.so \ - /usr/lib/libscf.so.1 \ - /usr/lib/libsec.so \ - /usr/lib/libsec.so.1 \ - /usr/lib/libsecdb.so \ - /usr/lib/libsecdb.so.1 \ - /usr/lib/libsendfile.so \ - /usr/lib/libsendfile.so.1 \ - /usr/lib/libsocket.so \ - /usr/lib/libsocket.so.1 \ - /usr/lib/libsysevent.so \ - /usr/lib/libsysevent.so.1 \ - /usr/lib/libtermcap.so \ - /usr/lib/libtermcap.so.1 \ - /usr/lib/libtermlib.so \ - /usr/lib/libtermlib.so.1 \ - /usr/lib/libthread.so \ - /usr/lib/libthread.so.1 \ - /usr/lib/libthread_db.so \ - /usr/lib/libthread_db.so.1 \ - /usr/lib/libtsnet.so \ - /usr/lib/libtsnet.so.1 \ - /usr/lib/libtsol.so \ - /usr/lib/libtsol.so.2 \ - /usr/lib/libumem.so \ - /usr/lib/libumem.so.1 \ - /usr/lib/libuuid.so \ - /usr/lib/libuuid.so.1 \ - /usr/lib/libuutil.so \ - /usr/lib/libuutil.so.1 \ - /usr/lib/libw.so \ - /usr/lib/libw.so.1 \ - /usr/lib/libxnet.so \ - /usr/lib/libxnet.so.1 \ - /usr/lib/libzfs.so \ - /usr/lib/libzfs.so.1 \ - /usr/lib/libzfs_core.so \ - /usr/lib/libzfs_core.so.1 \ - /usr/lib/libzutil.so \ - /usr/lib/libzutil.so.1 \ - /usr/lib/nss_compat.so.1 \ - /usr/lib/nss_dns.so.1 \ - /usr/lib/nss_files.so.1 \ - /usr/lib/nss_nis.so.1 \ - /usr/lib/nss_user.so.1 \ - /usr/lib/fm/libfmevent.so \ - /usr/lib/fm/libfmevent.so.1 - -sparcv9_SYM.USRLIB64= - -amd64_SYM.USRLIB64= \ - /usr/lib/amd64/libfdisk.so \ - /usr/lib/amd64/libfdisk.so.1 - - -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 \ - /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)/libbsm.so \ - /usr/lib/$(MACH64)/libbsm.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)/libcurses.so \ - /usr/lib/$(MACH64)/libcurses.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)/libdhcpagent.so \ - /usr/lib/$(MACH64)/libdhcpagent.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)/libfakekernel.so \ - /usr/lib/$(MACH64)/libfakekernel.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.1 \ - /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)/libsocket.so \ - /usr/lib/$(MACH64)/libsocket.so.1 \ - /usr/lib/$(MACH64)/libsysevent.so \ - /usr/lib/$(MACH64)/libsysevent.so.1 \ - /usr/lib/$(MACH64)/libtermcap.so \ - /usr/lib/$(MACH64)/libtermcap.so.1 \ - /usr/lib/$(MACH64)/libtermlib.so \ - /usr/lib/$(MACH64)/libtermlib.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)/libtsnet.so \ - /usr/lib/$(MACH64)/libtsnet.so.1 \ - /usr/lib/$(MACH64)/libtsol.so \ - /usr/lib/$(MACH64)/libtsol.so.2 \ - /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)/libuutil.so \ - /usr/lib/$(MACH64)/libuutil.so.1 \ - /usr/lib/$(MACH64)/libw.so \ - /usr/lib/$(MACH64)/libw.so.1 \ - /usr/lib/$(MACH64)/libxnet.so \ - /usr/lib/$(MACH64)/libxnet.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)/libzutil.so \ - /usr/lib/$(MACH64)/libzutil.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/src/Makefile uses INS.dir for any member of ROOTDIRS, the fact -# these are symlinks to files has no bearing on this. -# -$(FILELINKS:%=$(ROOT)%):= \ - INS.dir= -$(RM) $@; $(SYMLINK) $(REALPATH) $@ diff --git a/usr/src/cmd/sgs/Makefile.targ b/usr/src/cmd/sgs/Makefile.targ index b8d85bef18..37064baa75 100644 --- a/usr/src/cmd/sgs/Makefile.targ +++ b/usr/src/cmd/sgs/Makefile.targ @@ -39,16 +39,4 @@ $(VAR_SGSBIN)/%: % $(VAR_SGSBIN64)/%: % $(INS.file) -$(ROOTFS_LIBDIR)/$(LIBLINKS): $(ROOTFS_LIBDIR)/$(LIBLINKS)$(VERS) - $(INS.liblink) - -$(ROOTFS_LIBDIR64)/$(LIBLINKS): $(ROOTFS_LIBDIR64)/$(LIBLINKS)$(VERS) - $(INS.liblink64) - -$(ROOTFS_LIBDIR)/$(LIBLINKSCCC): $(ROOTFS_LIBDIR)/$(LIBLINKSCCC)$(VERS) - $(INS.liblinkccc) - -$(ROOTFS_LIBDIR64)/$(LIBLINKSCCC): $(ROOTFS_LIBDIR64)/$(LIBLINKSCCC)$(VERS) - $(INS.liblinkccc64) - FRC: diff --git a/usr/src/cmd/sgs/Makefile.var b/usr/src/cmd/sgs/Makefile.var index c2984dc553..fa8f897c10 100644 --- a/usr/src/cmd/sgs/Makefile.var +++ b/usr/src/cmd/sgs/Makefile.var @@ -131,11 +131,6 @@ VAR_LIBLD_64_ROOTFS_LIBDIR= $(ROOT)/lib/$(MACH64) # VAR_TOOLS_CPPFLAGS= $(VAR_AVLINCDIR) -# -# liblddbg -# -VAR_LIBLDDBG_64_ROOTFS_LIBDIR= $(ROOT)/lib/$(MACH64) - # # rtld # diff --git a/usr/src/cmd/sgs/lex/Makefile.com b/usr/src/cmd/sgs/lex/Makefile.com index 9a24765ceb..c8100b1e3f 100644 --- a/usr/src/cmd/sgs/lex/Makefile.com +++ b/usr/src/cmd/sgs/lex/Makefile.com @@ -44,6 +44,13 @@ FORMS= nceucform ncform nrform include ../../../../lib/Makefile.lib +COMPATLINKS= usr/ccs/lib/libl.so +COMPATLINKS64= usr/ccs/lib/$(MACH64)/libl.so + +$(ROOT)/usr/ccs/lib/libl.so := COMPATLINKTARGET=../../lib/libl.so.1 +$(ROOT)/usr/ccs/lib/$(MACH64)/libl.so:= \ + COMPATLINKTARGET=../../../lib/$(MACH64)/libl.so.1 + SRCDIR = ../common CSTD= $(CSTD_GNU99) diff --git a/usr/src/cmd/sgs/lex/Makefile.targ b/usr/src/cmd/sgs/lex/Makefile.targ index 7755dd804b..de50a8ae21 100644 --- a/usr/src/cmd/sgs/lex/Makefile.targ +++ b/usr/src/cmd/sgs/lex/Makefile.targ @@ -79,5 +79,8 @@ objs/%.o pics/%.o: ../common/%.c $(DYNLINKLIBDIR)/%: %$(VERS) $(INS.liblink) +$(ROOTCOMPATLINKS) $(ROOTCOMPATLINKS64): + $(RM) $@; $(SYMLINK) $(COMPATLINKTARGET) $@ + clean: $(RM) $(POBJS) $(OBJS) $(PICS) $(CLEANFILES) diff --git a/usr/src/cmd/sgs/lex/amd64/Makefile b/usr/src/cmd/sgs/lex/amd64/Makefile index 88c06842ea..a70552a0ba 100644 --- a/usr/src/cmd/sgs/lex/amd64/Makefile +++ b/usr/src/cmd/sgs/lex/amd64/Makefile @@ -23,8 +23,6 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# # This Makefile is only to produce 64-bit lex shared library libl.so.1 # and not for building 64-bit lex itself. @@ -36,7 +34,7 @@ include ../../../../lib/Makefile.lib.64 all_lib: $(LIBS) -install_lib: all_lib $(ROOTLIBS64) $(ROOTLINKS64) +install_lib: all_lib $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) include ../Makefile.targ include ../../../Makefile.targ diff --git a/usr/src/cmd/sgs/lex/i386/Makefile b/usr/src/cmd/sgs/lex/i386/Makefile index 7c4ed059ec..a4627ee882 100644 --- a/usr/src/cmd/sgs/lex/i386/Makefile +++ b/usr/src/cmd/sgs/lex/i386/Makefile @@ -38,7 +38,7 @@ all_lib: $(LIBS) install: all $(ROOTPROG) $(ROOTFORMS) $(ROOTCCSBINLINK) -install_lib: all_lib $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB) +install_lib: all_lib $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB) $(ROOTCOMPATLINKS) include ../Makefile.targ include ../../../Makefile.targ diff --git a/usr/src/cmd/sgs/lex/sparc/Makefile b/usr/src/cmd/sgs/lex/sparc/Makefile index ca3f074cc4..e5a9194df2 100644 --- a/usr/src/cmd/sgs/lex/sparc/Makefile +++ b/usr/src/cmd/sgs/lex/sparc/Makefile @@ -38,7 +38,7 @@ all_lib: $(LIBS) install: all $(ROOTPROG) $(ROOTFORMS) $(ROOTCCSBINLINK) -install_lib: all_lib $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB) +install_lib: all_lib $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB) $(ROOTCOMPATLINKS) include ../Makefile.targ include ../../../Makefile.targ diff --git a/usr/src/cmd/sgs/lex/sparcv9/Makefile b/usr/src/cmd/sgs/lex/sparcv9/Makefile index 5edc1ac22b..c6279e175c 100644 --- a/usr/src/cmd/sgs/lex/sparcv9/Makefile +++ b/usr/src/cmd/sgs/lex/sparcv9/Makefile @@ -20,13 +20,9 @@ # CDDL HEADER END # # -# ident "%Z%%M% %I% %E% SMI" -# # Copyright (c) 1997 by Sun Microsystems, Inc. # All rights reserved. # -# cmd/sgs/lex/sparcv9/Makefile -# # This Makefile is only to produce 64-bit lex shared library libl.so.1 # and not for building 64-bit lex itself. @@ -38,7 +34,7 @@ include ../../../../lib/Makefile.lib.64 all_lib: $(LIBS) -install_lib: all_lib $(ROOTLIBS64) $(ROOTLINKS64) +install_lib: all_lib $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) include ../Makefile.targ include ../../../Makefile.targ diff --git a/usr/src/cmd/sgs/libdl/Makefile.com b/usr/src/cmd/sgs/libdl/Makefile.com index edc149f8ec..507cb277c0 100644 --- a/usr/src/cmd/sgs/libdl/Makefile.com +++ b/usr/src/cmd/sgs/libdl/Makefile.com @@ -27,3 +27,6 @@ LIBRARY = libdl.a VERS = .1 include $(SRC)/lib/Makefile.rootfs + +COMPATLINKS += etc/lib/libdl.so.1 +$(ROOT)/etc/lib/libdl.so.1 := COMPATLINKTARGET=../../lib/libdl.so.1 diff --git a/usr/src/cmd/sgs/libdl/amd64/Makefile b/usr/src/cmd/sgs/libdl/amd64/Makefile index 90e6d5bf3a..7aa63ffa3c 100644 --- a/usr/src/cmd/sgs/libdl/amd64/Makefile +++ b/usr/src/cmd/sgs/libdl/amd64/Makefile @@ -29,6 +29,7 @@ include $(SRC)/lib/Makefile.lib.64 DYNFLAGS += -F /usr/lib/$(MACH64)/ld.so.1 -install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) \ + $(ROOTCOMPATLINKS64) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/cmd/sgs/libdl/i386/Makefile b/usr/src/cmd/sgs/libdl/i386/Makefile index ea152db4b2..3ca48e64ff 100644 --- a/usr/src/cmd/sgs/libdl/i386/Makefile +++ b/usr/src/cmd/sgs/libdl/i386/Makefile @@ -30,6 +30,6 @@ include ../Makefile.com DYNFLAGS += -F /usr/lib/ld.so.1 -install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/cmd/sgs/libdl/sparc/Makefile b/usr/src/cmd/sgs/libdl/sparc/Makefile index ea152db4b2..3ca48e64ff 100644 --- a/usr/src/cmd/sgs/libdl/sparc/Makefile +++ b/usr/src/cmd/sgs/libdl/sparc/Makefile @@ -30,6 +30,6 @@ include ../Makefile.com DYNFLAGS += -F /usr/lib/ld.so.1 -install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/cmd/sgs/libdl/sparcv9/Makefile b/usr/src/cmd/sgs/libdl/sparcv9/Makefile index 90e6d5bf3a..7aa63ffa3c 100644 --- a/usr/src/cmd/sgs/libdl/sparcv9/Makefile +++ b/usr/src/cmd/sgs/libdl/sparcv9/Makefile @@ -29,6 +29,7 @@ include $(SRC)/lib/Makefile.lib.64 DYNFLAGS += -F /usr/lib/$(MACH64)/ld.so.1 -install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) \ + $(ROOTCOMPATLINKS64) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/cmd/sgs/libelf/Makefile.com b/usr/src/cmd/sgs/libelf/Makefile.com index 7791333dc6..2ff06a2508 100644 --- a/usr/src/cmd/sgs/libelf/Makefile.com +++ b/usr/src/cmd/sgs/libelf/Makefile.com @@ -51,6 +51,7 @@ MISCOBJS64= nlist.o OBJECTS= $(BLTOBJS) $(MACHOBJS) $(COMOBJS) $(CLASSOBJS) $(MISCOBJS) include $(SRC)/lib/Makefile.lib +include $(SRC)/lib/Makefile.rootfs SRCDIR= $(SRC)/cmd/sgs/libelf @@ -92,13 +93,6 @@ BLTSRCS= $(BLTOBJS:%.o=%.c) LIBSRCS= $(COMOBJS:%.o=$(SRCDIR)/common/%.c) $(MISCOBJS:%.o=$(SRCDIR)/misc/%.c) \ $(MACHOBJS:%.o=%.c) $(BLTSRCS) -ROOTFS_DYNLIB= $(DYNLIB:%=$(ROOTFS_LIBDIR)/%) - -ROOTFS_DYNLIB64= $(DYNLIB:%=$(ROOTFS_LIBDIR64)/%) - -$(ROOTFS_DYNLIB) := FILEMODE= 755 -$(ROOTFS_DYNLIB64) := FILEMODE= 755 - LIBS = $(DYNLIB) CLEANFILES += $(BLTSRCS) $(BLTFILES) diff --git a/usr/src/cmd/sgs/libelf/amd64/Makefile b/usr/src/cmd/sgs/libelf/amd64/Makefile index 94251398d8..c27090b00c 100644 --- a/usr/src/cmd/sgs/libelf/amd64/Makefile +++ b/usr/src/cmd/sgs/libelf/amd64/Makefile @@ -34,6 +34,6 @@ MISCOBJS= $(MISCOBJS64) .KEEP_STATE: -install: all .WAIT $(ROOTFS_LIBS64) $(ROOTFS_LINKS64) +install: all .WAIT $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) include ../Makefile.targ.64 diff --git a/usr/src/cmd/sgs/libelf/i386/Makefile b/usr/src/cmd/sgs/libelf/i386/Makefile index a14fcadcdb..53cb83ad4d 100644 --- a/usr/src/cmd/sgs/libelf/i386/Makefile +++ b/usr/src/cmd/sgs/libelf/i386/Makefile @@ -29,7 +29,7 @@ SGSMSGTARG += $(SGSMSG32) .KEEP_STATE: -install: all .WAIT $(ROOTFS_LIBS) $(ROOTFS_LINKS) \ - .WAIT $(ROOTDEMODIRS) .WAIT $(ROOTDEMOFILES) +install: all .WAIT $(ROOTLIBS) $(ROOTLINKS) \ + .WAIT $(ROOTDEMODIRS) .WAIT $(ROOTDEMOFILES) $(ROOTCOMPATLINKS) include ../Makefile.targ diff --git a/usr/src/cmd/sgs/libelf/sparc/Makefile b/usr/src/cmd/sgs/libelf/sparc/Makefile index f5e39a6940..9779e5fb83 100644 --- a/usr/src/cmd/sgs/libelf/sparc/Makefile +++ b/usr/src/cmd/sgs/libelf/sparc/Makefile @@ -29,7 +29,7 @@ SGSMSGTARG += $(SGSMSG32) .KEEP_STATE: -install: all .WAIT $(ROOTFS_LIBS) $(ROOTFS_LINKS) \ - .WAIT $(ROOTDEMODIRS) .WAIT $(ROOTDEMOFILES) +install: all .WAIT $(ROOTLIBS) $(ROOTLINKS) \ + .WAIT $(ROOTDEMODIRS) .WAIT $(ROOTDEMOFILES) $(ROOTCOMPATLINKS) include ../Makefile.targ diff --git a/usr/src/cmd/sgs/libelf/sparcv9/Makefile b/usr/src/cmd/sgs/libelf/sparcv9/Makefile index 94251398d8..c27090b00c 100644 --- a/usr/src/cmd/sgs/libelf/sparcv9/Makefile +++ b/usr/src/cmd/sgs/libelf/sparcv9/Makefile @@ -34,6 +34,6 @@ MISCOBJS= $(MISCOBJS64) .KEEP_STATE: -install: all .WAIT $(ROOTFS_LIBS64) $(ROOTFS_LINKS64) +install: all .WAIT $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) include ../Makefile.targ.64 diff --git a/usr/src/cmd/sgs/liblddbg/Makefile.com b/usr/src/cmd/sgs/liblddbg/Makefile.com index c4b9f9d6db..16e864f0ec 100644 --- a/usr/src/cmd/sgs/liblddbg/Makefile.com +++ b/usr/src/cmd/sgs/liblddbg/Makefile.com @@ -53,8 +53,14 @@ OBJECTS = $(BLTOBJ) $(COMOBJS) $(COMOBJS32) $(COMOBJS64) $(SGSCOMMONOBJ) include $(SRC)/lib/Makefile.lib +include $(SRC)/lib/Makefile.rootfs include $(SRC)/cmd/sgs/Makefile.com +LIBS = $(DYNLIB) + +COMPATLINKS = usr/lib/$(DYNLIB) +COMPATLINKS64 = usr/lib/$(MACH64)/$(DYNLIB) + SRCDIR = $(SGSHOME)/liblddbg MAPFILEDIR = $(SRCDIR)/common @@ -85,4 +91,3 @@ LIBSRCS = $(COMOBJS:%.o=$(SRCDIR)/common/%.c) \ CLEANFILES += $(BLTFILES) CLOBBERFILES += $(DYNLIB) $(LIBLINKS) -ROOTFS_DYNLIB = $(DYNLIB:%=$(ROOTFS_LIBDIR)/%) diff --git a/usr/src/cmd/sgs/liblddbg/amd64/Makefile b/usr/src/cmd/sgs/liblddbg/amd64/Makefile index 1d0ab295e0..9783a0d400 100644 --- a/usr/src/cmd/sgs/liblddbg/amd64/Makefile +++ b/usr/src/cmd/sgs/liblddbg/amd64/Makefile @@ -26,11 +26,6 @@ include ../Makefile.com -ROOTFS_LIBDIR64 = \ - $(VAR_LIBLDDBG_64_ROOTFS_LIBDIR) -ROOTFS_DYNLIB64 = \ - $(DYNLIB:%=$(ROOTFS_LIBDIR64)/%) - CONVLIBDIR = $(CONVLIBDIR64) .KEEP_STATE: @@ -40,7 +35,7 @@ $(ROOTFS_DYNLIB64) := FILEMODE= 755 all: $(DYNLIB) $(LIBLINKS) install \ -package: all $(ROOTFS_DYNLIB64) +package: all $(ROOTLIBS64) $(ROOTCOMPATLINKS64) include ../Makefile.targ include ../../Makefile.sub.64 diff --git a/usr/src/cmd/sgs/liblddbg/i386/Makefile b/usr/src/cmd/sgs/liblddbg/i386/Makefile index d27ae308e3..4345c2ca64 100644 --- a/usr/src/cmd/sgs/liblddbg/i386/Makefile +++ b/usr/src/cmd/sgs/liblddbg/i386/Makefile @@ -23,8 +23,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com @@ -33,6 +31,6 @@ include ../Makefile.com all: $(DYNLIB) $(LIBLINKS) install \ -package: all $(ROOTFS_DYNLIB) +package: all $(ROOTLIBS) $(ROOTCOMPATLINKS) include ../Makefile.targ diff --git a/usr/src/cmd/sgs/liblddbg/sparc/Makefile b/usr/src/cmd/sgs/liblddbg/sparc/Makefile index d27ae308e3..d11c3f43fb 100644 --- a/usr/src/cmd/sgs/liblddbg/sparc/Makefile +++ b/usr/src/cmd/sgs/liblddbg/sparc/Makefile @@ -23,8 +23,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com @@ -33,6 +31,6 @@ include ../Makefile.com all: $(DYNLIB) $(LIBLINKS) install \ -package: all $(ROOTFS_DYNLIB) +package: all $(ROOTLIBS) include ../Makefile.targ diff --git a/usr/src/cmd/sgs/liblddbg/sparcv9/Makefile b/usr/src/cmd/sgs/liblddbg/sparcv9/Makefile index b57167b378..8bc19f5ce4 100644 --- a/usr/src/cmd/sgs/liblddbg/sparcv9/Makefile +++ b/usr/src/cmd/sgs/liblddbg/sparcv9/Makefile @@ -26,21 +26,14 @@ include ../Makefile.com -ROOTFS_LIBDIR64 = \ - $(VAR_LIBLDDBG_64_ROOTFS_LIBDIR) -ROOTFS_DYNLIB64 = \ - $(DYNLIB:%=$(ROOTFS_LIBDIR64)/%) - CONVLIBDIR = $(CONVLIBDIR64) .KEEP_STATE: -$(ROOTFS_DYNLIB64) := FILEMODE= 755 - all: $(DYNLIB) $(LIBLINKS) install \ -package: all $(ROOTFS_DYNLIB64) +package: all $(ROOTLIBS64) $(ROOTCOMPATLINKS64) include ../Makefile.targ include ../../Makefile.sub.64 diff --git a/usr/src/cmd/sgs/librtld/Makefile.com b/usr/src/cmd/sgs/librtld/Makefile.com index e15980f956..54ed7d31c3 100644 --- a/usr/src/cmd/sgs/librtld/Makefile.com +++ b/usr/src/cmd/sgs/librtld/Makefile.com @@ -38,8 +38,14 @@ OBJECTS= $(BLTOBJ) $(MACHOBJS) $(COMOBJS) include $(SRC)/lib/Makefile.lib +include $(SRC)/lib/Makefile.rootfs include $(SRC)/cmd/sgs/Makefile.com +LIBS = $(DYNLIB) + +COMPATLINKS = usr/lib/$(DYNLIB) +COMPATLINKS64 = usr/lib/$(MACH64)/$(DYNLIB) + SRCDIR = ../common CPPFLAGS += -I../../rtld/common -I$(SRC)/lib/libc/inc \ -I$(SRC)/uts/common/krtld -I$(SRC)/common/sgsrtcid \ @@ -68,5 +74,3 @@ MSGSRCS= $(MACHOBJS:%.o=%.c) $(COMOBJS:%.o=../common/%.c) \ CLEANFILES += $(BLTFILES) CLOBBERFILES += $(DYNLIB) $(LIBLINKS) - -ROOTFS_DYNLIB= $(DYNLIB:%=$(ROOTFS_LIBDIR)/%) diff --git a/usr/src/cmd/sgs/librtld/amd64/Makefile b/usr/src/cmd/sgs/librtld/amd64/Makefile index ad8c67f0db..481b1c0a22 100644 --- a/usr/src/cmd/sgs/librtld/amd64/Makefile +++ b/usr/src/cmd/sgs/librtld/amd64/Makefile @@ -30,12 +30,9 @@ CPPFLAGS += -I../../../../uts/intel/amd64/krtld .KEEP_STATE: -ROOTFS_DYNLIB64 = $(DYNLIB:%=$(ROOTFS_LIBDIR64)/%) -$(ROOTFS_DYNLIB64) := FILEMODE=755 - all: $(DYNLIB) $(LIBLINKS) -install: all $(ROOTFS_DYNLIB64) +install: all $(ROOTLIBS64) $(ROOTCOMPATLINKS64) CPPFLAGS += -D_ELF64 diff --git a/usr/src/cmd/sgs/librtld/i386/Makefile b/usr/src/cmd/sgs/librtld/i386/Makefile index 54e5e30586..5d9e11a226 100644 --- a/usr/src/cmd/sgs/librtld/i386/Makefile +++ b/usr/src/cmd/sgs/librtld/i386/Makefile @@ -32,6 +32,6 @@ CPPFLAGS += -I../../../../uts/intel/ia32/krtld all: $(DYNLIB) $(LIBLINKS) -install: all $(ROOTFS_DYNLIB) +install: all $(ROOTLIBS) $(ROOTCOMPATLINKS) include $(SRC)/cmd/sgs/librtld/Makefile.targ diff --git a/usr/src/cmd/sgs/librtld/sparc/Makefile b/usr/src/cmd/sgs/librtld/sparc/Makefile index ac07f8b8c0..eb5a2547e4 100644 --- a/usr/src/cmd/sgs/librtld/sparc/Makefile +++ b/usr/src/cmd/sgs/librtld/sparc/Makefile @@ -32,6 +32,6 @@ CPPFLAGS += -I../../../../uts/sparc/krtld all: $(DYNLIB) $(LIBLINKS) -install: all $(ROOTFS_DYNLIB) +install: all $(ROOTLIBS) $(ROOTCOMPATLINKS) include $(SRC)/cmd/sgs/librtld/Makefile.targ diff --git a/usr/src/cmd/sgs/librtld/sparcv9/Makefile b/usr/src/cmd/sgs/librtld/sparcv9/Makefile index 00a9c3ca48..fd02c33926 100644 --- a/usr/src/cmd/sgs/librtld/sparcv9/Makefile +++ b/usr/src/cmd/sgs/librtld/sparcv9/Makefile @@ -30,12 +30,9 @@ CPPFLAGS += -I../../../../uts/sparc/krtld .KEEP_STATE: -ROOTFS_DYNLIB64 = $(DYNLIB:%=$(ROOTFS_LIBDIR64)/%) -$(ROOTFS_DYNLIB64) := FILEMODE=755 - all: $(DYNLIB) $(LIBLINKS) -install: all $(ROOTFS_DYNLIB64) +install: all $(ROOTLIBS64) $(ROOTCOMPATLINKS64) CPPFLAGS += -D_ELF64 diff --git a/usr/src/cmd/sgs/librtld_db/Makefile.com b/usr/src/cmd/sgs/librtld_db/Makefile.com index 2d7b9093c3..ad00e866a3 100644 --- a/usr/src/cmd/sgs/librtld_db/Makefile.com +++ b/usr/src/cmd/sgs/librtld_db/Makefile.com @@ -32,6 +32,7 @@ BLTOBJ= msg.o OBJECTS = $(BLTOBJ) $(COMOBJS) $(COMOBJS64) $(PLTOBJS) include $(SRC)/lib/Makefile.lib +include $(SRC)/lib/Makefile.rootfs include $(SRC)/cmd/sgs/Makefile.com SRCDIR = ../common diff --git a/usr/src/cmd/sgs/librtld_db/amd64/Makefile b/usr/src/cmd/sgs/librtld_db/amd64/Makefile index 705c6ef07a..e4454c5ef2 100644 --- a/usr/src/cmd/sgs/librtld_db/amd64/Makefile +++ b/usr/src/cmd/sgs/librtld_db/amd64/Makefile @@ -39,7 +39,7 @@ CONVLIBDIR = $(CONVLIBDIR64) all: $(DYNLIB) -install: all $(ROOTFS_DYNLIB64) $(ROOTFS_LINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) pics/plt32_resolution.o: ../i386/plt32_resolution.c $(COMPILE.c) -D_ELF32 $(PICFLAGS) -o $@ \ diff --git a/usr/src/cmd/sgs/librtld_db/i386/Makefile b/usr/src/cmd/sgs/librtld_db/i386/Makefile index ff610a1129..331d8aa3bb 100644 --- a/usr/src/cmd/sgs/librtld_db/i386/Makefile +++ b/usr/src/cmd/sgs/librtld_db/i386/Makefile @@ -37,6 +37,6 @@ SGSMSGTARG += $(SGSMSGINTEL) all: $(DYNLIB) -install: all $(ROOTFS_DYNLIB) $(ROOTFS_LINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) include ../Makefile.targ diff --git a/usr/src/cmd/sgs/librtld_db/sparc/Makefile b/usr/src/cmd/sgs/librtld_db/sparc/Makefile index 36c1b54df5..8a82b99e92 100644 --- a/usr/src/cmd/sgs/librtld_db/sparc/Makefile +++ b/usr/src/cmd/sgs/librtld_db/sparc/Makefile @@ -35,6 +35,6 @@ include ../Makefile.com all: $(DYNLIB) -install: all $(ROOTFS_DYNLIB) $(ROOTFS_LINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) include ../Makefile.targ diff --git a/usr/src/cmd/sgs/librtld_db/sparcv9/Makefile b/usr/src/cmd/sgs/librtld_db/sparcv9/Makefile index 29be0d82b3..c150914bc7 100644 --- a/usr/src/cmd/sgs/librtld_db/sparcv9/Makefile +++ b/usr/src/cmd/sgs/librtld_db/sparcv9/Makefile @@ -39,7 +39,7 @@ CONVLIBDIR = $(CONVLIBDIR64) all: $(DYNLIB) -install: all $(ROOTFS_DYNLIB64) $(ROOTFS_LINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) pics/plt32_resolution.o: ../sparc/plt32_resolution.c $(COMPILE.c) -D_ELF32 $(PICFLAGS) -o $@ \ diff --git a/usr/src/cmd/sgs/rtld/Makefile.com b/usr/src/cmd/sgs/rtld/Makefile.com index 6a767de04b..853fd5066b 100644 --- a/usr/src/cmd/sgs/rtld/Makefile.com +++ b/usr/src/cmd/sgs/rtld/Makefile.com @@ -72,6 +72,14 @@ ETCDYNLIB= $(RTLD:%=$(ETCLIBDIR)/%) ROOTDYNLIB= $(RTLD:%=$(ROOTFS_LIBDIR)/%) ROOTDYNLIB64= $(RTLD:%=$(ROOTFS_LIBDIR64)/%) +COMPATLINKS= etc/lib/ld.so.1 \ + usr/lib/ld.so.1 +COMPATLINKS64= usr/lib/$(MACH64)/ld.so.1 + +$(ROOT)/etc/lib/ld.so.1 := COMPATLINKTARGET= ../../lib/ld.so.1 +$(ROOT)/usr/lib/ld.so.1 := COMPATLINKTARGET= ../../lib/ld.so.1 +$(ROOT)/usr/lib/$(MACH64)/ld.so.1 := \ + COMPATLINKTARGET= ../../../lib/$(MACH64)/ld.so.1 FILEMODE = 755 diff --git a/usr/src/cmd/sgs/rtld/amd64/Makefile b/usr/src/cmd/sgs/rtld/amd64/Makefile index f01898ec08..d73dbaaa6b 100644 --- a/usr/src/cmd/sgs/rtld/amd64/Makefile +++ b/usr/src/cmd/sgs/rtld/amd64/Makefile @@ -84,7 +84,7 @@ CONVLIBDIR = $(CONVLIBDIR64) all: $(RTLD) -install: all $(ROOTDYNLIB64) +install: all $(ROOTDYNLIB64) $(ROOTCOMPATLINKS64) adbmacros: adb .WAIT $(ADBSCRIPTS) diff --git a/usr/src/cmd/sgs/rtld/i386/Makefile b/usr/src/cmd/sgs/rtld/i386/Makefile index 224faac481..0d7ff2cc8e 100644 --- a/usr/src/cmd/sgs/rtld/i386/Makefile +++ b/usr/src/cmd/sgs/rtld/i386/Makefile @@ -75,7 +75,7 @@ SGSMSGTARG += $(SGSMSGINTEL) $(SGSMSGINTEL32) $(SGSMSG32) all: $(RTLD) -install: all $(ROOTDYNLIB) +install: all $(ROOTDYNLIB) $(ROOTCOMPATLINKS) adbmacros: adb .WAIT $(ADBSCRIPTS) diff --git a/usr/src/cmd/sgs/rtld/sparc/Makefile b/usr/src/cmd/sgs/rtld/sparc/Makefile index d63f57b13a..2785c30fcf 100644 --- a/usr/src/cmd/sgs/rtld/sparc/Makefile +++ b/usr/src/cmd/sgs/rtld/sparc/Makefile @@ -81,7 +81,7 @@ SGSMSGTARG += $(SGSMSGSPARC) $(SGSMSGSPARC32) $(SGSMSG32) all: $(RTLD) -install: all $(ROOTDYNLIB) +install: all $(ROOTDYNLIB) $(ROOTCOMPATLINKS) adbmacros: adb .WAIT $(ADBSCRIPTS) diff --git a/usr/src/cmd/sgs/rtld/sparcv9/Makefile b/usr/src/cmd/sgs/rtld/sparcv9/Makefile index 87593bc6d2..fb1c3da820 100644 --- a/usr/src/cmd/sgs/rtld/sparcv9/Makefile +++ b/usr/src/cmd/sgs/rtld/sparcv9/Makefile @@ -90,7 +90,7 @@ CONVLIBDIR = $(CONVLIBDIR64) all: $(RTLD) -install: all $(ROOTDYNLIB64) +install: all $(ROOTDYNLIB64) $(ROOTCOMPATLINKS64) adbmacros: adb .WAIT $(ADBSCRIPTS) diff --git a/usr/src/cmd/sgs/yacc/Makefile.com b/usr/src/cmd/sgs/yacc/Makefile.com index 2172234f49..9f9b3dc0e8 100644 --- a/usr/src/cmd/sgs/yacc/Makefile.com +++ b/usr/src/cmd/sgs/yacc/Makefile.com @@ -41,6 +41,13 @@ YACCPAR= yaccpar include ../../../../lib/Makefile.lib +COMPATLINKS= usr/ccs/lib/liby.so +COMPATLINKS64= usr/ccs/lib/$(MACH64)/liby.so + +$(ROOT)/usr/ccs/lib/liby.so := COMPATLINKTARGET=../../lib/liby.so.1 +$(ROOT)/usr/ccs/lib/$(MACH64)/liby.so:= \ + COMPATLINKTARGET=../../../lib/$(MACH64)/liby.so.1 + SRCDIR = ../common # Override default source file derivation rule (in Makefile.lib) diff --git a/usr/src/cmd/sgs/yacc/Makefile.targ b/usr/src/cmd/sgs/yacc/Makefile.targ index a7932225e0..1ff1f4e804 100644 --- a/usr/src/cmd/sgs/yacc/Makefile.targ +++ b/usr/src/cmd/sgs/yacc/Makefile.targ @@ -75,5 +75,8 @@ objs/%.o pics/%.o: ../common/%.c $(DYNLINKLIBDIR)/%: %$(VERS) $(INS.liblink) +$(ROOTCOMPATLINKS) $(ROOTCOMPATLINKS64): + $(RM) $@; $(SYMLINK) $(COMPATLINKTARGET) $@ + clean: $(RM) $(POBJS) $(OBJS) $(PICS) $(CLEANFILES) diff --git a/usr/src/cmd/sgs/yacc/amd64/Makefile b/usr/src/cmd/sgs/yacc/amd64/Makefile index 3b987420ec..46c508df3d 100644 --- a/usr/src/cmd/sgs/yacc/amd64/Makefile +++ b/usr/src/cmd/sgs/yacc/amd64/Makefile @@ -23,8 +23,6 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# # This Makefile is only to produce 64-bit yacc shared library liby.so.1 # and not for building 64-bit yacc itself. @@ -39,7 +37,7 @@ POFILE= all_lib: $(LIBS) -install_lib: all_lib $(ROOTLIBS64) $(ROOTLINKS64) +install_lib: all_lib $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) include ../Makefile.targ include ../../../Makefile.targ diff --git a/usr/src/cmd/sgs/yacc/i386/Makefile b/usr/src/cmd/sgs/yacc/i386/Makefile index 5ca3d8bd7d..20885a7713 100644 --- a/usr/src/cmd/sgs/yacc/i386/Makefile +++ b/usr/src/cmd/sgs/yacc/i386/Makefile @@ -40,7 +40,7 @@ install: all $(ROOTPROG) $(ROOTYACCPAR) $(ROOTCCSBINLINK) $(RM) $(ROOTCCSBIN)/yaccpar $(SYMLINK) ../../share/lib/ccs/yaccpar $(ROOTCCSBIN)/yaccpar -install_lib: all_lib $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB) +install_lib: all_lib $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB) $(ROOTCOMPATLINKS) include ../Makefile.targ include ../../../Makefile.targ diff --git a/usr/src/cmd/sgs/yacc/sparc/Makefile b/usr/src/cmd/sgs/yacc/sparc/Makefile index 65d76b6f21..909fb6e7e2 100644 --- a/usr/src/cmd/sgs/yacc/sparc/Makefile +++ b/usr/src/cmd/sgs/yacc/sparc/Makefile @@ -38,7 +38,7 @@ all_lib: $(LIBS) install: all $(ROOTPROG) $(ROOTYACCPAR) $(ROOTCCSBINLINK) -install_lib: all_lib $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB) +install_lib: all_lib $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB) $(ROOTCOMPATLINKS) $(RM) $(ROOTCCSBIN)/yaccpar $(SYMLINK) ../../share/lib/ccs/yaccpar $(ROOTCCSBIN)/yaccpar diff --git a/usr/src/cmd/sgs/yacc/sparcv9/Makefile b/usr/src/cmd/sgs/yacc/sparcv9/Makefile index 1c65ac76b5..f94db938f3 100644 --- a/usr/src/cmd/sgs/yacc/sparcv9/Makefile +++ b/usr/src/cmd/sgs/yacc/sparcv9/Makefile @@ -20,13 +20,9 @@ # CDDL HEADER END # # -# ident "%Z%%M% %I% %E% SMI" -# # Copyright (c) 1997 by Sun Microsystems, Inc. # All rights reserved. # -# cmd/sgs/yacc/sparcv9/Makefile -# # This Makefile is only to produce 64-bit yacc shared library liby.so.1 # and not for building 64-bit yacc itself. @@ -41,7 +37,7 @@ POFILE= all_lib: $(LIBS) -install_lib: all_lib $(ROOTLIBS64) $(ROOTLINKS64) +install_lib: all_lib $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) include ../Makefile.targ include ../../../Makefile.targ diff --git a/usr/src/lib/Makefile.lib b/usr/src/lib/Makefile.lib index d36b608df9..b87923b006 100644 --- a/usr/src/lib/Makefile.lib +++ b/usr/src/lib/Makefile.lib @@ -119,12 +119,11 @@ $(ROOTDEMODIRS) := DIRMODE = 755 ARFLAGS= r SONAME= $(DYNLIB) + # For most libraries, we should be able to resolve all symbols at link time, # either within the library or as dependencies, all text should be pure, and # combining relocations into one relocation table reduces startup costs. # All options are tunable to allow overload/omission from lower makefiles. - - HSONAME= -h$(SONAME) DYNFLAGS= $(HSONAME) $(ZTEXT) $(ZDEFS) $(BDIRECT) \ $(MAPFILES:%=-M%) $(MAPFILE.PGA:%=-M%) $(MAPFILE.NED:%=-M%) \ @@ -245,5 +244,16 @@ CLOBBERTARGFILES= $(LIBS) $(DYNLIB) $(CLOBBERFILES) TYPECHECK_LIB32 = $(TYPECHECK_LIB:%=$(MACH)/%) TYPECHECK_LIB64 = $(TYPECHECK_LIB:%=$(MACH64)/%) TYPECHECK_LIST= $(TYPELIST:%=-T %) -$(BUILD64)TYPECHECK.lib = $(CTFDIFF) -t -I $(TYPECHECK_LIST) $(TYPECHECK_LIB32) $(TYPECHECK_LIB64) +$(BUILD64)TYPECHECK.lib = $(CTFDIFF) -t -I $(TYPECHECK_LIST) \ + $(TYPECHECK_LIB32) $(TYPECHECK_LIB64) TYPECHECK = $(TYPECHECK_LIB:%=%.typecheck) + +# Links we need to create for compatibility +COMPATLINKS= +COMPATLINKS64= +ROOTCOMPATLINKS= $(COMPATLINKS:%=$(ROOT)/%) +ROOTCOMPATLINKS64= $(COMPATLINKS64:%=$(ROOT)/%) + +# So if someone doesn't set the target-specific variable they get a clue what +# went wrong. +COMPATLINKTARGET= /__you_didnt_use_COMPATLINKS_properly__ diff --git a/usr/src/lib/Makefile.mach b/usr/src/lib/Makefile.mach index cc200693ac..1e862d46ac 100644 --- a/usr/src/lib/Makefile.mach +++ b/usr/src/lib/Makefile.mach @@ -23,10 +23,8 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# -# lib/Makefile.mach # + # included to define targets built with machine-dependent source # @@ -56,4 +54,10 @@ $(MACHLIBS): FRC $(MACHLIBS64): FRC @cd $(@D); pwd; VERSION='$(VERSION)' $(MAKE) $(@F) +$(ROOTCOMPATLINKS): + $(RM) $@; $(SYMLINK) $(COMPATLINKTARGET) $@ + +$(ROOTCOMPATLINKS64): + $(RM) $@; $(SYMLINK) $(COMPATLINKTARGET) $@ + FRC: diff --git a/usr/src/lib/Makefile.rootfs b/usr/src/lib/Makefile.rootfs index c78894a551..b0aa7eec4d 100644 --- a/usr/src/lib/Makefile.rootfs +++ b/usr/src/lib/Makefile.rootfs @@ -22,11 +22,25 @@ # # Copyright 2003 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. -# -# ident "%Z%%M% %I% %E% SMI" -# + # To install libraries in the root filesystem (/lib), # include this Makefile right after Makefile.lib ROOTLIBDIR= $(ROOTFS_LIBDIR) ROOTLIBDIR64= $(ROOTFS_LIBDIR64) + + +# By default, libraries installed in /lib get a symbolic link added in +# /usr/lib for both the shared object and the compilation link. +COMPATLINKS= usr/lib/$(DYNLIB) \ + usr/lib/$(LIBLINKS) + +COMPATLINKS64= usr/lib/$(MACH64)/$(DYNLIB) \ + usr/lib/$(MACH64)/$(LIBLINKS) + +$(ROOT)/usr/lib/$(DYNLIB) := COMPATLINKTARGET=../../lib/$(DYNLIB) +$(ROOT)/usr/lib/$(LIBLINKS) := COMPATLINKTARGET=../../lib/$(DYNLIB) +$(ROOT)/usr/lib/$(MACH64)/$(DYNLIB):= \ + COMPATLINKTARGET=../../../lib/$(MACH64)/$(DYNLIB) +$(ROOT)/usr/lib/$(MACH64)/$(LIBLINKS) := \ + COMPATLINKTARGET=../../../lib/$(MACH64)/$(DYNLIB) diff --git a/usr/src/lib/Makefile.targ b/usr/src/lib/Makefile.targ index 5a2e72e00e..a06499a5cb 100644 --- a/usr/src/lib/Makefile.targ +++ b/usr/src/lib/Makefile.targ @@ -101,5 +101,11 @@ clobber: clean -$(RM) $(CLOBBERTARGFILES) clean: - -$(RM) $(OBJS) - -$(RM) $(PICS) $(DUPLICATE_SRC) $(CLEANFILES) + -$(RM) $(OBJS) $(PICS) $(DUPLICATE_SRC) $(CLEANFILES) + +$(ROOTCOMPATLINKS): + $(RM) $@; $(SYMLINK) $(COMPATLINKTARGET) $@ + +$(ROOTCOMPATLINKS64): + $(RM) $@; $(SYMLINK) $(COMPATLINKTARGET) $@ + diff --git a/usr/src/lib/README.Makefiles b/usr/src/lib/README.Makefiles index 3a41281d95..6db4c7ef6e 100644 --- a/usr/src/lib/README.Makefiles +++ b/usr/src/lib/README.Makefiles @@ -436,6 +436,19 @@ The third section typically consists of the following macros: necessary, and it should only contain optimization-related settings (or -g). + COMPATLINKS (if necessary) + + Set to a list of symbolic links that should also be provided for + this library. Each should also have a target-specific assignment to + COMPATLINKTARGET stating what the target of each link should be + + COMPATLINKS= usr/lib/libfoo.so + $(ROOT)/usr/lib/libfoo.so := COMPATLINKTARGET= libbar.so + + COMPATLINKS64 (if necessary) + + As COMPATLINKS, above, for 64bit objects. + Of course, you may use other macros as necessary. The fourth section typically consists of the following targets: @@ -539,6 +552,10 @@ Makefiles for libinetutil: install: all $(ROOTLIBS64) $(ROOTLINKS64) +If you included Makefile.rootfs to install your library into /lib, you should +also add $(ROOTCOMPATLINKS) and $(ROOTCOMPATLINKS64) to your install: target +to install compatibility symlinks into /usr/lib. + Observe that there is no .KEEP_STATE directive in these Makefiles, since all of these Makefiles include libinetutil/Makefile.com, and it already has a .KEEP_STATE directive. Also, note that the 64-bit Makefiles also include diff --git a/usr/src/lib/crt/Makefile.com b/usr/src/lib/crt/Makefile.com index 8415cf0cbe..70e5794cd0 100644 --- a/usr/src/lib/crt/Makefile.com +++ b/usr/src/lib/crt/Makefile.com @@ -59,6 +59,39 @@ $(COMMON_CRT) $(VALUES) := CFLAGS64 += $(C_PICFLAGS64) # intentional double exit SMOFF += unreachable +COMPATLINKS= usr/ccs/lib/values-Xa.o \ + usr/ccs/lib/values-Xc.o \ + usr/ccs/lib/values-Xs.o \ + usr/ccs/lib/values-Xt.o \ + usr/ccs/lib/values-xpg4.o \ + usr/ccs/lib/values-xpg6.o + +COMPATLINKS64= usr/ccs/lib/$(MACH64)/values-Xa.o \ + usr/ccs/lib/$(MACH64)/values-Xc.o \ + usr/ccs/lib/$(MACH64)/values-Xs.o \ + usr/ccs/lib/$(MACH64)/values-Xt.o \ + usr/ccs/lib/$(MACH64)/values-xpg4.o \ + usr/ccs/lib/$(MACH64)/values-xpg6.o + +$(ROOT)/usr/ccs/lib/values-Xa.o:= COMPATLINKTARGET=../../lib/values-Xa.o +$(ROOT)/usr/ccs/lib/values-Xc.o:= COMPATLINKTARGET=../../lib/values-Xc.o +$(ROOT)/usr/ccs/lib/values-Xs.o:= COMPATLINKTARGET=../../lib/values-Xs.o +$(ROOT)/usr/ccs/lib/values-Xt.o:= COMPATLINKTARGET=../../lib/values-Xt.o +$(ROOT)/usr/ccs/lib/values-xpg4.o:= COMPATLINKTARGET=../../lib/values-xpg4.o +$(ROOT)/usr/ccs/lib/values-xpg6.o:= COMPATLINKTARGET=../../lib/values-xpg6.o +$(ROOT)/usr/ccs/lib/$(MACH64)/values-Xa.o:= \ + COMPATLINKTARGET=../../../lib/$(MACH64)/values-Xa.o +$(ROOT)/usr/ccs/lib/$(MACH64)/values-Xc.o:= \ + COMPATLINKTARGET=../../../lib/$(MACH64)/values-Xc.o +$(ROOT)/usr/ccs/lib/$(MACH64)/values-Xs.o:= \ + COMPATLINKTARGET=../../../lib/$(MACH64)/values-Xs.o +$(ROOT)/usr/ccs/lib/$(MACH64)/values-Xt.o:= \ + COMPATLINKTARGET=../../../lib/$(MACH64)/values-Xt.o +$(ROOT)/usr/ccs/lib/$(MACH64)/values-xpg4.o:= \ + COMPATLINKTARGET=../../../lib/$(MACH64)/values-xpg4.o +$(ROOT)/usr/ccs/lib/$(MACH64)/values-xpg6.o:= \ + COMPATLINKTARGET=../../../lib/$(MACH64)/values-xpg6.o + .KEEP_STATE: all: $(OBJECTS) @@ -95,4 +128,5 @@ $(ROOTLIB64)/%.o: %.o $(ROOTLIB64)/gcrt1.o: $(RM) $(ROOTLIB64)/gcrt1.o; $(SYMLINK) crt1.o $(ROOTLIB64)/gcrt1.o -FRC: +$(ROOTCOMPATLINKS) $(ROOTCOMPATLINKS64): + $(RM) $@; $(SYMLINK) $(COMPATLINKTARGET) $@ diff --git a/usr/src/lib/crt/amd64/Makefile b/usr/src/lib/crt/amd64/Makefile index 16967b67ff..1b252c9d3a 100644 --- a/usr/src/lib/crt/amd64/Makefile +++ b/usr/src/lib/crt/amd64/Makefile @@ -27,4 +27,4 @@ include ../Makefile.com include ../../Makefile.lib.64 -install: $(ROOTOBJECTS64) +install: $(ROOTOBJECTS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/crt/i386/Makefile b/usr/src/lib/crt/i386/Makefile index 5affa893b7..ddd4fa11af 100644 --- a/usr/src/lib/crt/i386/Makefile +++ b/usr/src/lib/crt/i386/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com -install: $(ROOTOBJECTS) +install: $(ROOTOBJECTS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/crt/sparc/Makefile b/usr/src/lib/crt/sparc/Makefile index 5affa893b7..ddd4fa11af 100644 --- a/usr/src/lib/crt/sparc/Makefile +++ b/usr/src/lib/crt/sparc/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com -install: $(ROOTOBJECTS) +install: $(ROOTOBJECTS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/crt/sparcv9/Makefile b/usr/src/lib/crt/sparcv9/Makefile index 16967b67ff..1b252c9d3a 100644 --- a/usr/src/lib/crt/sparcv9/Makefile +++ b/usr/src/lib/crt/sparcv9/Makefile @@ -27,4 +27,4 @@ include ../Makefile.com include ../../Makefile.lib.64 -install: $(ROOTOBJECTS64) +install: $(ROOTOBJECTS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/fm/libfmevent/Makefile.com b/usr/src/lib/fm/libfmevent/Makefile.com index bf24e4c756..8ea99e219d 100644 --- a/usr/src/lib/fm/libfmevent/Makefile.com +++ b/usr/src/lib/fm/libfmevent/Makefile.com @@ -75,6 +75,21 @@ $(BUILD64)$(DYNLIB) := LDLIBS64 += -lumem -lnvpair -luutil -lsysevent \ CLEANFILES += ../common/fmev_errstring.c +COMPATLINKS = usr/lib/fm/$(DYNLIB) \ + usr/lib/fm/$(LIBLINKS) + +COMPATLINKS64 = usr/lib/fm/$(MACH64)/$(DYNLIB) \ + usr/lib/fm/$(MACH64)/$(LIBLINKS) + +$(ROOT)/usr/lib/fm/libfmevent.so.1 := \ + COMPATLINKTARGET=../../../lib/fm/libfmevent.so.1 +$(ROOT)/usr/lib/fm/libfmevent.so := \ + COMPATLINKTARGET=../../../lib/fm/libfmevent.so.1 +$(ROOT)/usr/lib/fm/$(MACH64)/libfmevent.so.1:= \ + COMPATLINKTARGET=../../../../lib/fm/$(MACH64)/libfmevent.so.1 +$(ROOT)/usr/lib/fm/$(MACH64)/libfmevent.so:= \ + COMPATLINKTARGET=../../../../lib/fm/$(MACH64)/libfmevent.so.1 + .KEEP_STATE: all: $(LIBS) diff --git a/usr/src/lib/fm/libfmevent/amd64/Makefile b/usr/src/lib/fm/libfmevent/amd64/Makefile index 34adaebb38..e3196f9733 100644 --- a/usr/src/lib/fm/libfmevent/amd64/Makefile +++ b/usr/src/lib/fm/libfmevent/amd64/Makefile @@ -27,4 +27,4 @@ include ../../../Makefile.lib.64 DYNFLAGS += -R/usr/lib/fm/$(MACH64) -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/fm/libfmevent/i386/Makefile b/usr/src/lib/fm/libfmevent/i386/Makefile index 991febf8ca..36ac38389b 100644 --- a/usr/src/lib/fm/libfmevent/i386/Makefile +++ b/usr/src/lib/fm/libfmevent/i386/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com DYNFLAGS += -R/usr/lib/fm -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/fm/libfmevent/sparc/Makefile b/usr/src/lib/fm/libfmevent/sparc/Makefile index 991febf8ca..36ac38389b 100644 --- a/usr/src/lib/fm/libfmevent/sparc/Makefile +++ b/usr/src/lib/fm/libfmevent/sparc/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com DYNFLAGS += -R/usr/lib/fm -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/fm/libfmevent/sparcv9/Makefile b/usr/src/lib/fm/libfmevent/sparcv9/Makefile index 34adaebb38..e3196f9733 100644 --- a/usr/src/lib/fm/libfmevent/sparcv9/Makefile +++ b/usr/src/lib/fm/libfmevent/sparcv9/Makefile @@ -27,4 +27,4 @@ include ../../../Makefile.lib.64 DYNFLAGS += -R/usr/lib/fm/$(MACH64) -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libadm/amd64/Makefile b/usr/src/lib/libadm/amd64/Makefile index cb39a2beff..ab72b4df45 100644 --- a/usr/src/lib/libadm/amd64/Makefile +++ b/usr/src/lib/libadm/amd64/Makefile @@ -23,10 +23,10 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libadm/i386/Makefile b/usr/src/lib/libadm/i386/Makefile index 7f8b80cc1a..3ec0fc6bb2 100644 --- a/usr/src/lib/libadm/i386/Makefile +++ b/usr/src/lib/libadm/i386/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libadm/sparc/Makefile b/usr/src/lib/libadm/sparc/Makefile index 7f8b80cc1a..3ec0fc6bb2 100644 --- a/usr/src/lib/libadm/sparc/Makefile +++ b/usr/src/lib/libadm/sparc/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libadm/sparcv9/Makefile b/usr/src/lib/libadm/sparcv9/Makefile index a4498e6166..e66fe7847d 100644 --- a/usr/src/lib/libadm/sparcv9/Makefile +++ b/usr/src/lib/libadm/sparcv9/Makefile @@ -23,7 +23,7 @@ # Copyright 1998-2003 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # # lib/libadm/sparcv9/Makefile # @@ -31,4 +31,4 @@ include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libaio/amd64/Makefile b/usr/src/lib/libaio/amd64/Makefile index 70f0fc2457..7769ebb6b9 100644 --- a/usr/src/lib/libaio/amd64/Makefile +++ b/usr/src/lib/libaio/amd64/Makefile @@ -27,6 +27,7 @@ include $(SRC)/lib/Makefile.filter.com include ../Makefile.com include $(SRC)/lib/Makefile.lib.64 -install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) \ + $(ROOTCOMPATLINKS64) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/libaio/i386/Makefile b/usr/src/lib/libaio/i386/Makefile index c318e6089b..682e5560ca 100644 --- a/usr/src/lib/libaio/i386/Makefile +++ b/usr/src/lib/libaio/i386/Makefile @@ -26,6 +26,7 @@ include $(SRC)/lib/Makefile.filter.com include ../Makefile.com -install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) \ + $(ROOTCOMPATLINKS) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/libaio/sparc/Makefile b/usr/src/lib/libaio/sparc/Makefile index c318e6089b..682e5560ca 100644 --- a/usr/src/lib/libaio/sparc/Makefile +++ b/usr/src/lib/libaio/sparc/Makefile @@ -26,6 +26,7 @@ include $(SRC)/lib/Makefile.filter.com include ../Makefile.com -install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) \ + $(ROOTCOMPATLINKS) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/libaio/sparcv9/Makefile b/usr/src/lib/libaio/sparcv9/Makefile index 70f0fc2457..7769ebb6b9 100644 --- a/usr/src/lib/libaio/sparcv9/Makefile +++ b/usr/src/lib/libaio/sparcv9/Makefile @@ -27,6 +27,7 @@ include $(SRC)/lib/Makefile.filter.com include ../Makefile.com include $(SRC)/lib/Makefile.lib.64 -install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) \ + $(ROOTCOMPATLINKS64) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/libavl/amd64/Makefile b/usr/src/lib/libavl/amd64/Makefile index cb39a2beff..ab72b4df45 100644 --- a/usr/src/lib/libavl/amd64/Makefile +++ b/usr/src/lib/libavl/amd64/Makefile @@ -23,10 +23,10 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libavl/i386/Makefile b/usr/src/lib/libavl/i386/Makefile index e129d9ceb8..16c9d09c13 100644 --- a/usr/src/lib/libavl/i386/Makefile +++ b/usr/src/lib/libavl/i386/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libavl/sparc/Makefile b/usr/src/lib/libavl/sparc/Makefile index e129d9ceb8..16c9d09c13 100644 --- a/usr/src/lib/libavl/sparc/Makefile +++ b/usr/src/lib/libavl/sparc/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libavl/sparcv9/Makefile b/usr/src/lib/libavl/sparcv9/Makefile index 0f67286356..164f1daab9 100644 --- a/usr/src/lib/libavl/sparcv9/Makefile +++ b/usr/src/lib/libavl/sparcv9/Makefile @@ -23,11 +23,11 @@ # Copyright 2003 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" + # # lib/libavl/sparcv9/Makefile include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libbsm/amd64/Makefile b/usr/src/lib/libbsm/amd64/Makefile index 2e8cdecf75..6782495649 100644 --- a/usr/src/lib/libbsm/amd64/Makefile +++ b/usr/src/lib/libbsm/amd64/Makefile @@ -22,10 +22,10 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libbsm/i386/Makefile b/usr/src/lib/libbsm/i386/Makefile index 282da97a76..cf2087e71e 100644 --- a/usr/src/lib/libbsm/i386/Makefile +++ b/usr/src/lib/libbsm/i386/Makefile @@ -25,4 +25,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libbsm/sparc/Makefile b/usr/src/lib/libbsm/sparc/Makefile index 282da97a76..cf2087e71e 100644 --- a/usr/src/lib/libbsm/sparc/Makefile +++ b/usr/src/lib/libbsm/sparc/Makefile @@ -25,4 +25,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libbsm/sparcv9/Makefile b/usr/src/lib/libbsm/sparcv9/Makefile index 2e8cdecf75..6782495649 100644 --- a/usr/src/lib/libbsm/sparcv9/Makefile +++ b/usr/src/lib/libbsm/sparcv9/Makefile @@ -22,10 +22,10 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libc/Makefile b/usr/src/lib/libc/Makefile index 7853c742c5..831425ecfd 100644 --- a/usr/src/lib/libc/Makefile +++ b/usr/src/lib/libc/Makefile @@ -45,6 +45,7 @@ ROOTVARIANTDIR64= $(ROOTLIB64)/libc # include common library definitions include ../Makefile.lib +include ../Makefile.rootfs # # on some architectures, we build multiple libc variants @@ -92,7 +93,7 @@ $(BUILD64)SUBDIRS += $(MACH64) $(VARIANT_SUBDIRS64) LIBS = $(DYNLIB) -ROOTLIBS64= $(ROOTLIBDIR64)/$(DYNLIB) +ROOTLIBS64= $(ROOTLIB64)/$(DYNLIB) MACHLIBS64= $(MACH64)/$(DYNLIB) VARIANTLIBS= $(VARIANTS:%=$(MACH)_%/$(VARBLD)/$(LIBBASENAME)_%.so.1) VARIANTLIBS64= $(VARIANTS64:%=$(MACH)_%/$(VARBLD64)/$(LIBBASENAME)_%.so.1) @@ -110,8 +111,8 @@ CLOBBERFILES += THIRDPARTYLICENSE extract-copyright $(ROOTHDRDIR)/%: port/gen/% $(INS.file) -$(ROOTLIBDIR)/$(DYNLIB) := FILEMODE = 755 -$(ROOTLIBDIR64)/$(DYNLIB) := FILEMODE = 755 +$(ROOTLIB)/$(DYNLIB) := FILEMODE = 755 +$(ROOTLIB64)/$(DYNLIB) := FILEMODE = 755 $(ROOTFS_LIBDIR)/$(DYNLIB) := FILEMODE = 755 $(ROOTFS_LIBDIR64)/$(DYNLIB) := FILEMODE = 755 @@ -165,7 +166,9 @@ $($(MACH)_COMP): FRC install: all \ etc \ inslib32 \ - $(BUILD64) inslib64 + $(ROOTCOMPATLINKS) + +$(BUILD64)install: inslib64 $(ROOTCOMPATLINKS64) inslib32: $(ROOTFS_LIBS) $(ROOTFS_LINKS) $(ROOTVARIANTLIBS) @@ -177,15 +180,6 @@ all_h: $(MACH)/assym.h $(MACH64)/assym.h check: $(CHECKHDRS) -$(ROOTFS_LIB)/%: $(MACH)/% - $(INS.file) -$(ROOTFS_LIBDIR)/$(LIBLINKS): $(ROOTFS_LIBDIR)/$(LIBLINKS)$(VERS) - $(INS.liblink) -$(ROOTFS_LIB64)/%: $(MACH64)/% - $(INS.file) -$(ROOTFS_LIBDIR64)/$(LIBLINKS): $(ROOTFS_LIBDIR64)/$(LIBLINKS)$(VERS) - $(INS.liblink) - $(ROOTVARIANTDIR): $(ROOTLIB) $(INS.dir) $(ROOTVARIANTDIR)/%: $(ROOTVARIANTDIR) $(VAR1_BLDDIR)/% @@ -233,5 +227,6 @@ cscope.out tags: FRC $(XREF) -x $@ FRC: + # include MACH-specific library targets include ../Makefile.mach diff --git a/usr/src/lib/libc_db/amd64/Makefile b/usr/src/lib/libc_db/amd64/Makefile index 9a111ae271..99231f7c40 100644 --- a/usr/src/lib/libc_db/amd64/Makefile +++ b/usr/src/lib/libc_db/amd64/Makefile @@ -33,4 +33,5 @@ CPPFLAGS += -D_SYSCALL32 BUILD.SO= $(LD) -o $@ -G $(DYNFLAGS) $(PICS) $(LDLIBS) -install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) \ + $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libc_db/i386/Makefile b/usr/src/lib/libc_db/i386/Makefile index 5bfc896a14..5e1faf8ef7 100644 --- a/usr/src/lib/libc_db/i386/Makefile +++ b/usr/src/lib/libc_db/i386/Makefile @@ -30,4 +30,5 @@ include ../Makefile.com BUILD.SO= $(LD) -o $@ -G $(DYNFLAGS) $(PICS) $(LDLIBS) -install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) \ + $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libc_db/sparc/Makefile b/usr/src/lib/libc_db/sparc/Makefile index 2553929591..64b7326c93 100644 --- a/usr/src/lib/libc_db/sparc/Makefile +++ b/usr/src/lib/libc_db/sparc/Makefile @@ -30,4 +30,5 @@ include ../Makefile.com BUILD.SO= $(LD) -o $@ -G $(DYNFLAGS) $(PICS) $(LDLIBS) -install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) \ + $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libc_db/sparcv9/Makefile b/usr/src/lib/libc_db/sparcv9/Makefile index ee65b634b0..6e0e5d6357 100644 --- a/usr/src/lib/libc_db/sparcv9/Makefile +++ b/usr/src/lib/libc_db/sparcv9/Makefile @@ -33,4 +33,5 @@ CPPFLAGS += -D_SYSCALL32 BUILD.SO= $(LD) -o $@ -G $(DYNFLAGS) $(PICS) $(LDLIBS) -install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) \ + $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libcmdutils/amd64/Makefile b/usr/src/lib/libcmdutils/amd64/Makefile index cb39a2beff..ab72b4df45 100644 --- a/usr/src/lib/libcmdutils/amd64/Makefile +++ b/usr/src/lib/libcmdutils/amd64/Makefile @@ -23,10 +23,10 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libcmdutils/i386/Makefile b/usr/src/lib/libcmdutils/i386/Makefile index e129d9ceb8..16c9d09c13 100644 --- a/usr/src/lib/libcmdutils/i386/Makefile +++ b/usr/src/lib/libcmdutils/i386/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libcmdutils/sparc/Makefile b/usr/src/lib/libcmdutils/sparc/Makefile index e129d9ceb8..16c9d09c13 100644 --- a/usr/src/lib/libcmdutils/sparc/Makefile +++ b/usr/src/lib/libcmdutils/sparc/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libcmdutils/sparcv9/Makefile b/usr/src/lib/libcmdutils/sparcv9/Makefile index 8b7605f4cf..ceab7c0bdd 100644 --- a/usr/src/lib/libcmdutils/sparcv9/Makefile +++ b/usr/src/lib/libcmdutils/sparcv9/Makefile @@ -23,11 +23,11 @@ # Copyright 2003 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" + # # lib/libcmdutils/sparcv9/Makefile include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libcontract/amd64/Makefile b/usr/src/lib/libcontract/amd64/Makefile index 010d484a50..2bbd813164 100644 --- a/usr/src/lib/libcontract/amd64/Makefile +++ b/usr/src/lib/libcontract/amd64/Makefile @@ -27,4 +27,4 @@ include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libcontract/i386/Makefile b/usr/src/lib/libcontract/i386/Makefile index 18584b4da1..59045395eb 100644 --- a/usr/src/lib/libcontract/i386/Makefile +++ b/usr/src/lib/libcontract/i386/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libcontract/sparc/Makefile b/usr/src/lib/libcontract/sparc/Makefile index 18584b4da1..59045395eb 100644 --- a/usr/src/lib/libcontract/sparc/Makefile +++ b/usr/src/lib/libcontract/sparc/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libcontract/sparcv9/Makefile b/usr/src/lib/libcontract/sparcv9/Makefile index cb39a2beff..2bbd813164 100644 --- a/usr/src/lib/libcontract/sparcv9/Makefile +++ b/usr/src/lib/libcontract/sparcv9/Makefile @@ -23,10 +23,8 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libcrypt/Makefile.com b/usr/src/lib/libcrypt/Makefile.com index 70b937cb7a..eb4db4b311 100644 --- a/usr/src/lib/libcrypt/Makefile.com +++ b/usr/src/lib/libcrypt/Makefile.com @@ -52,26 +52,24 @@ CERRWARN += $(CNOWARN_UNINIT) all: $(LIBS) -include ../../Makefile.targ +COMPATLINKS = usr/lib/libcrypt_i.so$(VERS) \ + usr/lib/libcrypt_i.so \ + usr/lib/libcrypt_d.so$(VERS) \ + usr/lib/libcrypt_d.so -$(ROOTLINKS) := INS.liblink = \ - $(RM) $@; $(SYMLINK) $(LIBLINKPATH)$(LIBLINKS)$(VERS) $@; \ - cd $(ROOTLIBDIR); \ - $(RM) libcrypt_i.so$(VERS) libcrypt_i.so ;\ - $(RM) libcrypt_d.so$(VERS) libcrypt_d.so ;\ - $(SYMLINK) libcrypt.so$(VERS) libcrypt_i.so$(VERS); \ - $(SYMLINK) libcrypt.so libcrypt_i.so; \ - $(SYMLINK) libcrypt.so$(VERS) libcrypt_d.so$(VERS); \ - $(SYMLINK) libcrypt.so libcrypt_d.so; +COMPATLINKS64 = usr/lib/$(MACH64)/libcrypt_i.so$(VERS) \ + usr/lib/$(MACH64)/libcrypt_i.so \ + usr/lib/$(MACH64)/libcrypt_d.so$(VERS) \ + usr/lib/$(MACH64)/libcrypt_d.so -$(ROOTLINKS64) := INS.liblink64 = \ - $(RM) $@; $(SYMLINK) $(LIBLINKPATH)$(LIBLINKS)$(VERS) $@; \ - cd $(ROOTLIBDIR64); \ - $(RM) libcrypt_i.so$(VERS) libcrypt_i.so ;\ - $(RM) libcrypt_d.so$(VERS) libcrypt_d.so ;\ - $(SYMLINK) libcrypt.so$(VERS) libcrypt_i.so$(VERS); \ - $(SYMLINK) libcrypt.so libcrypt_i.so; \ - $(SYMLINK) libcrypt.so$(VERS) libcrypt_d.so$(VERS); \ - $(SYMLINK) libcrypt.so libcrypt_d.so; +$(ROOT)/usr/lib/libcrypt_i.so$(VERS) := COMPATLINKTARGET= libcrypt.so$(VERS) +$(ROOT)/usr/lib/libcrypt_i.so := COMPATLINKTARGET= libcrypt.so +$(ROOT)/usr/lib/libcrypt_d.so$(VERS) := COMPATLINKTARGET= libcrypt.so$(VERS) +$(ROOT)/usr/lib/libcrypt_d.so := COMPATLINKTARGET= libcrypt.so +$(ROOT)/usr/lib/$(MACH64)/libcrypt_i.so$(VERS) := COMPATLINKTARGET= libcrypt.so$(VERS) +$(ROOT)/usr/lib/$(MACH64)/libcrypt_i.so := COMPATLINKTARGET= libcrypt.so +$(ROOT)/usr/lib/$(MACH64)/libcrypt_d.so$(VERS) := COMPATLINKTARGET= libcrypt.so$(VERS) +$(ROOT)/usr/lib/$(MACH64)/libcrypt_d.so := COMPATLINKTARGET= libcrypt.so +include ../../Makefile.targ diff --git a/usr/src/lib/libcrypt/amd64/Makefile b/usr/src/lib/libcrypt/amd64/Makefile index 9dbcf2e982..410bdb818e 100644 --- a/usr/src/lib/libcrypt/amd64/Makefile +++ b/usr/src/lib/libcrypt/amd64/Makefile @@ -29,4 +29,4 @@ include ../../Makefile.lib.64 .KEEP_STATE: -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libcrypt/i386/Makefile b/usr/src/lib/libcrypt/i386/Makefile index 703879a954..dc6deda296 100644 --- a/usr/src/lib/libcrypt/i386/Makefile +++ b/usr/src/lib/libcrypt/i386/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libcrypt/sparc/Makefile b/usr/src/lib/libcrypt/sparc/Makefile index 703879a954..dc6deda296 100644 --- a/usr/src/lib/libcrypt/sparc/Makefile +++ b/usr/src/lib/libcrypt/sparc/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libcrypt/sparcv9/Makefile b/usr/src/lib/libcrypt/sparcv9/Makefile index 87ac99efc1..14bdb8486d 100644 --- a/usr/src/lib/libcrypt/sparcv9/Makefile +++ b/usr/src/lib/libcrypt/sparcv9/Makefile @@ -23,11 +23,8 @@ # Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# -# lib/libcrypt/sparc/Makefile include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libctf/amd64/Makefile b/usr/src/lib/libctf/amd64/Makefile index b13b247ca8..a48c536235 100644 --- a/usr/src/lib/libctf/amd64/Makefile +++ b/usr/src/lib/libctf/amd64/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libctf/i386/Makefile b/usr/src/lib/libctf/i386/Makefile index 282da97a76..cf2087e71e 100644 --- a/usr/src/lib/libctf/i386/Makefile +++ b/usr/src/lib/libctf/i386/Makefile @@ -25,4 +25,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libctf/sparc/Makefile b/usr/src/lib/libctf/sparc/Makefile index 282da97a76..cf2087e71e 100644 --- a/usr/src/lib/libctf/sparc/Makefile +++ b/usr/src/lib/libctf/sparc/Makefile @@ -25,4 +25,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libctf/sparcv9/Makefile b/usr/src/lib/libctf/sparcv9/Makefile index b13b247ca8..a48c536235 100644 --- a/usr/src/lib/libctf/sparcv9/Makefile +++ b/usr/src/lib/libctf/sparcv9/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libcurses/Makefile.com b/usr/src/lib/libcurses/Makefile.com index 46a960e80a..2082f3b634 100644 --- a/usr/src/lib/libcurses/Makefile.com +++ b/usr/src/lib/libcurses/Makefile.com @@ -162,24 +162,37 @@ CLOBBERFILES= libcurses.so libcurses.so$(VERS) all: $(LIBS) - -# -# Install rules for libtermlib.so links. -# Augments the rule in Makefile.targ -# -$(ROOTLIBDIR)/$(LIBLINKS) := INS.liblink= \ - $(RM) $@; $(SYMLINK) $(LIBLINKPATH)$(LIBLINKS)$(VERS) $@; \ - cd $(ROOTLIBDIR); \ - $(RM) libtermlib.so libtermlib.so$(VERS); \ - $(SYMLINK) libcurses.so$(VERS) libtermlib.so$(VERS); \ - $(SYMLINK) libtermlib.so$(VERS) libtermlib.so; - -$(ROOTLIBDIR64)/$(LIBLINKS) := INS.liblink64= \ - $(RM) $@; $(SYMLINK) $(LIBLINKPATH)$(LIBLINKS)$(VERS) $@; \ - cd $(ROOTLIBDIR64); \ - $(RM) libtermlib.so libtermlib.so$(VERS);\ - $(SYMLINK) libcurses.so$(VERS) libtermlib.so$(VERS); \ - $(SYMLINK) libtermlib.so$(VERS) libtermlib.so; +COMPATLINKS += usr/ccs/lib/libcurses.so \ + usr/ccs/lib/libtermlib.so \ + usr/lib/libtermlib.so \ + usr/lib/libtermlib.so.1 \ + lib/libtermlib.so \ + lib/libtermlib.so.1 + +COMPATLINKS64 += usr/ccs/lib/$(MACH64)/libcurses.so \ + usr/ccs/lib/$(MACH64)/libtermlib.so \ + usr/lib/$(MACH64)/libtermlib.so \ + usr/lib/$(MACH64)/libtermlib.so.1 \ + lib/$(MACH64)/libtermlib.so \ + lib/$(MACH64)/libtermlib.so.1 + +$(ROOT)/usr/ccs/lib/libcurses.so := COMPATLINKTARGET=../../../lib/libcurses.so.1 +$(ROOT)/usr/ccs/lib/libtermlib.so := \ + COMPATLINKTARGET=../../../lib/libcurses.so.1 +$(ROOT)/usr/ccs/lib/$(MACH64)/libcurses.so := \ + COMPATLINKTARGET=../../../../lib/$(MACH64)/libcurses.so.1 +$(ROOT)/usr/ccs/lib/$(MACH64)/libtermlib.so := \ + COMPATLINKTARGET=../../../../lib/$(MACH64)/libcurses.so.1 +$(ROOT)/usr/lib/libtermlib.so.1 := COMPATLINKTARGET= ../../lib/libcurses.so.1 +$(ROOT)/usr/lib/libtermlib.so := COMPATLINKTARGET= ../../lib/libcurses.so.1 +$(ROOT)/usr/lib/$(MACH64)/libtermlib.so.1 := \ + COMPATLINKTARGET= ../../../lib/$(MACH64)/libcurses.so.1 +$(ROOT)/usr/lib/$(MACH64)/libtermlib.so := \ + COMPATLINKTARGET= ../../../lib/$(MACH64)/libcurses.so.1 +$(ROOT)/lib/libtermlib.so.1 := COMPATLINKTARGET= libcurses.so.1 +$(ROOT)/lib/libtermlib.so := COMPATLINKTARGET= libtermlib.so.1 +$(ROOT)/lib/$(MACH64)/libtermlib.so.1 := COMPATLINKTARGET= libcurses.so.1 +$(ROOT)/lib/$(MACH64)/libtermlib.so := COMPATLINKTARGET= libtermlib.so.1 # # Include library targets diff --git a/usr/src/lib/libcurses/amd64/Makefile b/usr/src/lib/libcurses/amd64/Makefile index 57138967e0..81d2c84ed7 100644 --- a/usr/src/lib/libcurses/amd64/Makefile +++ b/usr/src/lib/libcurses/amd64/Makefile @@ -31,4 +31,4 @@ include ../../Makefile.lib.64 all: $(LIBS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libcurses/i386/Makefile b/usr/src/lib/libcurses/i386/Makefile index d6eed917a9..8537c30eda 100644 --- a/usr/src/lib/libcurses/i386/Makefile +++ b/usr/src/lib/libcurses/i386/Makefile @@ -29,4 +29,4 @@ include ../Makefile.com all: $(LIBS) -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libcurses/sparc/Makefile b/usr/src/lib/libcurses/sparc/Makefile index d6eed917a9..8537c30eda 100644 --- a/usr/src/lib/libcurses/sparc/Makefile +++ b/usr/src/lib/libcurses/sparc/Makefile @@ -29,4 +29,4 @@ include ../Makefile.com all: $(LIBS) -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libcurses/sparcv9/Makefile b/usr/src/lib/libcurses/sparcv9/Makefile index 57138967e0..81d2c84ed7 100644 --- a/usr/src/lib/libcurses/sparcv9/Makefile +++ b/usr/src/lib/libcurses/sparcv9/Makefile @@ -31,4 +31,4 @@ include ../../Makefile.lib.64 all: $(LIBS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libdevice/amd64/Makefile b/usr/src/lib/libdevice/amd64/Makefile index cb39a2beff..ab72b4df45 100644 --- a/usr/src/lib/libdevice/amd64/Makefile +++ b/usr/src/lib/libdevice/amd64/Makefile @@ -23,10 +23,10 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libdevice/i386/Makefile b/usr/src/lib/libdevice/i386/Makefile index 18584b4da1..59045395eb 100644 --- a/usr/src/lib/libdevice/i386/Makefile +++ b/usr/src/lib/libdevice/i386/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libdevice/sparc/Makefile b/usr/src/lib/libdevice/sparc/Makefile index 18584b4da1..59045395eb 100644 --- a/usr/src/lib/libdevice/sparc/Makefile +++ b/usr/src/lib/libdevice/sparc/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libdevice/sparcv9/Makefile b/usr/src/lib/libdevice/sparcv9/Makefile index cb39a2beff..ab72b4df45 100644 --- a/usr/src/lib/libdevice/sparcv9/Makefile +++ b/usr/src/lib/libdevice/sparcv9/Makefile @@ -23,10 +23,10 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libdevid/amd64/Makefile b/usr/src/lib/libdevid/amd64/Makefile index 010d484a50..2bbd813164 100644 --- a/usr/src/lib/libdevid/amd64/Makefile +++ b/usr/src/lib/libdevid/amd64/Makefile @@ -27,4 +27,4 @@ include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libdevid/i386/Makefile b/usr/src/lib/libdevid/i386/Makefile index 18584b4da1..59045395eb 100644 --- a/usr/src/lib/libdevid/i386/Makefile +++ b/usr/src/lib/libdevid/i386/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libdevid/sparc/Makefile b/usr/src/lib/libdevid/sparc/Makefile index 18584b4da1..59045395eb 100644 --- a/usr/src/lib/libdevid/sparc/Makefile +++ b/usr/src/lib/libdevid/sparc/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libdevid/sparcv9/Makefile b/usr/src/lib/libdevid/sparcv9/Makefile index cb39a2beff..ab72b4df45 100644 --- a/usr/src/lib/libdevid/sparcv9/Makefile +++ b/usr/src/lib/libdevid/sparcv9/Makefile @@ -23,10 +23,10 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libdevinfo/amd64/Makefile b/usr/src/lib/libdevinfo/amd64/Makefile index 9ab764a959..a41aeec527 100644 --- a/usr/src/lib/libdevinfo/amd64/Makefile +++ b/usr/src/lib/libdevinfo/amd64/Makefile @@ -22,7 +22,7 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # include ../Makefile.com @@ -30,4 +30,4 @@ include ../../Makefile.lib.64 all: $(LIBS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libdevinfo/i386/Makefile b/usr/src/lib/libdevinfo/i386/Makefile index a8078739af..1551cf2cb2 100644 --- a/usr/src/lib/libdevinfo/i386/Makefile +++ b/usr/src/lib/libdevinfo/i386/Makefile @@ -27,4 +27,4 @@ include ../Makefile.com all: $(LIBS) -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libdevinfo/sparc/Makefile b/usr/src/lib/libdevinfo/sparc/Makefile index a8078739af..1551cf2cb2 100644 --- a/usr/src/lib/libdevinfo/sparc/Makefile +++ b/usr/src/lib/libdevinfo/sparc/Makefile @@ -27,4 +27,4 @@ include ../Makefile.com all: $(LIBS) -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libdevinfo/sparcv9/Makefile b/usr/src/lib/libdevinfo/sparcv9/Makefile index 9ab764a959..a41aeec527 100644 --- a/usr/src/lib/libdevinfo/sparcv9/Makefile +++ b/usr/src/lib/libdevinfo/sparcv9/Makefile @@ -22,7 +22,7 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # include ../Makefile.com @@ -30,4 +30,4 @@ include ../../Makefile.lib.64 all: $(LIBS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libdhcpagent/amd64/Makefile b/usr/src/lib/libdhcpagent/amd64/Makefile index 2b996f5855..f5b405d5a7 100644 --- a/usr/src/lib/libdhcpagent/amd64/Makefile +++ b/usr/src/lib/libdhcpagent/amd64/Makefile @@ -29,4 +29,4 @@ include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libdhcpagent/i386/Makefile b/usr/src/lib/libdhcpagent/i386/Makefile index 64d377eef1..1b2c7a9afc 100644 --- a/usr/src/lib/libdhcpagent/i386/Makefile +++ b/usr/src/lib/libdhcpagent/i386/Makefile @@ -28,4 +28,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libdhcpagent/sparc/Makefile b/usr/src/lib/libdhcpagent/sparc/Makefile index 64d377eef1..1b2c7a9afc 100644 --- a/usr/src/lib/libdhcpagent/sparc/Makefile +++ b/usr/src/lib/libdhcpagent/sparc/Makefile @@ -28,4 +28,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libdhcpagent/sparcv9/Makefile b/usr/src/lib/libdhcpagent/sparcv9/Makefile index 2b996f5855..f5b405d5a7 100644 --- a/usr/src/lib/libdhcpagent/sparcv9/Makefile +++ b/usr/src/lib/libdhcpagent/sparcv9/Makefile @@ -29,4 +29,4 @@ include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libdhcputil/amd64/Makefile b/usr/src/lib/libdhcputil/amd64/Makefile index 7451cc1755..4b5199cd4c 100644 --- a/usr/src/lib/libdhcputil/amd64/Makefile +++ b/usr/src/lib/libdhcputil/amd64/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libdhcputil/i386/Makefile b/usr/src/lib/libdhcputil/i386/Makefile index fe079a23cb..236b63a452 100644 --- a/usr/src/lib/libdhcputil/i386/Makefile +++ b/usr/src/lib/libdhcputil/i386/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libdhcputil/sparc/Makefile b/usr/src/lib/libdhcputil/sparc/Makefile index fe079a23cb..236b63a452 100644 --- a/usr/src/lib/libdhcputil/sparc/Makefile +++ b/usr/src/lib/libdhcputil/sparc/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libdhcputil/sparcv9/Makefile b/usr/src/lib/libdhcputil/sparcv9/Makefile index 7451cc1755..4b5199cd4c 100644 --- a/usr/src/lib/libdhcputil/sparcv9/Makefile +++ b/usr/src/lib/libdhcputil/sparcv9/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libdlpi/amd64/Makefile b/usr/src/lib/libdlpi/amd64/Makefile index a76ebb70e3..99ed908528 100644 --- a/usr/src/lib/libdlpi/amd64/Makefile +++ b/usr/src/lib/libdlpi/amd64/Makefile @@ -22,10 +22,10 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#pragma ident "%Z%%M% %I% %E% SMI" + # include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libdlpi/i386/Makefile b/usr/src/lib/libdlpi/i386/Makefile index 703879a954..dc6deda296 100644 --- a/usr/src/lib/libdlpi/i386/Makefile +++ b/usr/src/lib/libdlpi/i386/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libdlpi/sparc/Makefile b/usr/src/lib/libdlpi/sparc/Makefile index 703879a954..dc6deda296 100644 --- a/usr/src/lib/libdlpi/sparc/Makefile +++ b/usr/src/lib/libdlpi/sparc/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libdlpi/sparcv9/Makefile b/usr/src/lib/libdlpi/sparcv9/Makefile index 600ff73f12..99ed908528 100644 --- a/usr/src/lib/libdlpi/sparcv9/Makefile +++ b/usr/src/lib/libdlpi/sparcv9/Makefile @@ -22,10 +22,10 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libdoor/amd64/Makefile b/usr/src/lib/libdoor/amd64/Makefile index 70f0fc2457..7769ebb6b9 100644 --- a/usr/src/lib/libdoor/amd64/Makefile +++ b/usr/src/lib/libdoor/amd64/Makefile @@ -27,6 +27,7 @@ include $(SRC)/lib/Makefile.filter.com include ../Makefile.com include $(SRC)/lib/Makefile.lib.64 -install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) \ + $(ROOTCOMPATLINKS64) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/libdoor/i386/Makefile b/usr/src/lib/libdoor/i386/Makefile index c318e6089b..682e5560ca 100644 --- a/usr/src/lib/libdoor/i386/Makefile +++ b/usr/src/lib/libdoor/i386/Makefile @@ -26,6 +26,7 @@ include $(SRC)/lib/Makefile.filter.com include ../Makefile.com -install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) \ + $(ROOTCOMPATLINKS) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/libdoor/sparc/Makefile b/usr/src/lib/libdoor/sparc/Makefile index c318e6089b..682e5560ca 100644 --- a/usr/src/lib/libdoor/sparc/Makefile +++ b/usr/src/lib/libdoor/sparc/Makefile @@ -26,6 +26,7 @@ include $(SRC)/lib/Makefile.filter.com include ../Makefile.com -install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) \ + $(ROOTCOMPATLINKS) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/libdoor/sparcv9/Makefile b/usr/src/lib/libdoor/sparcv9/Makefile index 70f0fc2457..7769ebb6b9 100644 --- a/usr/src/lib/libdoor/sparcv9/Makefile +++ b/usr/src/lib/libdoor/sparcv9/Makefile @@ -27,6 +27,7 @@ include $(SRC)/lib/Makefile.filter.com include ../Makefile.com include $(SRC)/lib/Makefile.lib.64 -install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) \ + $(ROOTCOMPATLINKS64) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/libdscp/sparc/Makefile b/usr/src/lib/libdscp/sparc/Makefile index 182e6180d4..5c4980a2bd 100644 --- a/usr/src/lib/libdscp/sparc/Makefile +++ b/usr/src/lib/libdscp/sparc/Makefile @@ -22,7 +22,7 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # include ../Makefile.com diff --git a/usr/src/lib/libdwarf/amd64/Makefile b/usr/src/lib/libdwarf/amd64/Makefile index 15a899f96f..a3d127a1e3 100644 --- a/usr/src/lib/libdwarf/amd64/Makefile +++ b/usr/src/lib/libdwarf/amd64/Makefile @@ -16,4 +16,4 @@ include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libdwarf/i386/Makefile b/usr/src/lib/libdwarf/i386/Makefile index 4398507523..dd7a697f17 100644 --- a/usr/src/lib/libdwarf/i386/Makefile +++ b/usr/src/lib/libdwarf/i386/Makefile @@ -15,4 +15,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libdwarf/sparc/Makefile b/usr/src/lib/libdwarf/sparc/Makefile index 4398507523..dd7a697f17 100644 --- a/usr/src/lib/libdwarf/sparc/Makefile +++ b/usr/src/lib/libdwarf/sparc/Makefile @@ -15,4 +15,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libdwarf/sparcv9/Makefile b/usr/src/lib/libdwarf/sparcv9/Makefile index 15a899f96f..a3d127a1e3 100644 --- a/usr/src/lib/libdwarf/sparcv9/Makefile +++ b/usr/src/lib/libdwarf/sparcv9/Makefile @@ -16,4 +16,4 @@ include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libefi/amd64/Makefile b/usr/src/lib/libefi/amd64/Makefile index 30d4207380..f820b35e24 100644 --- a/usr/src/lib/libefi/amd64/Makefile +++ b/usr/src/lib/libefi/amd64/Makefile @@ -31,4 +31,4 @@ LIBS = $(DYNLIB) all: $(LIBS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libefi/i386/Makefile b/usr/src/lib/libefi/i386/Makefile index 7421a75150..a681a7f1a0 100644 --- a/usr/src/lib/libefi/i386/Makefile +++ b/usr/src/lib/libefi/i386/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libefi/sparc/Makefile b/usr/src/lib/libefi/sparc/Makefile index 7421a75150..a681a7f1a0 100644 --- a/usr/src/lib/libefi/sparc/Makefile +++ b/usr/src/lib/libefi/sparc/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libefi/sparcv9/Makefile b/usr/src/lib/libefi/sparcv9/Makefile index 58c362f541..309834ae94 100644 --- a/usr/src/lib/libefi/sparcv9/Makefile +++ b/usr/src/lib/libefi/sparcv9/Makefile @@ -31,4 +31,4 @@ LIBS = $(DYNLIB) all: $(LIBS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libeti/form/Makefile.com b/usr/src/lib/libeti/form/Makefile.com index 46555e4310..5a9eae2ad9 100644 --- a/usr/src/lib/libeti/form/Makefile.com +++ b/usr/src/lib/libeti/form/Makefile.com @@ -77,6 +77,13 @@ CERRWARN += -_gcc=-Wno-parentheses CERRWARN += $(CNOWARN_UNINIT) CERRWARN += -_gcc=-Wno-char-subscripts +COMPATLINKS= usr/ccs/lib/libform.so +COMPATLINKS64= usr/ccs/lib/$(MACH64)/libform.so + +$(ROOT)/usr/ccs/lib/libform.so := COMPATLINKTARGET= ../../lib/libform.so.1 +$(ROOT)/usr/ccs/lib/$(MACH64)/libform.so := \ + COMPATLINKTARGET= ../../../lib/$(MACH64)/libform.so.1 + .KEEP_STATE: all: $(LIBS) diff --git a/usr/src/lib/libeti/form/amd64/Makefile b/usr/src/lib/libeti/form/amd64/Makefile index 4201c0bb20..5757f3b5ec 100644 --- a/usr/src/lib/libeti/form/amd64/Makefile +++ b/usr/src/lib/libeti/form/amd64/Makefile @@ -29,4 +29,4 @@ DYNFLAGS += $(DYNFLAGS64) .KEEP_STATE: -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libeti/form/i386/Makefile b/usr/src/lib/libeti/form/i386/Makefile index 9e959ae552..ee434ebd50 100644 --- a/usr/src/lib/libeti/form/i386/Makefile +++ b/usr/src/lib/libeti/form/i386/Makefile @@ -26,4 +26,5 @@ include ../Makefile.com .KEEP_STATE: -install: all $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB) +install: all $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB) \ + $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libeti/form/sparc/Makefile b/usr/src/lib/libeti/form/sparc/Makefile index 9e959ae552..ee434ebd50 100644 --- a/usr/src/lib/libeti/form/sparc/Makefile +++ b/usr/src/lib/libeti/form/sparc/Makefile @@ -26,4 +26,5 @@ include ../Makefile.com .KEEP_STATE: -install: all $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB) +install: all $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB) \ + $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libeti/form/sparcv9/Makefile b/usr/src/lib/libeti/form/sparcv9/Makefile index 06a8dcb9bb..34a4272b2b 100644 --- a/usr/src/lib/libeti/form/sparcv9/Makefile +++ b/usr/src/lib/libeti/form/sparcv9/Makefile @@ -29,4 +29,4 @@ DYNFLAGS += $(DYNFLAGS64) .KEEP_STATE: -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libeti/menu/Makefile.com b/usr/src/lib/libeti/menu/Makefile.com index 1b17cac70c..4964d9cb93 100644 --- a/usr/src/lib/libeti/menu/Makefile.com +++ b/usr/src/lib/libeti/menu/Makefile.com @@ -73,6 +73,13 @@ LDLIBS += -lcurses -lc CERRWARN += -_gcc=-Wno-parentheses +COMPATLINKS= usr/ccs/lib/libmenu.so +COMPATLINKS64= usr/ccs/lib/$(MACH64)/libmenu.so + +$(ROOT)/usr/ccs/lib/libmenu.so := COMPATLINKTARGET= ../../lib/libmenu.so.1 +$(ROOT)/usr/ccs/lib/$(MACH64)/libmenu.so:= \ + COMPATLINKTARGET=../../../lib/$(MACH64)/libmenu.so.1 + .KEEP_STATE: all: $(LIBS) diff --git a/usr/src/lib/libeti/menu/amd64/Makefile b/usr/src/lib/libeti/menu/amd64/Makefile index 04160e850a..a2b9ee510c 100644 --- a/usr/src/lib/libeti/menu/amd64/Makefile +++ b/usr/src/lib/libeti/menu/amd64/Makefile @@ -22,7 +22,7 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # include ../Makefile.com @@ -32,4 +32,4 @@ DYNFLAGS += $(DYNFLAGS64) .KEEP_STATE: -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libeti/menu/i386/Makefile b/usr/src/lib/libeti/menu/i386/Makefile index 7db1ae8c3d..fa3f9786e2 100644 --- a/usr/src/lib/libeti/menu/i386/Makefile +++ b/usr/src/lib/libeti/menu/i386/Makefile @@ -27,4 +27,5 @@ include ../Makefile.com .KEEP_STATE: -install: all $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB) +install: all $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB) \ + $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libeti/menu/sparc/Makefile b/usr/src/lib/libeti/menu/sparc/Makefile index 7db1ae8c3d..fa3f9786e2 100644 --- a/usr/src/lib/libeti/menu/sparc/Makefile +++ b/usr/src/lib/libeti/menu/sparc/Makefile @@ -27,4 +27,5 @@ include ../Makefile.com .KEEP_STATE: -install: all $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB) +install: all $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB) \ + $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libeti/menu/sparcv9/Makefile b/usr/src/lib/libeti/menu/sparcv9/Makefile index 04160e850a..a2b9ee510c 100644 --- a/usr/src/lib/libeti/menu/sparcv9/Makefile +++ b/usr/src/lib/libeti/menu/sparcv9/Makefile @@ -22,7 +22,7 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # include ../Makefile.com @@ -32,4 +32,4 @@ DYNFLAGS += $(DYNFLAGS64) .KEEP_STATE: -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libeti/panel/Makefile.com b/usr/src/lib/libeti/panel/Makefile.com index f8c830fe70..02ccd30ee2 100644 --- a/usr/src/lib/libeti/panel/Makefile.com +++ b/usr/src/lib/libeti/panel/Makefile.com @@ -49,6 +49,13 @@ LDLIBS += -lcurses -lc CERRWARN += -_gcc=-Wno-parentheses +COMPATLINKS= usr/ccs/lib/libpanel.so +COMPATLINKS64= usr/ccs/lib/$(MACH64)/libpanel.so + +$(ROOT)/usr/ccs/lib/libpanel.so:= COMPATLINKTARGET=../../lib/libpanel.so.1 +$(ROOT)/usr/ccs/lib/$(MACH64)/libpanel.so:= \ + COMPATLINKTARGET=../../../lib/$(MACH64)/libpanel.so.1 + .KEEP_STATE: all: $(LIBS) diff --git a/usr/src/lib/libeti/panel/amd64/Makefile b/usr/src/lib/libeti/panel/amd64/Makefile index 04160e850a..a2b9ee510c 100644 --- a/usr/src/lib/libeti/panel/amd64/Makefile +++ b/usr/src/lib/libeti/panel/amd64/Makefile @@ -22,7 +22,7 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # include ../Makefile.com @@ -32,4 +32,4 @@ DYNFLAGS += $(DYNFLAGS64) .KEEP_STATE: -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libeti/panel/i386/Makefile b/usr/src/lib/libeti/panel/i386/Makefile index 7db1ae8c3d..fa3f9786e2 100644 --- a/usr/src/lib/libeti/panel/i386/Makefile +++ b/usr/src/lib/libeti/panel/i386/Makefile @@ -27,4 +27,5 @@ include ../Makefile.com .KEEP_STATE: -install: all $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB) +install: all $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB) \ + $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libeti/panel/sparc/Makefile b/usr/src/lib/libeti/panel/sparc/Makefile index 7db1ae8c3d..fa3f9786e2 100644 --- a/usr/src/lib/libeti/panel/sparc/Makefile +++ b/usr/src/lib/libeti/panel/sparc/Makefile @@ -27,4 +27,5 @@ include ../Makefile.com .KEEP_STATE: -install: all $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB) +install: all $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB) \ + $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libeti/panel/sparcv9/Makefile b/usr/src/lib/libeti/panel/sparcv9/Makefile index 04160e850a..a2b9ee510c 100644 --- a/usr/src/lib/libeti/panel/sparcv9/Makefile +++ b/usr/src/lib/libeti/panel/sparcv9/Makefile @@ -22,7 +22,7 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # include ../Makefile.com @@ -32,4 +32,4 @@ DYNFLAGS += $(DYNFLAGS64) .KEEP_STATE: -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libfakekernel/amd64/Makefile b/usr/src/lib/libfakekernel/amd64/Makefile index 6792bbc3bb..5039a0aea7 100644 --- a/usr/src/lib/libfakekernel/amd64/Makefile +++ b/usr/src/lib/libfakekernel/amd64/Makefile @@ -29,4 +29,4 @@ include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libfakekernel/i386/Makefile b/usr/src/lib/libfakekernel/i386/Makefile index d32f3f3fc2..6c3e24318c 100644 --- a/usr/src/lib/libfakekernel/i386/Makefile +++ b/usr/src/lib/libfakekernel/i386/Makefile @@ -28,4 +28,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libfakekernel/sparc/Makefile b/usr/src/lib/libfakekernel/sparc/Makefile index d32f3f3fc2..6c3e24318c 100644 --- a/usr/src/lib/libfakekernel/sparc/Makefile +++ b/usr/src/lib/libfakekernel/sparc/Makefile @@ -28,4 +28,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libfakekernel/sparcv9/Makefile b/usr/src/lib/libfakekernel/sparcv9/Makefile index e4445a2843..cbe3c9c9fb 100644 --- a/usr/src/lib/libfakekernel/sparcv9/Makefile +++ b/usr/src/lib/libfakekernel/sparcv9/Makefile @@ -29,4 +29,4 @@ include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libfdisk/amd64/Makefile b/usr/src/lib/libfdisk/amd64/Makefile index 8680082937..9704a84b6d 100644 --- a/usr/src/lib/libfdisk/amd64/Makefile +++ b/usr/src/lib/libfdisk/amd64/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libfdisk/i386/Makefile b/usr/src/lib/libfdisk/i386/Makefile index 47878e05bc..7857fc5e13 100644 --- a/usr/src/lib/libfdisk/i386/Makefile +++ b/usr/src/lib/libfdisk/i386/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libfdisk/sparcv9/Makefile b/usr/src/lib/libfdisk/sparcv9/Makefile index 3df0cea286..c41dc63348 100644 --- a/usr/src/lib/libfdisk/sparcv9/Makefile +++ b/usr/src/lib/libfdisk/sparcv9/Makefile @@ -25,4 +25,4 @@ include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libgen/Makefile.com b/usr/src/lib/libgen/Makefile.com index 0a46c39508..79e6526fc3 100644 --- a/usr/src/lib/libgen/Makefile.com +++ b/usr/src/lib/libgen/Makefile.com @@ -49,6 +49,13 @@ CERRWARN += $(CNOWARN_UNINIT) # not linted SMATCH=off +COMPATLINKS += usr/ccs/lib/libgen.so +COMPATLINKS64 += usr/ccs/lib/$(MACH64)/libgen.so + +$(ROOT)/usr/ccs/lib/libgen.so := COMPATLINKTARGET=../../../lib/libgen.so.1 +$(ROOT)/usr/ccs/lib/$(MACH64)/libgen.so:= \ + COMPATLINKTARGET=../../../../lib/$(MACH64)/libgen.so.1 + .KEEP_STATE: all: $(LIBS) diff --git a/usr/src/lib/libgen/amd64/Makefile b/usr/src/lib/libgen/amd64/Makefile index aeb9193cee..a21175e8a6 100644 --- a/usr/src/lib/libgen/amd64/Makefile +++ b/usr/src/lib/libgen/amd64/Makefile @@ -29,4 +29,4 @@ LIBS = $(DYNLIB) all: $(LIBS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libgen/i386/Makefile b/usr/src/lib/libgen/i386/Makefile index 9223b1b398..4294af4b98 100644 --- a/usr/src/lib/libgen/i386/Makefile +++ b/usr/src/lib/libgen/i386/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com all: $(LIBS) -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libgen/sparc/Makefile b/usr/src/lib/libgen/sparc/Makefile index 9223b1b398..4294af4b98 100644 --- a/usr/src/lib/libgen/sparc/Makefile +++ b/usr/src/lib/libgen/sparc/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com all: $(LIBS) -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libgen/sparcv9/Makefile b/usr/src/lib/libgen/sparcv9/Makefile index a7f87e8a24..e09b255dd9 100644 --- a/usr/src/lib/libgen/sparcv9/Makefile +++ b/usr/src/lib/libgen/sparcv9/Makefile @@ -29,4 +29,4 @@ LIBS = $(DYNLIB) all: $(LIBS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libinetutil/amd64/Makefile b/usr/src/lib/libinetutil/amd64/Makefile index cb39a2beff..ab72b4df45 100644 --- a/usr/src/lib/libinetutil/amd64/Makefile +++ b/usr/src/lib/libinetutil/amd64/Makefile @@ -23,10 +23,10 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libinetutil/i386/Makefile b/usr/src/lib/libinetutil/i386/Makefile index 1c3d6f6f01..748553c12b 100644 --- a/usr/src/lib/libinetutil/i386/Makefile +++ b/usr/src/lib/libinetutil/i386/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libinetutil/sparc/Makefile b/usr/src/lib/libinetutil/sparc/Makefile index 1c3d6f6f01..748553c12b 100644 --- a/usr/src/lib/libinetutil/sparc/Makefile +++ b/usr/src/lib/libinetutil/sparc/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libinetutil/sparcv9/Makefile b/usr/src/lib/libinetutil/sparcv9/Makefile index 87e9702141..b9a9d5ad47 100644 --- a/usr/src/lib/libinetutil/sparcv9/Makefile +++ b/usr/src/lib/libinetutil/sparcv9/Makefile @@ -23,10 +23,10 @@ # Copyright (c) 2001 by Sun Microsystems, Inc. # All rights reserved. # -# ident "%Z%%M% %I% %E% SMI" + # include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libintl/amd64/Makefile b/usr/src/lib/libintl/amd64/Makefile index 70f0fc2457..7769ebb6b9 100644 --- a/usr/src/lib/libintl/amd64/Makefile +++ b/usr/src/lib/libintl/amd64/Makefile @@ -27,6 +27,7 @@ include $(SRC)/lib/Makefile.filter.com include ../Makefile.com include $(SRC)/lib/Makefile.lib.64 -install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) \ + $(ROOTCOMPATLINKS64) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/libintl/i386/Makefile b/usr/src/lib/libintl/i386/Makefile index c318e6089b..682e5560ca 100644 --- a/usr/src/lib/libintl/i386/Makefile +++ b/usr/src/lib/libintl/i386/Makefile @@ -26,6 +26,7 @@ include $(SRC)/lib/Makefile.filter.com include ../Makefile.com -install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) \ + $(ROOTCOMPATLINKS) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/libintl/sparc/Makefile b/usr/src/lib/libintl/sparc/Makefile index c318e6089b..682e5560ca 100644 --- a/usr/src/lib/libintl/sparc/Makefile +++ b/usr/src/lib/libintl/sparc/Makefile @@ -26,6 +26,7 @@ include $(SRC)/lib/Makefile.filter.com include ../Makefile.com -install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) \ + $(ROOTCOMPATLINKS) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/libintl/sparcv9/Makefile b/usr/src/lib/libintl/sparcv9/Makefile index 70f0fc2457..7769ebb6b9 100644 --- a/usr/src/lib/libintl/sparcv9/Makefile +++ b/usr/src/lib/libintl/sparcv9/Makefile @@ -27,6 +27,7 @@ include $(SRC)/lib/Makefile.filter.com include ../Makefile.com include $(SRC)/lib/Makefile.lib.64 -install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) \ + $(ROOTCOMPATLINKS64) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/libkstat/amd64/Makefile b/usr/src/lib/libkstat/amd64/Makefile index d50a21bdb0..01c18f35a7 100644 --- a/usr/src/lib/libkstat/amd64/Makefile +++ b/usr/src/lib/libkstat/amd64/Makefile @@ -22,7 +22,7 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # include ../Makefile.com @@ -32,4 +32,4 @@ include ../../Makefile.lib.64 all: $(LIBS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libkstat/i386/Makefile b/usr/src/lib/libkstat/i386/Makefile index d6eed917a9..8537c30eda 100644 --- a/usr/src/lib/libkstat/i386/Makefile +++ b/usr/src/lib/libkstat/i386/Makefile @@ -29,4 +29,4 @@ include ../Makefile.com all: $(LIBS) -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libkstat/sparc/Makefile b/usr/src/lib/libkstat/sparc/Makefile index d6eed917a9..8537c30eda 100644 --- a/usr/src/lib/libkstat/sparc/Makefile +++ b/usr/src/lib/libkstat/sparc/Makefile @@ -29,4 +29,4 @@ include ../Makefile.com all: $(LIBS) -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libkstat/sparcv9/Makefile b/usr/src/lib/libkstat/sparcv9/Makefile index d50a21bdb0..01c18f35a7 100644 --- a/usr/src/lib/libkstat/sparcv9/Makefile +++ b/usr/src/lib/libkstat/sparcv9/Makefile @@ -22,7 +22,7 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # include ../Makefile.com @@ -32,4 +32,4 @@ include ../../Makefile.lib.64 all: $(LIBS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libm/amd64/Makefile b/usr/src/lib/libm/amd64/Makefile index c67cf5c91d..2e245b6732 100644 --- a/usr/src/lib/libm/amd64/Makefile +++ b/usr/src/lib/libm/amd64/Makefile @@ -17,6 +17,6 @@ TARGET_ARCH= amd64 include ../Makefile.com include $(SRC)/lib/Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) include ../Makefile.targ diff --git a/usr/src/lib/libm/i386/Makefile b/usr/src/lib/libm/i386/Makefile index cad07fb1c6..89754fc049 100644 --- a/usr/src/lib/libm/i386/Makefile +++ b/usr/src/lib/libm/i386/Makefile @@ -23,6 +23,6 @@ include ../Makefile.com CFLAGS += -_gcc=-ffloat-store $(OBJS_M9XSSE) := CFLAGS += -xarch=sse2 -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) include ../Makefile.targ diff --git a/usr/src/lib/libm/sparc/Makefile b/usr/src/lib/libm/sparc/Makefile index 5a51957971..5c5fc318b8 100644 --- a/usr/src/lib/libm/sparc/Makefile +++ b/usr/src/lib/libm/sparc/Makefile @@ -18,6 +18,6 @@ include ../Makefile.com CHIP = ultra -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) include ../Makefile.targ diff --git a/usr/src/lib/libm/sparcv9/Makefile b/usr/src/lib/libm/sparcv9/Makefile index 91181acd63..ec82c4d735 100644 --- a/usr/src/lib/libm/sparcv9/Makefile +++ b/usr/src/lib/libm/sparcv9/Makefile @@ -20,6 +20,6 @@ include $(SRC)/lib/Makefile.lib.64 CHIP = ultra -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) include ../Makefile.targ diff --git a/usr/src/lib/libm1/Makefile.com b/usr/src/lib/libm1/Makefile.com index b87f60bf9d..5672bea95b 100644 --- a/usr/src/lib/libm1/Makefile.com +++ b/usr/src/lib/libm1/Makefile.com @@ -33,6 +33,9 @@ CPPFLAGS += -DLIBM_BUILD MAPFILEDIR = ../common/ DYNFLAGS += -zignore -Wl,-F'libm.so.2' +COMPATLINKS = usr/lib/$(DYNLIB) +COMPATLINKS64 = usr/lib/$(MACH64)/$(DYNLIB) + .KEEP_STATE: all: $(LIBS) diff --git a/usr/src/lib/libm1/amd64/Makefile b/usr/src/lib/libm1/amd64/Makefile index 21fab0dd1c..00367a883c 100644 --- a/usr/src/lib/libm1/amd64/Makefile +++ b/usr/src/lib/libm1/amd64/Makefile @@ -18,6 +18,6 @@ TARGET_ARCH= amd64 include ../Makefile.com include $(SRC)/lib/Makefile.lib.64 -install: all $(ROOTLIBS64) +install: all $(ROOTLIBS64) $(ROOTCOMPATLINKS64) include $(SRC)/lib/Makefile.targ diff --git a/usr/src/lib/libm1/i386/Makefile b/usr/src/lib/libm1/i386/Makefile index 3d2c71860a..3b1f60dcde 100644 --- a/usr/src/lib/libm1/i386/Makefile +++ b/usr/src/lib/libm1/i386/Makefile @@ -16,6 +16,6 @@ TARGET_ARCH= i386 include ../Makefile.com -install: all $(ROOTLIBS) +install: all $(ROOTLIBS) $(ROOTCOMPATLINKS) include $(SRC)/lib/Makefile.targ diff --git a/usr/src/lib/libm1/sparc/Makefile b/usr/src/lib/libm1/sparc/Makefile index 686bb12ef2..867aeaa331 100644 --- a/usr/src/lib/libm1/sparc/Makefile +++ b/usr/src/lib/libm1/sparc/Makefile @@ -17,6 +17,6 @@ TARGET_ARCH= sparc include ../Makefile.com -install: all $(ROOTLIBS) +install: all $(ROOTLIBS) $(ROOTCOMPATLINKS) include $(SRC)/lib/Makefile.targ diff --git a/usr/src/lib/libm1/sparcv9/Makefile b/usr/src/lib/libm1/sparcv9/Makefile index 4899efe7b7..cf688d8ba6 100644 --- a/usr/src/lib/libm1/sparcv9/Makefile +++ b/usr/src/lib/libm1/sparcv9/Makefile @@ -18,6 +18,6 @@ TARGET_ARCH= sparcv9 include ../Makefile.com include $(SRC)/lib/Makefile.lib.64 -install: all $(ROOTLIBS64) +install: all $(ROOTLIBS64) $(ROOTCOMPATLINKS64) include $(SRC)/lib/Makefile.targ diff --git a/usr/src/lib/libmalloc/Makefile.com b/usr/src/lib/libmalloc/Makefile.com index 6faf62851f..f7f9942f8d 100644 --- a/usr/src/lib/libmalloc/Makefile.com +++ b/usr/src/lib/libmalloc/Makefile.com @@ -41,6 +41,13 @@ CPPFLAGS += -I../../common/inc -D_REENTRANT DYNFLAGS += $(ZINTERPOSE) LDLIBS += -lc +COMPATLINKS= usr/ccs/lib/libmalloc.so +COMPATLINKS64= usr/ccs/lib/$(MACH64)/libmalloc.so + +$(ROOT)/usr/ccs/lib/libmalloc.so := COMPATLINKTARGET=../../lib/libmalloc.so.1 +$(ROOT)/usr/ccs/lib/$(MACH64)/libmalloc.so:= \ + COMPATLINKTARGET=../../../lib/$(MACH64)/libmalloc.so.1 + .KEEP_STATE: diff --git a/usr/src/lib/libmalloc/amd64/Makefile b/usr/src/lib/libmalloc/amd64/Makefile index d50a21bdb0..01c18f35a7 100644 --- a/usr/src/lib/libmalloc/amd64/Makefile +++ b/usr/src/lib/libmalloc/amd64/Makefile @@ -22,7 +22,7 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # include ../Makefile.com @@ -32,4 +32,4 @@ include ../../Makefile.lib.64 all: $(LIBS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libmalloc/i386/Makefile b/usr/src/lib/libmalloc/i386/Makefile index 211da0bfff..3d6e266f97 100644 --- a/usr/src/lib/libmalloc/i386/Makefile +++ b/usr/src/lib/libmalloc/i386/Makefile @@ -29,4 +29,5 @@ include ../Makefile.com all: $(LIBS) -install: all $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB) +install: all $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB) \ + $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libmalloc/sparc/Makefile b/usr/src/lib/libmalloc/sparc/Makefile index 211da0bfff..3d6e266f97 100644 --- a/usr/src/lib/libmalloc/sparc/Makefile +++ b/usr/src/lib/libmalloc/sparc/Makefile @@ -29,4 +29,5 @@ include ../Makefile.com all: $(LIBS) -install: all $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB) +install: all $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB) \ + $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libmalloc/sparcv9/Makefile b/usr/src/lib/libmalloc/sparcv9/Makefile index d50a21bdb0..01c18f35a7 100644 --- a/usr/src/lib/libmalloc/sparcv9/Makefile +++ b/usr/src/lib/libmalloc/sparcv9/Makefile @@ -22,7 +22,7 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # include ../Makefile.com @@ -32,4 +32,4 @@ include ../../Makefile.lib.64 all: $(LIBS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libmd/amd64/Makefile b/usr/src/lib/libmd/amd64/Makefile index 8f311a064c..aab8d061a9 100644 --- a/usr/src/lib/libmd/amd64/Makefile +++ b/usr/src/lib/libmd/amd64/Makefile @@ -59,8 +59,7 @@ AS_CPPFLAGS += -D_ASM all: $(LIBS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) - +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) pics/%.o: %.s $(COMPILE.s) -o $@ ${@F:.o=.s} diff --git a/usr/src/lib/libmd/i386/Makefile b/usr/src/lib/libmd/i386/Makefile index 444ddc5911..c8e385093a 100644 --- a/usr/src/lib/libmd/i386/Makefile +++ b/usr/src/lib/libmd/i386/Makefile @@ -38,7 +38,7 @@ include ../Makefile.com all: $(LIBS) -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) include ../Makefile.targ diff --git a/usr/src/lib/libmd/sparc/Makefile b/usr/src/lib/libmd/sparc/Makefile index 9fcf449883..ee6bfb5ac5 100644 --- a/usr/src/lib/libmd/sparc/Makefile +++ b/usr/src/lib/libmd/sparc/Makefile @@ -45,7 +45,7 @@ pics/edonr.o := CERRWARN += $(CNOWARN_UNINIT) all: $(LIBS) -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) include ../Makefile.targ diff --git a/usr/src/lib/libmd/sparcv9/Makefile b/usr/src/lib/libmd/sparcv9/Makefile index 33ec27087f..828180e233 100644 --- a/usr/src/lib/libmd/sparcv9/Makefile +++ b/usr/src/lib/libmd/sparcv9/Makefile @@ -42,7 +42,7 @@ EXTPICS = ../capabilities/sun4u/sparcv9/pics/symcap.o \ all: $(LIBS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) include ../Makefile.targ diff --git a/usr/src/lib/libmd5/amd64/Makefile b/usr/src/lib/libmd5/amd64/Makefile index 70f0fc2457..7769ebb6b9 100644 --- a/usr/src/lib/libmd5/amd64/Makefile +++ b/usr/src/lib/libmd5/amd64/Makefile @@ -27,6 +27,7 @@ include $(SRC)/lib/Makefile.filter.com include ../Makefile.com include $(SRC)/lib/Makefile.lib.64 -install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) \ + $(ROOTCOMPATLINKS64) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/libmd5/i386/Makefile b/usr/src/lib/libmd5/i386/Makefile index c318e6089b..682e5560ca 100644 --- a/usr/src/lib/libmd5/i386/Makefile +++ b/usr/src/lib/libmd5/i386/Makefile @@ -26,6 +26,7 @@ include $(SRC)/lib/Makefile.filter.com include ../Makefile.com -install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) \ + $(ROOTCOMPATLINKS) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/libmd5/sparc/Makefile b/usr/src/lib/libmd5/sparc/Makefile index c318e6089b..682e5560ca 100644 --- a/usr/src/lib/libmd5/sparc/Makefile +++ b/usr/src/lib/libmd5/sparc/Makefile @@ -26,6 +26,7 @@ include $(SRC)/lib/Makefile.filter.com include ../Makefile.com -install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) \ + $(ROOTCOMPATLINKS) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/libmd5/sparcv9/Makefile b/usr/src/lib/libmd5/sparcv9/Makefile index 70f0fc2457..7769ebb6b9 100644 --- a/usr/src/lib/libmd5/sparcv9/Makefile +++ b/usr/src/lib/libmd5/sparcv9/Makefile @@ -27,6 +27,7 @@ include $(SRC)/lib/Makefile.filter.com include ../Makefile.com include $(SRC)/lib/Makefile.lib.64 -install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) \ + $(ROOTCOMPATLINKS64) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/libmp/Makefile.com b/usr/src/lib/libmp/Makefile.com index 2664c1fbdf..3c71277267 100644 --- a/usr/src/lib/libmp/Makefile.com +++ b/usr/src/lib/libmp/Makefile.com @@ -34,6 +34,9 @@ include ../../Makefile.lib # install this library in the root filesystem include ../../Makefile.rootfs +COMPATLINKS += usr/lib/libmp.so.1 +$(ROOT)/usr/lib/libmp.so.1 := COMPATLINKTARGET=../../lib/libmp.so.1 + SRCDIR = ../common OMAPFILE = ../common/mapfile_1-vers diff --git a/usr/src/lib/libmp/amd64/Makefile b/usr/src/lib/libmp/amd64/Makefile index fc9ec9e40a..40902c4fa9 100644 --- a/usr/src/lib/libmp/amd64/Makefile +++ b/usr/src/lib/libmp/amd64/Makefile @@ -22,7 +22,7 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # include ../Makefile.com @@ -34,4 +34,4 @@ LIBS = $(DYNLIB) all: $(LIBS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libmp/i386/Makefile b/usr/src/lib/libmp/i386/Makefile index ee90826c9b..c51c018c88 100644 --- a/usr/src/lib/libmp/i386/Makefile +++ b/usr/src/lib/libmp/i386/Makefile @@ -22,7 +22,7 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # OLIBRARY = libmp.so.1 @@ -51,4 +51,5 @@ pics/pics_mp.o: all: $(LIBS) $(OLIBRARY) -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLIBDIR)/$(OLIBRARY) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLIBDIR)/$(OLIBRARY) \ + $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libmp/sparc/Makefile b/usr/src/lib/libmp/sparc/Makefile index 9c62a2b7ac..8bb9a77528 100644 --- a/usr/src/lib/libmp/sparc/Makefile +++ b/usr/src/lib/libmp/sparc/Makefile @@ -22,7 +22,7 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # OLIBRARY = libmp.so.1 @@ -51,4 +51,5 @@ pics/pics_mp.o: all: $(LIBS) $(OLIBRARY) -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLIBDIR)/$(OLIBRARY) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLIBDIR)/$(OLIBRARY) \ + $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libmp/sparcv9/Makefile b/usr/src/lib/libmp/sparcv9/Makefile index fc9ec9e40a..40902c4fa9 100644 --- a/usr/src/lib/libmp/sparcv9/Makefile +++ b/usr/src/lib/libmp/sparcv9/Makefile @@ -22,7 +22,7 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # include ../Makefile.com @@ -34,4 +34,4 @@ LIBS = $(DYNLIB) all: $(LIBS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libmvec/amd64/Makefile b/usr/src/lib/libmvec/amd64/Makefile index c7f904a08c..3629bc7829 100644 --- a/usr/src/lib/libmvec/amd64/Makefile +++ b/usr/src/lib/libmvec/amd64/Makefile @@ -15,8 +15,8 @@ TARGET_ARCH = amd64 -LIBRARY = libmvec.a -VERS = .1 +LIBRARY = libmvec.a +VERS = .1 OBJECTS = $(mvecOBJS) @@ -25,6 +25,6 @@ include $(SRC)/lib/Makefile.lib.64 SRCS = $(SRCS_mvec) -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) include $(SRC)/lib/libm/Makefile.targ diff --git a/usr/src/lib/libmvec/i386/Makefile b/usr/src/lib/libmvec/i386/Makefile index f99f809c60..0fa671af18 100644 --- a/usr/src/lib/libmvec/i386/Makefile +++ b/usr/src/lib/libmvec/i386/Makefile @@ -15,8 +15,8 @@ TARGET_ARCH= i386 -LIBRARY = libmvec.a -VERS = .1 +LIBRARY = libmvec.a +VERS = .1 OBJECTS = $(mvecOBJS) @@ -24,6 +24,6 @@ include ../Makefile.com SRCS = $(SRCS_mvec) -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) include $(SRC)/lib/libm/Makefile.targ diff --git a/usr/src/lib/libmvec/sparc/Makefile b/usr/src/lib/libmvec/sparc/Makefile index 39df5d8353..d0f5a55218 100644 --- a/usr/src/lib/libmvec/sparc/Makefile +++ b/usr/src/lib/libmvec/sparc/Makefile @@ -15,8 +15,8 @@ TARGET_ARCH= sparc -LIBRARY = libmvec.a -VERS = .1 +LIBRARY = libmvec.a +VERS = .1 OBJECTS = $(mvecOBJS) @@ -25,6 +25,6 @@ include ../Makefile.com CHIP = ultra SRCS = $(SRCS_mvec) -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) include $(SRC)/lib/Makefile.targ diff --git a/usr/src/lib/libmvec/sparcv9/Makefile b/usr/src/lib/libmvec/sparcv9/Makefile index e649b04b32..06f87dc853 100644 --- a/usr/src/lib/libmvec/sparcv9/Makefile +++ b/usr/src/lib/libmvec/sparcv9/Makefile @@ -15,8 +15,8 @@ TARGET_ARCH = sparcv9 -LIBRARY = libmvec.a -VERS = .1 +LIBRARY = libmvec.a +VERS = .1 OBJECTS = $(mvecOBJS) @@ -27,6 +27,6 @@ CHIP = ultra SRCS = $(SRCS_mvec) -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) include $(SRC)/lib/libm/Makefile.targ diff --git a/usr/src/lib/libnsl/amd64/Makefile b/usr/src/lib/libnsl/amd64/Makefile index ed0a7167be..88032f0441 100644 --- a/usr/src/lib/libnsl/amd64/Makefile +++ b/usr/src/lib/libnsl/amd64/Makefile @@ -23,7 +23,7 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # include ../Makefile.com @@ -35,4 +35,4 @@ include ../../Makefile.lib.64 amd64_C_PICFLAGS = $(amd64_C_BIGPICFLAGS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libnsl/i386/Makefile b/usr/src/lib/libnsl/i386/Makefile index 8a08a082d5..655acde2a7 100644 --- a/usr/src/lib/libnsl/i386/Makefile +++ b/usr/src/lib/libnsl/i386/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libnsl/sparc/Makefile b/usr/src/lib/libnsl/sparc/Makefile index 8a08a082d5..655acde2a7 100644 --- a/usr/src/lib/libnsl/sparc/Makefile +++ b/usr/src/lib/libnsl/sparc/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libnsl/sparcv9/Makefile b/usr/src/lib/libnsl/sparcv9/Makefile index 249857bc50..d26d0a9514 100644 --- a/usr/src/lib/libnsl/sparcv9/Makefile +++ b/usr/src/lib/libnsl/sparcv9/Makefile @@ -33,4 +33,4 @@ include ../../Makefile.lib.64 sparcv9_C_PICFLAGS = $(sparcv9_C_BIGPICFLAGS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libnvpair/amd64/Makefile b/usr/src/lib/libnvpair/amd64/Makefile index cb39a2beff..ab72b4df45 100644 --- a/usr/src/lib/libnvpair/amd64/Makefile +++ b/usr/src/lib/libnvpair/amd64/Makefile @@ -23,10 +23,10 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libnvpair/i386/Makefile b/usr/src/lib/libnvpair/i386/Makefile index 18584b4da1..59045395eb 100644 --- a/usr/src/lib/libnvpair/i386/Makefile +++ b/usr/src/lib/libnvpair/i386/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libnvpair/sparc/Makefile b/usr/src/lib/libnvpair/sparc/Makefile index 18584b4da1..59045395eb 100644 --- a/usr/src/lib/libnvpair/sparc/Makefile +++ b/usr/src/lib/libnvpair/sparc/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libnvpair/sparcv9/Makefile b/usr/src/lib/libnvpair/sparcv9/Makefile index cb39a2beff..ab72b4df45 100644 --- a/usr/src/lib/libnvpair/sparcv9/Makefile +++ b/usr/src/lib/libnvpair/sparcv9/Makefile @@ -23,10 +23,10 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libpam/amd64/Makefile b/usr/src/lib/libpam/amd64/Makefile index 8f7590c2ef..8f9bf5b7c3 100644 --- a/usr/src/lib/libpam/amd64/Makefile +++ b/usr/src/lib/libpam/amd64/Makefile @@ -23,10 +23,10 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libpam/i386/Makefile b/usr/src/lib/libpam/i386/Makefile index e129d9ceb8..16c9d09c13 100644 --- a/usr/src/lib/libpam/i386/Makefile +++ b/usr/src/lib/libpam/i386/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libpam/sparc/Makefile b/usr/src/lib/libpam/sparc/Makefile index bf37e5e370..00586b6ffb 100644 --- a/usr/src/lib/libpam/sparc/Makefile +++ b/usr/src/lib/libpam/sparc/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libpam/sparcv9/Makefile b/usr/src/lib/libpam/sparcv9/Makefile index 401952a7f8..8e700da449 100644 --- a/usr/src/lib/libpam/sparcv9/Makefile +++ b/usr/src/lib/libpam/sparcv9/Makefile @@ -25,9 +25,9 @@ # # lib/libpam/sparcv9/Makefile # -# ident "%Z%%M% %I% %E% SMI" + include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libproc/amd64/Makefile b/usr/src/lib/libproc/amd64/Makefile index 01b08012b0..2d6bf59aa3 100644 --- a/usr/src/lib/libproc/amd64/Makefile +++ b/usr/src/lib/libproc/amd64/Makefile @@ -32,4 +32,4 @@ include ../../Makefile.lib.64 CPPFLAGS += -D_SYSCALL32 LDLIBS += -lsaveargs -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libproc/i386/Makefile b/usr/src/lib/libproc/i386/Makefile index 18584b4da1..59045395eb 100644 --- a/usr/src/lib/libproc/i386/Makefile +++ b/usr/src/lib/libproc/i386/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libproc/sparc/Makefile b/usr/src/lib/libproc/sparc/Makefile index 18584b4da1..59045395eb 100644 --- a/usr/src/lib/libproc/sparc/Makefile +++ b/usr/src/lib/libproc/sparc/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libproc/sparcv9/Makefile b/usr/src/lib/libproc/sparcv9/Makefile index d80185b758..4e969f17a0 100644 --- a/usr/src/lib/libproc/sparcv9/Makefile +++ b/usr/src/lib/libproc/sparcv9/Makefile @@ -31,4 +31,4 @@ include ../../Makefile.lib.64 CPPFLAGS += -D_SYSCALL32 -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libpthread/amd64/Makefile b/usr/src/lib/libpthread/amd64/Makefile index 70f0fc2457..7769ebb6b9 100644 --- a/usr/src/lib/libpthread/amd64/Makefile +++ b/usr/src/lib/libpthread/amd64/Makefile @@ -27,6 +27,7 @@ include $(SRC)/lib/Makefile.filter.com include ../Makefile.com include $(SRC)/lib/Makefile.lib.64 -install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) \ + $(ROOTCOMPATLINKS64) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/libpthread/i386/Makefile b/usr/src/lib/libpthread/i386/Makefile index c318e6089b..682e5560ca 100644 --- a/usr/src/lib/libpthread/i386/Makefile +++ b/usr/src/lib/libpthread/i386/Makefile @@ -26,6 +26,7 @@ include $(SRC)/lib/Makefile.filter.com include ../Makefile.com -install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) \ + $(ROOTCOMPATLINKS) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/libpthread/sparc/Makefile b/usr/src/lib/libpthread/sparc/Makefile index c318e6089b..682e5560ca 100644 --- a/usr/src/lib/libpthread/sparc/Makefile +++ b/usr/src/lib/libpthread/sparc/Makefile @@ -26,6 +26,7 @@ include $(SRC)/lib/Makefile.filter.com include ../Makefile.com -install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) \ + $(ROOTCOMPATLINKS) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/libpthread/sparcv9/Makefile b/usr/src/lib/libpthread/sparcv9/Makefile index 70f0fc2457..7769ebb6b9 100644 --- a/usr/src/lib/libpthread/sparcv9/Makefile +++ b/usr/src/lib/libpthread/sparcv9/Makefile @@ -27,6 +27,7 @@ include $(SRC)/lib/Makefile.filter.com include ../Makefile.com include $(SRC)/lib/Makefile.lib.64 -install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) \ + $(ROOTCOMPATLINKS64) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/librcm/amd64/Makefile b/usr/src/lib/librcm/amd64/Makefile index cb39a2beff..ab72b4df45 100644 --- a/usr/src/lib/librcm/amd64/Makefile +++ b/usr/src/lib/librcm/amd64/Makefile @@ -23,10 +23,10 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/librcm/i386/Makefile b/usr/src/lib/librcm/i386/Makefile index 18584b4da1..59045395eb 100644 --- a/usr/src/lib/librcm/i386/Makefile +++ b/usr/src/lib/librcm/i386/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/librcm/sparc/Makefile b/usr/src/lib/librcm/sparc/Makefile index 18584b4da1..59045395eb 100644 --- a/usr/src/lib/librcm/sparc/Makefile +++ b/usr/src/lib/librcm/sparc/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/librcm/sparcv9/Makefile b/usr/src/lib/librcm/sparcv9/Makefile index cb39a2beff..ab72b4df45 100644 --- a/usr/src/lib/librcm/sparcv9/Makefile +++ b/usr/src/lib/librcm/sparcv9/Makefile @@ -23,10 +23,10 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libresolv/Makefile b/usr/src/lib/libresolv/Makefile index 7f843a187d..d74c41ecfb 100644 --- a/usr/src/lib/libresolv/Makefile +++ b/usr/src/lib/libresolv/Makefile @@ -66,13 +66,15 @@ SMATCH=off ROOTDYNLIBS= $(DYNLIB:%=$(ROOTLIBDIR)/%) +COMPATLINKS= usr/lib/$(DYNLIB) + .KEEP_STATE: LIBS = $(DYNLIB) all: $(LIBS) -install: all $(ROOTDYNLIBS) +install: all $(ROOTDYNLIBS) $(ROOTCOMPATLINKS) # include library targets diff --git a/usr/src/lib/libresolv2/amd64/Makefile b/usr/src/lib/libresolv2/amd64/Makefile index 2e8cdecf75..6782495649 100644 --- a/usr/src/lib/libresolv2/amd64/Makefile +++ b/usr/src/lib/libresolv2/amd64/Makefile @@ -22,10 +22,10 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libresolv2/i386/Makefile b/usr/src/lib/libresolv2/i386/Makefile index 282da97a76..cf2087e71e 100644 --- a/usr/src/lib/libresolv2/i386/Makefile +++ b/usr/src/lib/libresolv2/i386/Makefile @@ -25,4 +25,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libresolv2/sparc/Makefile b/usr/src/lib/libresolv2/sparc/Makefile index 282da97a76..cf2087e71e 100644 --- a/usr/src/lib/libresolv2/sparc/Makefile +++ b/usr/src/lib/libresolv2/sparc/Makefile @@ -25,4 +25,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libresolv2/sparcv9/Makefile b/usr/src/lib/libresolv2/sparcv9/Makefile index 2095629575..c88ec03a10 100644 --- a/usr/src/lib/libresolv2/sparcv9/Makefile +++ b/usr/src/lib/libresolv2/sparcv9/Makefile @@ -33,4 +33,4 @@ include ../../Makefile.lib.64 sparcv9_C_PICFLAGS = $(sparcv9_C_BIGPICFLAGS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/librestart/amd64/Makefile b/usr/src/lib/librestart/amd64/Makefile index 72f3f2c326..bc2bb82a5e 100644 --- a/usr/src/lib/librestart/amd64/Makefile +++ b/usr/src/lib/librestart/amd64/Makefile @@ -29,4 +29,4 @@ include ../../Makefile.lib.64 all: $(LIBS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/librestart/i386/Makefile b/usr/src/lib/librestart/i386/Makefile index 5da8e64ac5..90bed38cc2 100644 --- a/usr/src/lib/librestart/i386/Makefile +++ b/usr/src/lib/librestart/i386/Makefile @@ -28,4 +28,4 @@ include ../Makefile.com all: $(LIBS) -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/librestart/sparc/Makefile b/usr/src/lib/librestart/sparc/Makefile index 5da8e64ac5..90bed38cc2 100644 --- a/usr/src/lib/librestart/sparc/Makefile +++ b/usr/src/lib/librestart/sparc/Makefile @@ -28,4 +28,4 @@ include ../Makefile.com all: $(LIBS) -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/librestart/sparcv9/Makefile b/usr/src/lib/librestart/sparcv9/Makefile index 30d4207380..f820b35e24 100644 --- a/usr/src/lib/librestart/sparcv9/Makefile +++ b/usr/src/lib/librestart/sparcv9/Makefile @@ -31,4 +31,4 @@ LIBS = $(DYNLIB) all: $(LIBS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/librpcsvc/amd64/Makefile b/usr/src/lib/librpcsvc/amd64/Makefile index 9ab764a959..a41aeec527 100644 --- a/usr/src/lib/librpcsvc/amd64/Makefile +++ b/usr/src/lib/librpcsvc/amd64/Makefile @@ -22,7 +22,7 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # include ../Makefile.com @@ -30,4 +30,4 @@ include ../../Makefile.lib.64 all: $(LIBS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/librpcsvc/i386/Makefile b/usr/src/lib/librpcsvc/i386/Makefile index 2fbc3ea93d..00998e3cfe 100644 --- a/usr/src/lib/librpcsvc/i386/Makefile +++ b/usr/src/lib/librpcsvc/i386/Makefile @@ -28,4 +28,4 @@ include ../Makefile.com all: $(LIBS) -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/librpcsvc/sparc/Makefile b/usr/src/lib/librpcsvc/sparc/Makefile index 2fbc3ea93d..00998e3cfe 100644 --- a/usr/src/lib/librpcsvc/sparc/Makefile +++ b/usr/src/lib/librpcsvc/sparc/Makefile @@ -28,4 +28,4 @@ include ../Makefile.com all: $(LIBS) -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/librpcsvc/sparcv9/Makefile b/usr/src/lib/librpcsvc/sparcv9/Makefile index 9ab764a959..a41aeec527 100644 --- a/usr/src/lib/librpcsvc/sparcv9/Makefile +++ b/usr/src/lib/librpcsvc/sparcv9/Makefile @@ -22,7 +22,7 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # include ../Makefile.com @@ -30,4 +30,4 @@ include ../../Makefile.lib.64 all: $(LIBS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/librt/Makefile.com b/usr/src/lib/librt/Makefile.com index 9585165ab4..2472527a6e 100644 --- a/usr/src/lib/librt/Makefile.com +++ b/usr/src/lib/librt/Makefile.com @@ -28,3 +28,28 @@ VERS = .1 include $(SRC)/lib/Makefile.rootfs DYNFLAGS += -F libc.so.1 + +COMPATLINKS += lib/libposix4.so.1 \ + lib/libposix4.so \ + usr/lib/libposix4.so.1 \ + usr/lib/libposix4.so + +COMPATLINKS64 += lib/$(MACH64)/libposix4.so.1 \ + lib/$(MACH64)/libposix4.so \ + usr/lib/$(MACH64)/libposix4.so.1 \ + usr/lib/$(MACH64)/libposix4.so + +$(ROOT)/lib/libposix4.so.1 := COMPATLINKTARGET=librt.so.1 +$(ROOT)/lib/libposix4.so := COMPATLINKTARGET=libposix4.so.1 +$(ROOT)/usr/lib/libposix4.so.1 := COMPATLINKTARGET=../../lib/librt.so.1 +$(ROOT)/usr/lib/libposix4.so := COMPATLINKTARGET=../../lib/librt.so.1 +$(ROOT)/lib/$(MACH64)/libposix4.so.1 := COMPATLINKTARGET=librt.so.1 +$(ROOT)/lib/$(MACH64)/libposix4.so := COMPATLINKTARGET=libposix4.so.1 +$(ROOT)/usr/lib/$(MACH64)/libposix4.so.1:= \ + COMPATLINKTARGET=../../../lib/$(MACH64)/librt.so.1 +$(ROOT)/usr/lib/$(MACH64)/libposix4.so:= \ + COMPATLINKTARGET=../../../lib/$(MACH64)/librt.so.1 +$(ROOT)/usr/lib/$(MACH64)/librt.so.1:= \ + COMPATLINKTARGET=../../../lib/$(MACH64)/librt.so.1 +$(ROOT)/usr/lib/$(MACH64)/librt.so:= \ + COMPATLINKTARGET=../../../lib/$(MACH64)/librt.so.1 diff --git a/usr/src/lib/librt/amd64/Makefile b/usr/src/lib/librt/amd64/Makefile index 70f0fc2457..7769ebb6b9 100644 --- a/usr/src/lib/librt/amd64/Makefile +++ b/usr/src/lib/librt/amd64/Makefile @@ -27,6 +27,7 @@ include $(SRC)/lib/Makefile.filter.com include ../Makefile.com include $(SRC)/lib/Makefile.lib.64 -install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) \ + $(ROOTCOMPATLINKS64) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/librt/i386/Makefile b/usr/src/lib/librt/i386/Makefile index c318e6089b..682e5560ca 100644 --- a/usr/src/lib/librt/i386/Makefile +++ b/usr/src/lib/librt/i386/Makefile @@ -26,6 +26,7 @@ include $(SRC)/lib/Makefile.filter.com include ../Makefile.com -install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) \ + $(ROOTCOMPATLINKS) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/librt/sparc/Makefile b/usr/src/lib/librt/sparc/Makefile index c318e6089b..682e5560ca 100644 --- a/usr/src/lib/librt/sparc/Makefile +++ b/usr/src/lib/librt/sparc/Makefile @@ -26,6 +26,7 @@ include $(SRC)/lib/Makefile.filter.com include ../Makefile.com -install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) \ + $(ROOTCOMPATLINKS) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/librt/sparcv9/Makefile b/usr/src/lib/librt/sparcv9/Makefile index 70f0fc2457..7769ebb6b9 100644 --- a/usr/src/lib/librt/sparcv9/Makefile +++ b/usr/src/lib/librt/sparcv9/Makefile @@ -27,6 +27,7 @@ include $(SRC)/lib/Makefile.filter.com include ../Makefile.com include $(SRC)/lib/Makefile.lib.64 -install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) \ + $(ROOTCOMPATLINKS64) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/libscf/amd64/Makefile b/usr/src/lib/libscf/amd64/Makefile index 72f3f2c326..bc2bb82a5e 100644 --- a/usr/src/lib/libscf/amd64/Makefile +++ b/usr/src/lib/libscf/amd64/Makefile @@ -29,4 +29,4 @@ include ../../Makefile.lib.64 all: $(LIBS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libscf/i386/Makefile b/usr/src/lib/libscf/i386/Makefile index 5da8e64ac5..90bed38cc2 100644 --- a/usr/src/lib/libscf/i386/Makefile +++ b/usr/src/lib/libscf/i386/Makefile @@ -28,4 +28,4 @@ include ../Makefile.com all: $(LIBS) -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libscf/sparc/Makefile b/usr/src/lib/libscf/sparc/Makefile index 5da8e64ac5..90bed38cc2 100644 --- a/usr/src/lib/libscf/sparc/Makefile +++ b/usr/src/lib/libscf/sparc/Makefile @@ -28,4 +28,4 @@ include ../Makefile.com all: $(LIBS) -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libscf/sparcv9/Makefile b/usr/src/lib/libscf/sparcv9/Makefile index 30d4207380..f820b35e24 100644 --- a/usr/src/lib/libscf/sparcv9/Makefile +++ b/usr/src/lib/libscf/sparcv9/Makefile @@ -31,4 +31,4 @@ LIBS = $(DYNLIB) all: $(LIBS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libsec/amd64/Makefile b/usr/src/lib/libsec/amd64/Makefile index 58854901e8..fd6f777e6e 100644 --- a/usr/src/lib/libsec/amd64/Makefile +++ b/usr/src/lib/libsec/amd64/Makefile @@ -32,4 +32,4 @@ LIBS= $(DYNLIB) all: $(LIBS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libsec/i386/Makefile b/usr/src/lib/libsec/i386/Makefile index d6eed917a9..8537c30eda 100644 --- a/usr/src/lib/libsec/i386/Makefile +++ b/usr/src/lib/libsec/i386/Makefile @@ -29,4 +29,4 @@ include ../Makefile.com all: $(LIBS) -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libsec/sparc/Makefile b/usr/src/lib/libsec/sparc/Makefile index d6eed917a9..8537c30eda 100644 --- a/usr/src/lib/libsec/sparc/Makefile +++ b/usr/src/lib/libsec/sparc/Makefile @@ -29,4 +29,4 @@ include ../Makefile.com all: $(LIBS) -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libsec/sparcv9/Makefile b/usr/src/lib/libsec/sparcv9/Makefile index 58854901e8..fd6f777e6e 100644 --- a/usr/src/lib/libsec/sparcv9/Makefile +++ b/usr/src/lib/libsec/sparcv9/Makefile @@ -32,4 +32,4 @@ LIBS= $(DYNLIB) all: $(LIBS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libsecdb/amd64/Makefile b/usr/src/lib/libsecdb/amd64/Makefile index 67538ac8f1..297028a599 100644 --- a/usr/src/lib/libsecdb/amd64/Makefile +++ b/usr/src/lib/libsecdb/amd64/Makefile @@ -23,7 +23,7 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # @@ -32,4 +32,4 @@ include ../../Makefile.lib.64 .KEEP_STATE: -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libsecdb/i386/Makefile b/usr/src/lib/libsecdb/i386/Makefile index 46b260b17a..c8c3c5083d 100644 --- a/usr/src/lib/libsecdb/i386/Makefile +++ b/usr/src/lib/libsecdb/i386/Makefile @@ -29,4 +29,4 @@ include ../Makefile.com .KEEP_STATE: -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libsecdb/sparc/Makefile b/usr/src/lib/libsecdb/sparc/Makefile index 461a62cb22..5ab240f17d 100644 --- a/usr/src/lib/libsecdb/sparc/Makefile +++ b/usr/src/lib/libsecdb/sparc/Makefile @@ -28,4 +28,4 @@ include ../Makefile.com .KEEP_STATE: -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libsecdb/sparcv9/Makefile b/usr/src/lib/libsecdb/sparcv9/Makefile index 7821a207c0..b8482c4e10 100644 --- a/usr/src/lib/libsecdb/sparcv9/Makefile +++ b/usr/src/lib/libsecdb/sparcv9/Makefile @@ -25,7 +25,7 @@ # # lib/libsecdb/sparcv9/Makefile # -#ident "%Z%%M% %I% %E% SMI" + # @@ -34,4 +34,4 @@ include ../../Makefile.lib.64 .KEEP_STATE: -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libsendfile/amd64/Makefile b/usr/src/lib/libsendfile/amd64/Makefile index f69d11f706..cde9b4f678 100644 --- a/usr/src/lib/libsendfile/amd64/Makefile +++ b/usr/src/lib/libsendfile/amd64/Makefile @@ -22,7 +22,7 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # MAPFILE32 = @@ -30,4 +30,4 @@ MAPFILE32 = include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libsendfile/i386/Makefile b/usr/src/lib/libsendfile/i386/Makefile index 6d5993bff1..1e27013184 100644 --- a/usr/src/lib/libsendfile/i386/Makefile +++ b/usr/src/lib/libsendfile/i386/Makefile @@ -24,4 +24,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libsendfile/sparc/Makefile b/usr/src/lib/libsendfile/sparc/Makefile index 6d5993bff1..1e27013184 100644 --- a/usr/src/lib/libsendfile/sparc/Makefile +++ b/usr/src/lib/libsendfile/sparc/Makefile @@ -24,4 +24,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libsendfile/sparcv9/Makefile b/usr/src/lib/libsendfile/sparcv9/Makefile index f69d11f706..cde9b4f678 100644 --- a/usr/src/lib/libsendfile/sparcv9/Makefile +++ b/usr/src/lib/libsendfile/sparcv9/Makefile @@ -22,7 +22,7 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # MAPFILE32 = @@ -30,4 +30,4 @@ MAPFILE32 = include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libsocket/amd64/Makefile b/usr/src/lib/libsocket/amd64/Makefile index 9fcd5cdbcb..b5ea3b52d1 100644 --- a/usr/src/lib/libsocket/amd64/Makefile +++ b/usr/src/lib/libsocket/amd64/Makefile @@ -22,7 +22,7 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # include ../Makefile.com @@ -30,4 +30,4 @@ include ../../Makefile.lib.64 all: $(LIBS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libsocket/i386/Makefile b/usr/src/lib/libsocket/i386/Makefile index 67e3d625c3..8d2e4a0b95 100644 --- a/usr/src/lib/libsocket/i386/Makefile +++ b/usr/src/lib/libsocket/i386/Makefile @@ -27,4 +27,4 @@ include ../Makefile.com all: $(LIBS) -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libsocket/sparc/Makefile b/usr/src/lib/libsocket/sparc/Makefile index 6cbbf06d61..e82960834b 100644 --- a/usr/src/lib/libsocket/sparc/Makefile +++ b/usr/src/lib/libsocket/sparc/Makefile @@ -28,4 +28,4 @@ include ../Makefile.com all: $(LIBS) -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libsocket/sparcv9/Makefile b/usr/src/lib/libsocket/sparcv9/Makefile index 2eafde412a..1d6a481946 100644 --- a/usr/src/lib/libsocket/sparcv9/Makefile +++ b/usr/src/lib/libsocket/sparcv9/Makefile @@ -23,7 +23,7 @@ # Copyright 1997-2003 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # include ../Makefile.com @@ -31,4 +31,4 @@ include ../../Makefile.lib.64 all: $(LIBS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libsysevent/amd64/Makefile b/usr/src/lib/libsysevent/amd64/Makefile index f3d6516cc0..e9d461671f 100644 --- a/usr/src/lib/libsysevent/amd64/Makefile +++ b/usr/src/lib/libsysevent/amd64/Makefile @@ -31,4 +31,4 @@ include ../../Makefile.lib.64 all: $(LIBS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libsysevent/i386/Makefile b/usr/src/lib/libsysevent/i386/Makefile index e27ec93133..2bfb89d072 100644 --- a/usr/src/lib/libsysevent/i386/Makefile +++ b/usr/src/lib/libsysevent/i386/Makefile @@ -30,4 +30,4 @@ all: $(LIBS) .KEEP_STATE: -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libsysevent/sparc/Makefile b/usr/src/lib/libsysevent/sparc/Makefile index c36d129a1d..424b46abc8 100644 --- a/usr/src/lib/libsysevent/sparc/Makefile +++ b/usr/src/lib/libsysevent/sparc/Makefile @@ -30,4 +30,4 @@ include ../Makefile.com all: $(LIBS) -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libsysevent/sparcv9/Makefile b/usr/src/lib/libsysevent/sparcv9/Makefile index 631a31bc85..9b50cbc3f6 100644 --- a/usr/src/lib/libsysevent/sparcv9/Makefile +++ b/usr/src/lib/libsysevent/sparcv9/Makefile @@ -31,4 +31,4 @@ include ../../Makefile.lib.64 all: $(LIBS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libtermcap/Makefile.com b/usr/src/lib/libtermcap/Makefile.com index 79446bea02..1a1efeee30 100644 --- a/usr/src/lib/libtermcap/Makefile.com +++ b/usr/src/lib/libtermcap/Makefile.com @@ -13,10 +13,18 @@ # Copyright 2011 Nexenta Systems, Inc. All rights reserved. # +LIBRARY = libtermcap.a +VERS = .1 + # install this library in the root filesystem include ../../Makefile.rootfs -LIBRARY = libtermcap.a -VERS = .1 +COMPATLINKS += usr/ccs/lib/libtermcap.so +COMPATLINKS64 += usr/ccs/lib/$(MACH64)/libtermcap.so + +$(ROOT)/usr/ccs/lib/libtermcap.so := \ + COMPATLINKTARGET=../../../lib/libtermcap.so.1 +$(ROOT)/usr/ccs/lib/$(MACH64)/libtermcap.so := \ + COMPATLINKTARGET=../../../../lib/$(MACH64)/libtermcap.so.1 DYNFLAGS += $(ZLOADFLTR) diff --git a/usr/src/lib/libtermcap/amd64/Makefile b/usr/src/lib/libtermcap/amd64/Makefile index 3e04fa59f3..8ca5b38196 100644 --- a/usr/src/lib/libtermcap/amd64/Makefile +++ b/usr/src/lib/libtermcap/amd64/Makefile @@ -14,9 +14,9 @@ # include $(SRC)/lib/Makefile.filter.com -include ../Makefile.com include $(SRC)/lib/Makefile.lib.64 +include ../Makefile.com -install: $(ROOTLIBS64) $(ROOTLINKS64) +install: $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/libtermcap/i386/Makefile b/usr/src/lib/libtermcap/i386/Makefile index e868f38c09..552b51a68f 100644 --- a/usr/src/lib/libtermcap/i386/Makefile +++ b/usr/src/lib/libtermcap/i386/Makefile @@ -16,6 +16,6 @@ include $(SRC)/lib/Makefile.filter.com include ../Makefile.com -install: $(ROOTLIBS) $(ROOTLINKS) +install: $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/libtermcap/sparc/Makefile b/usr/src/lib/libtermcap/sparc/Makefile index e868f38c09..552b51a68f 100644 --- a/usr/src/lib/libtermcap/sparc/Makefile +++ b/usr/src/lib/libtermcap/sparc/Makefile @@ -16,6 +16,6 @@ include $(SRC)/lib/Makefile.filter.com include ../Makefile.com -install: $(ROOTLIBS) $(ROOTLINKS) +install: $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/libtermcap/sparcv9/Makefile b/usr/src/lib/libtermcap/sparcv9/Makefile index 3e04fa59f3..8ca5b38196 100644 --- a/usr/src/lib/libtermcap/sparcv9/Makefile +++ b/usr/src/lib/libtermcap/sparcv9/Makefile @@ -14,9 +14,9 @@ # include $(SRC)/lib/Makefile.filter.com -include ../Makefile.com include $(SRC)/lib/Makefile.lib.64 +include ../Makefile.com -install: $(ROOTLIBS64) $(ROOTLINKS64) +install: $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/libthread/Makefile.com b/usr/src/lib/libthread/Makefile.com index 8de39ee8e5..f74b429257 100644 --- a/usr/src/lib/libthread/Makefile.com +++ b/usr/src/lib/libthread/Makefile.com @@ -28,3 +28,34 @@ VERS = .1 include $(SRC)/lib/Makefile.rootfs DYNFLAGS += -F libc.so.1 + +COMPATLINKS += usr/lib/lwp/libthread.so.1 \ + usr/lib/lwp/libthread_db.so.1 \ + lib/libthread_db.so.1 \ + lib/libthread_db.so \ + usr/lib/libthread_db.so.1 \ + usr/lib/libthread_db.so + +COMPATLINKS64 += usr/lib/lwp/$(MACH64)/libthread.so.1 \ + usr/lib/lwp/$(MACH64)/libthread_db.so.1 \ + lib/$(MACH64)/libthread_db.so.1 \ + lib/$(MACH64)/libthread_db.so \ + usr/lib/$(MACH64)/libthread_db.so.1 \ + usr/lib/$(MACH64)/libthread_db.so + +$(ROOT)/usr/lib/lwp/libthread.so.1 := COMPATLINKTARGET=../libthread.so.1 +$(ROOT)/usr/lib/lwp/libthread_db.so.1 := COMPATLINKTARGET=../libthread_db.so.1 +$(ROOT)/usr/lib/lwp/$(MACH64)/libthread.so.1:= \ + COMPATLINKTARGET=../../$(MACH64)/libthread.so.1 +$(ROOT)/usr/lib/lwp/$(MACH64)/libthread_db.so.1:= \ + COMPATLINKTARGET=../../$(MACH64)/libthread_db.so.1 +$(ROOT)/lib/libthread_db.so.1 := COMPATLINKTARGET=libc_db.so.1 +$(ROOT)/lib/libthread_db.so := COMPATLINKTARGET=libc_db.so.1 +$(ROOT)/usr/lib/libthread_db.so.1 := COMPATLINKTARGET=../../lib/libc_db.so.1 +$(ROOT)/usr/lib/libthread_db.so := COMPATLINKTARGET=../../lib/libc_db.so.1 +$(ROOT)/lib/$(MACH64)/libthread_db.so.1 := COMPATLINKTARGET=libc_db.so.1 +$(ROOT)/lib/$(MACH64)/libthread_db.so := COMPATLINKTARGET=libc_db.so.1 +$(ROOT)/usr/lib/$(MACH64)/libthread_db.so.1:= \ + COMPATLINKTARGET=../../../lib/$(MACH64)/libc_db.so.1 +$(ROOT)/usr/lib/$(MACH64)/libthread_db.so:= \ + COMPATLINKTARGET=../../../lib/$(MACH64)/libc_db.so.1 diff --git a/usr/src/lib/libthread/amd64/Makefile b/usr/src/lib/libthread/amd64/Makefile index 70f0fc2457..7769ebb6b9 100644 --- a/usr/src/lib/libthread/amd64/Makefile +++ b/usr/src/lib/libthread/amd64/Makefile @@ -27,6 +27,7 @@ include $(SRC)/lib/Makefile.filter.com include ../Makefile.com include $(SRC)/lib/Makefile.lib.64 -install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) \ + $(ROOTCOMPATLINKS64) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/libthread/i386/Makefile b/usr/src/lib/libthread/i386/Makefile index c318e6089b..682e5560ca 100644 --- a/usr/src/lib/libthread/i386/Makefile +++ b/usr/src/lib/libthread/i386/Makefile @@ -26,6 +26,7 @@ include $(SRC)/lib/Makefile.filter.com include ../Makefile.com -install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) \ + $(ROOTCOMPATLINKS) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/libthread/sparc/Makefile b/usr/src/lib/libthread/sparc/Makefile index c318e6089b..682e5560ca 100644 --- a/usr/src/lib/libthread/sparc/Makefile +++ b/usr/src/lib/libthread/sparc/Makefile @@ -26,6 +26,7 @@ include $(SRC)/lib/Makefile.filter.com include ../Makefile.com -install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) \ + $(ROOTCOMPATLINKS) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/libthread/sparcv9/Makefile b/usr/src/lib/libthread/sparcv9/Makefile index 70f0fc2457..7769ebb6b9 100644 --- a/usr/src/lib/libthread/sparcv9/Makefile +++ b/usr/src/lib/libthread/sparcv9/Makefile @@ -27,6 +27,7 @@ include $(SRC)/lib/Makefile.filter.com include ../Makefile.com include $(SRC)/lib/Makefile.lib.64 -install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) \ + $(ROOTCOMPATLINKS64) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/libtsnet/amd64/Makefile b/usr/src/lib/libtsnet/amd64/Makefile index b13b247ca8..a48c536235 100644 --- a/usr/src/lib/libtsnet/amd64/Makefile +++ b/usr/src/lib/libtsnet/amd64/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libtsnet/i386/Makefile b/usr/src/lib/libtsnet/i386/Makefile index d6eed917a9..8537c30eda 100644 --- a/usr/src/lib/libtsnet/i386/Makefile +++ b/usr/src/lib/libtsnet/i386/Makefile @@ -29,4 +29,4 @@ include ../Makefile.com all: $(LIBS) -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libtsnet/sparc/Makefile b/usr/src/lib/libtsnet/sparc/Makefile index a8078739af..1551cf2cb2 100644 --- a/usr/src/lib/libtsnet/sparc/Makefile +++ b/usr/src/lib/libtsnet/sparc/Makefile @@ -27,4 +27,4 @@ include ../Makefile.com all: $(LIBS) -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libtsnet/sparcv9/Makefile b/usr/src/lib/libtsnet/sparcv9/Makefile index b13b247ca8..a48c536235 100644 --- a/usr/src/lib/libtsnet/sparcv9/Makefile +++ b/usr/src/lib/libtsnet/sparcv9/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libtsol/amd64/Makefile b/usr/src/lib/libtsol/amd64/Makefile index b13b247ca8..a48c536235 100644 --- a/usr/src/lib/libtsol/amd64/Makefile +++ b/usr/src/lib/libtsol/amd64/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libtsol/i386/Makefile b/usr/src/lib/libtsol/i386/Makefile index 282da97a76..0a45e8bf8d 100644 --- a/usr/src/lib/libtsol/i386/Makefile +++ b/usr/src/lib/libtsol/i386/Makefile @@ -21,8 +21,7 @@ # # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. -# include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libtsol/sparc/Makefile b/usr/src/lib/libtsol/sparc/Makefile index 282da97a76..cf2087e71e 100644 --- a/usr/src/lib/libtsol/sparc/Makefile +++ b/usr/src/lib/libtsol/sparc/Makefile @@ -25,4 +25,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libtsol/sparcv9/Makefile b/usr/src/lib/libtsol/sparcv9/Makefile index b13b247ca8..a48c536235 100644 --- a/usr/src/lib/libtsol/sparcv9/Makefile +++ b/usr/src/lib/libtsol/sparcv9/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libumem/Makefile.com b/usr/src/lib/libumem/Makefile.com index 504a8beb38..21ddb07c76 100644 --- a/usr/src/lib/libumem/Makefile.com +++ b/usr/src/lib/libumem/Makefile.com @@ -159,7 +159,7 @@ CFLAGS64 += $(CCVERBOSE) $(CFLAGS64_$(CURTYPE)) $(CFLAGS64_common) pics/umem.o := SMOFF += index_overflow objs/umem.o := SMOFF += index_overflow -INSTALL_DEPS_library = $(ROOTLINKS) $(ROOTLIBS) +INSTALL_DEPS_library = $(ROOTLINKS) $(ROOTLIBS) $(ROOTCOMPATLINKS) DYNFLAGS += $(ZINTERPOSE) diff --git a/usr/src/lib/libumem/amd64/Makefile b/usr/src/lib/libumem/amd64/Makefile index 9c3b6bd6a7..66257765d3 100644 --- a/usr/src/lib/libumem/amd64/Makefile +++ b/usr/src/lib/libumem/amd64/Makefile @@ -31,6 +31,7 @@ include ../../Makefile.lib.64 TYPES=library standalone -INSTALL_DEPS_library = $(ROOTLINKS64) $(ROOTLIBS64) +INSTALL_DEPS_library = $(ROOTLINKS64) $(ROOTLIBS64) \ + $(ROOTCOMPATLINKS64) include ../Makefile.targ diff --git a/usr/src/lib/libumem/sparcv9/Makefile b/usr/src/lib/libumem/sparcv9/Makefile index 763d425cc0..27258f0fc7 100644 --- a/usr/src/lib/libumem/sparcv9/Makefile +++ b/usr/src/lib/libumem/sparcv9/Makefile @@ -31,6 +31,7 @@ include ../../Makefile.lib.64 TYPES=library standalone -INSTALL_DEPS_library = $(ROOTLINKS64) $(ROOTLIBS64) +INSTALL_DEPS_library = $(ROOTLINKS64) $(ROOTLIBS64) \ + $(ROOTCOMPATLINKS64) include ../Makefile.targ diff --git a/usr/src/lib/libuuid/amd64/Makefile b/usr/src/lib/libuuid/amd64/Makefile index 30d4207380..f820b35e24 100644 --- a/usr/src/lib/libuuid/amd64/Makefile +++ b/usr/src/lib/libuuid/amd64/Makefile @@ -31,4 +31,4 @@ LIBS = $(DYNLIB) all: $(LIBS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libuuid/i386/Makefile b/usr/src/lib/libuuid/i386/Makefile index 300d26fee1..9fc7468c2a 100644 --- a/usr/src/lib/libuuid/i386/Makefile +++ b/usr/src/lib/libuuid/i386/Makefile @@ -28,4 +28,4 @@ include ../Makefile.com all: $(LIBS) -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libuuid/sparc/Makefile b/usr/src/lib/libuuid/sparc/Makefile index 300d26fee1..9fc7468c2a 100644 --- a/usr/src/lib/libuuid/sparc/Makefile +++ b/usr/src/lib/libuuid/sparc/Makefile @@ -28,4 +28,4 @@ include ../Makefile.com all: $(LIBS) -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libuuid/sparcv9/Makefile b/usr/src/lib/libuuid/sparcv9/Makefile index cfbc2a8822..aa340f7eee 100644 --- a/usr/src/lib/libuuid/sparcv9/Makefile +++ b/usr/src/lib/libuuid/sparcv9/Makefile @@ -31,4 +31,4 @@ LIBS = $(DYNLIB) all: $(LIBS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libuutil/amd64/Makefile b/usr/src/lib/libuutil/amd64/Makefile index 010d484a50..2bbd813164 100644 --- a/usr/src/lib/libuutil/amd64/Makefile +++ b/usr/src/lib/libuutil/amd64/Makefile @@ -27,4 +27,4 @@ include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libuutil/i386/Makefile b/usr/src/lib/libuutil/i386/Makefile index 18584b4da1..59045395eb 100644 --- a/usr/src/lib/libuutil/i386/Makefile +++ b/usr/src/lib/libuutil/i386/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libuutil/sparc/Makefile b/usr/src/lib/libuutil/sparc/Makefile index 18584b4da1..59045395eb 100644 --- a/usr/src/lib/libuutil/sparc/Makefile +++ b/usr/src/lib/libuutil/sparc/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libuutil/sparcv9/Makefile b/usr/src/lib/libuutil/sparcv9/Makefile index 351c978643..7270774630 100644 --- a/usr/src/lib/libuutil/sparcv9/Makefile +++ b/usr/src/lib/libuutil/sparcv9/Makefile @@ -33,4 +33,4 @@ LIBS = $(DYNLIB) all: $(LIBS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libw/amd64/Makefile b/usr/src/lib/libw/amd64/Makefile index 70f0fc2457..7769ebb6b9 100644 --- a/usr/src/lib/libw/amd64/Makefile +++ b/usr/src/lib/libw/amd64/Makefile @@ -27,6 +27,7 @@ include $(SRC)/lib/Makefile.filter.com include ../Makefile.com include $(SRC)/lib/Makefile.lib.64 -install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) \ + $(ROOTCOMPATLINKS64) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/libw/i386/Makefile b/usr/src/lib/libw/i386/Makefile index c318e6089b..2c781f2d6c 100644 --- a/usr/src/lib/libw/i386/Makefile +++ b/usr/src/lib/libw/i386/Makefile @@ -26,6 +26,6 @@ include $(SRC)/lib/Makefile.filter.com include ../Makefile.com -install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/libw/sparc/Makefile b/usr/src/lib/libw/sparc/Makefile index c318e6089b..2c781f2d6c 100644 --- a/usr/src/lib/libw/sparc/Makefile +++ b/usr/src/lib/libw/sparc/Makefile @@ -26,6 +26,6 @@ include $(SRC)/lib/Makefile.filter.com include ../Makefile.com -install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/libw/sparcv9/Makefile b/usr/src/lib/libw/sparcv9/Makefile index 70f0fc2457..7769ebb6b9 100644 --- a/usr/src/lib/libw/sparcv9/Makefile +++ b/usr/src/lib/libw/sparcv9/Makefile @@ -27,6 +27,7 @@ include $(SRC)/lib/Makefile.filter.com include ../Makefile.com include $(SRC)/lib/Makefile.lib.64 -install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) \ + $(ROOTCOMPATLINKS64) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/libxnet/amd64/Makefile b/usr/src/lib/libxnet/amd64/Makefile index 70f0fc2457..7769ebb6b9 100644 --- a/usr/src/lib/libxnet/amd64/Makefile +++ b/usr/src/lib/libxnet/amd64/Makefile @@ -27,6 +27,7 @@ include $(SRC)/lib/Makefile.filter.com include ../Makefile.com include $(SRC)/lib/Makefile.lib.64 -install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) \ + $(ROOTCOMPATLINKS64) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/libxnet/i386/Makefile b/usr/src/lib/libxnet/i386/Makefile index c318e6089b..682e5560ca 100644 --- a/usr/src/lib/libxnet/i386/Makefile +++ b/usr/src/lib/libxnet/i386/Makefile @@ -26,6 +26,7 @@ include $(SRC)/lib/Makefile.filter.com include ../Makefile.com -install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) \ + $(ROOTCOMPATLINKS) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/libxnet/sparc/Makefile b/usr/src/lib/libxnet/sparc/Makefile index c318e6089b..682e5560ca 100644 --- a/usr/src/lib/libxnet/sparc/Makefile +++ b/usr/src/lib/libxnet/sparc/Makefile @@ -26,6 +26,7 @@ include $(SRC)/lib/Makefile.filter.com include ../Makefile.com -install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) \ + $(ROOTCOMPATLINKS) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/libxnet/sparcv9/Makefile b/usr/src/lib/libxnet/sparcv9/Makefile index 70f0fc2457..7769ebb6b9 100644 --- a/usr/src/lib/libxnet/sparcv9/Makefile +++ b/usr/src/lib/libxnet/sparcv9/Makefile @@ -27,6 +27,7 @@ include $(SRC)/lib/Makefile.filter.com include ../Makefile.com include $(SRC)/lib/Makefile.lib.64 -install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) \ + $(ROOTCOMPATLINKS64) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/libzfs/amd64/Makefile b/usr/src/lib/libzfs/amd64/Makefile index 44075ed1bd..071ae5b23d 100644 --- a/usr/src/lib/libzfs/amd64/Makefile +++ b/usr/src/lib/libzfs/amd64/Makefile @@ -23,9 +23,9 @@ # Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" + include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libzfs/i386/Makefile b/usr/src/lib/libzfs/i386/Makefile index 703879a954..dc6deda296 100644 --- a/usr/src/lib/libzfs/i386/Makefile +++ b/usr/src/lib/libzfs/i386/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libzfs/sparc/Makefile b/usr/src/lib/libzfs/sparc/Makefile index 703879a954..dc6deda296 100644 --- a/usr/src/lib/libzfs/sparc/Makefile +++ b/usr/src/lib/libzfs/sparc/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libzfs/sparcv9/Makefile b/usr/src/lib/libzfs/sparcv9/Makefile index fc812ba170..a25e4750b5 100644 --- a/usr/src/lib/libzfs/sparcv9/Makefile +++ b/usr/src/lib/libzfs/sparcv9/Makefile @@ -29,4 +29,4 @@ include ../../Makefile.lib.64 sparcv9_C_PICFLAGS= $(sparcv9_C_BIGPICFLAGS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libzfs_core/amd64/Makefile b/usr/src/lib/libzfs_core/amd64/Makefile index b780a6dba8..14bdb8486d 100644 --- a/usr/src/lib/libzfs_core/amd64/Makefile +++ b/usr/src/lib/libzfs_core/amd64/Makefile @@ -27,4 +27,4 @@ include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libzfs_core/i386/Makefile b/usr/src/lib/libzfs_core/i386/Makefile index 703879a954..dc6deda296 100644 --- a/usr/src/lib/libzfs_core/i386/Makefile +++ b/usr/src/lib/libzfs_core/i386/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libzfs_core/sparc/Makefile b/usr/src/lib/libzfs_core/sparc/Makefile index 703879a954..dc6deda296 100644 --- a/usr/src/lib/libzfs_core/sparc/Makefile +++ b/usr/src/lib/libzfs_core/sparc/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libzfs_core/sparcv9/Makefile b/usr/src/lib/libzfs_core/sparcv9/Makefile index fc812ba170..a25e4750b5 100644 --- a/usr/src/lib/libzfs_core/sparcv9/Makefile +++ b/usr/src/lib/libzfs_core/sparcv9/Makefile @@ -29,4 +29,4 @@ include ../../Makefile.lib.64 sparcv9_C_PICFLAGS= $(sparcv9_C_BIGPICFLAGS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libzutil/amd64/Makefile b/usr/src/lib/libzutil/amd64/Makefile index 5a2ea08b45..431f2454cb 100644 --- a/usr/src/lib/libzutil/amd64/Makefile +++ b/usr/src/lib/libzutil/amd64/Makefile @@ -16,4 +16,4 @@ include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libzutil/i386/Makefile b/usr/src/lib/libzutil/i386/Makefile index aeec694b08..c65cbc4e4a 100644 --- a/usr/src/lib/libzutil/i386/Makefile +++ b/usr/src/lib/libzutil/i386/Makefile @@ -15,4 +15,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libzutil/sparc/Makefile b/usr/src/lib/libzutil/sparc/Makefile index aeec694b08..c65cbc4e4a 100644 --- a/usr/src/lib/libzutil/sparc/Makefile +++ b/usr/src/lib/libzutil/sparc/Makefile @@ -15,4 +15,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libzutil/sparcv9/Makefile b/usr/src/lib/libzutil/sparcv9/Makefile index e2931cd005..83072d9069 100644 --- a/usr/src/lib/libzutil/sparcv9/Makefile +++ b/usr/src/lib/libzutil/sparcv9/Makefile @@ -18,4 +18,4 @@ include ../../Makefile.lib.64 sparcv9_C_PICFLAGS= $(sparcv9_C_BIGPICFLAGS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/nsswitch/compat/Makefile.com b/usr/src/lib/nsswitch/compat/Makefile.com index 5b600c5588..b5b4b7f388 100644 --- a/usr/src/lib/nsswitch/compat/Makefile.com +++ b/usr/src/lib/nsswitch/compat/Makefile.com @@ -23,9 +23,6 @@ # Copyright 1993,2001-2003 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# -# lib/nsswitch/compat/Makefile.com LIBRARY = libnss_compat.a VERS = .1 @@ -43,5 +40,14 @@ include ../../Makefile.com # install this library in the root filesystem include ../../../Makefile.rootfs -LDLIBS += -lnsl DYNLIB1 = nss_compat.so$(VERS) + +COMPATLINKS= usr/lib/$(DYNLIB1) +COMPATLINKS64= usr/lib/$(MACH64)/$(DYNLIB1) + +$(ROOT)/usr/lib/$(DYNLIB1) := COMPATLINKTARGET=../../lib/$(DYNLIB1) +$(ROOT)/usr/lib/$(MACH64)/$(DYNLIB1):= \ + COMPATLINKTARGET=../../../lib/$(MACH64)/$(DYNLIB1) + +LDLIBS += -lnsl + diff --git a/usr/src/lib/nsswitch/compat/amd64/Makefile b/usr/src/lib/nsswitch/compat/amd64/Makefile index 1334471b25..2f85b65f33 100644 --- a/usr/src/lib/nsswitch/compat/amd64/Makefile +++ b/usr/src/lib/nsswitch/compat/amd64/Makefile @@ -23,7 +23,7 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # include ../Makefile.com @@ -33,4 +33,4 @@ LIBS = $(DYNLIB1) include ../../Makefile.targ -install: all $(ROOT64DYNLIB) +install: all $(ROOT64DYNLIB) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/nsswitch/compat/i386/Makefile b/usr/src/lib/nsswitch/compat/i386/Makefile index b7894e1fb1..2ca94e0c37 100644 --- a/usr/src/lib/nsswitch/compat/i386/Makefile +++ b/usr/src/lib/nsswitch/compat/i386/Makefile @@ -23,7 +23,7 @@ # Copyright 1993,2001-2003 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # # lib/nsswitch/compat/i386/Makefile @@ -33,4 +33,4 @@ LIBS = $(DYNLIB1) include ../../Makefile.targ -install: all $(ROOTLIBS) +install: all $(ROOTLIBS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/nsswitch/compat/sparc/Makefile b/usr/src/lib/nsswitch/compat/sparc/Makefile index bf84dac75a..9b36f0b9be 100644 --- a/usr/src/lib/nsswitch/compat/sparc/Makefile +++ b/usr/src/lib/nsswitch/compat/sparc/Makefile @@ -23,7 +23,7 @@ # Copyright 1993,2001-2003 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # # lib/nsswitch/compat/sparc/Makefile @@ -33,4 +33,4 @@ LIBS = $(DYNLIB1) include ../../Makefile.targ -install: all $(ROOTLIBS) +install: all $(ROOTLIBS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/nsswitch/compat/sparcv9/Makefile b/usr/src/lib/nsswitch/compat/sparcv9/Makefile index 7e6c72e5c7..39d99524aa 100644 --- a/usr/src/lib/nsswitch/compat/sparcv9/Makefile +++ b/usr/src/lib/nsswitch/compat/sparcv9/Makefile @@ -20,7 +20,7 @@ # CDDL HEADER END # # -#ident "%Z%%M% %I% %E% SMI" + # # Copyright (c) 1993,2001 by Sun Microsystems, Inc. # All rights reserved. @@ -34,4 +34,4 @@ LIBS = $(DYNLIB1) include ../../Makefile.targ -install: all $(ROOT64DYNLIB) +install: all $(ROOT64DYNLIB) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/nsswitch/dns/Makefile.com b/usr/src/lib/nsswitch/dns/Makefile.com index 0c17e48cb0..e1a02743d1 100644 --- a/usr/src/lib/nsswitch/dns/Makefile.com +++ b/usr/src/lib/nsswitch/dns/Makefile.com @@ -38,10 +38,19 @@ include ../../Makefile.com # install this library in the root filesystem include ../../../Makefile.rootfs +DYNLIB1 = nss_dns.so$(VERS) + +COMPATLINKS= usr/lib/$(DYNLIB1) +COMPATLINKS64= usr/lib/$(MACH64)/$(DYNLIB1) + +$(ROOT)/usr/lib/$(DYNLIB1) := COMPATLINKTARGET=../../lib/$(DYNLIB1) +$(ROOT)/usr/lib/$(MACH64)/$(DYNLIB1):= \ + COMPATLINKTARGET=../../../lib/$(MACH64)/$(DYNLIB1) + # Appropriate libresolv loaded at runtime. This is the default, to be dlopened # if no libresolv was provided by the application. CPPFLAGS += -DNSS_DNS_LIBRESOLV=\"libresolv.so.2\" LDLIBS += -lnsl -lsocket -DYNLIB1 = nss_dns.so$(VERS) + diff --git a/usr/src/lib/nsswitch/dns/amd64/Makefile b/usr/src/lib/nsswitch/dns/amd64/Makefile index 1334471b25..2f85b65f33 100644 --- a/usr/src/lib/nsswitch/dns/amd64/Makefile +++ b/usr/src/lib/nsswitch/dns/amd64/Makefile @@ -23,7 +23,7 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # include ../Makefile.com @@ -33,4 +33,4 @@ LIBS = $(DYNLIB1) include ../../Makefile.targ -install: all $(ROOT64DYNLIB) +install: all $(ROOT64DYNLIB) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/nsswitch/dns/i386/Makefile b/usr/src/lib/nsswitch/dns/i386/Makefile index 164288fc1d..a1784e474a 100644 --- a/usr/src/lib/nsswitch/dns/i386/Makefile +++ b/usr/src/lib/nsswitch/dns/i386/Makefile @@ -23,7 +23,7 @@ # Copyright 1993,2001-2003 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # # lib/nsswitch/dns/i386/Makefile @@ -33,4 +33,4 @@ LIBS = $(DYNLIB1) include ../../Makefile.targ -install: all $(ROOTLIBS) +install: all $(ROOTLIBS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/nsswitch/dns/sparc/Makefile b/usr/src/lib/nsswitch/dns/sparc/Makefile index 9ea99483e7..c42e6a88f5 100644 --- a/usr/src/lib/nsswitch/dns/sparc/Makefile +++ b/usr/src/lib/nsswitch/dns/sparc/Makefile @@ -23,7 +23,7 @@ # Copyright 1993,2001-2003 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # # lib/nsswitch/dns/sparc/Makefile @@ -33,4 +33,4 @@ LIBS = $(DYNLIB1) include ../../Makefile.targ -install: all $(ROOTLIBS) +install: all $(ROOTLIBS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/nsswitch/dns/sparcv9/Makefile b/usr/src/lib/nsswitch/dns/sparcv9/Makefile index dbcedcf28e..b686e818ca 100644 --- a/usr/src/lib/nsswitch/dns/sparcv9/Makefile +++ b/usr/src/lib/nsswitch/dns/sparcv9/Makefile @@ -20,7 +20,7 @@ # CDDL HEADER END # # -#ident "%Z%%M% %I% %E% SMI" + # # Copyright (c) 1993,2001 by Sun Microsystems, Inc. # All rights reserved. @@ -34,4 +34,4 @@ LIBS = $(DYNLIB1) include ../../Makefile.targ -install: all $(ROOT64DYNLIB) +install: all $(ROOT64DYNLIB) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/nsswitch/files/Makefile.com b/usr/src/lib/nsswitch/files/Makefile.com index e9d189e759..e79567aaaf 100644 --- a/usr/src/lib/nsswitch/files/Makefile.com +++ b/usr/src/lib/nsswitch/files/Makefile.com @@ -60,4 +60,18 @@ CPPFLAGS += -I../../../common/inc LDLIBS += -lnsl DYNLIB1 = nss_files.so$(VERS) +COMPATLINKS= usr/lib/$(DYNLIB1) \ + etc/lib/$(DYNLIB1) +COMPATLINKS64= usr/lib/$(MACH64)/$(DYNLIB1) + +$(ROOT)/usr/lib/$(DYNLIB1) := COMPATLINKTARGET=../../lib/$(DYNLIB1) +$(ROOT)/usr/lib/$(MACH64)/$(DYNLIB1):= \ + COMPATLINKTARGET=../../../lib/$(MACH64)/$(DYNLIB1) +$(ROOT)/usr/lib/$(DYNLIB1) := COMPATLINKTARGET=../../lib/$(DYNLIB1) +$(ROOT)/usr/lib/$(MACH64)/$(DYNLIB1):= \ + COMPATLINKTARGET=../../../lib/$(MACH64)/$(DYNLIB1) + +$(ROOT)/etc/lib/$(DYNLIB1) := COMPATLINKTARGET= ../../lib/$(DYNLIB1) + all: $(DYNLIB1) + diff --git a/usr/src/lib/nsswitch/files/amd64/Makefile b/usr/src/lib/nsswitch/files/amd64/Makefile index 1334471b25..2f85b65f33 100644 --- a/usr/src/lib/nsswitch/files/amd64/Makefile +++ b/usr/src/lib/nsswitch/files/amd64/Makefile @@ -23,7 +23,7 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # include ../Makefile.com @@ -33,4 +33,4 @@ LIBS = $(DYNLIB1) include ../../Makefile.targ -install: all $(ROOT64DYNLIB) +install: all $(ROOT64DYNLIB) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/nsswitch/files/i386/Makefile b/usr/src/lib/nsswitch/files/i386/Makefile index 96e5ad1958..8680ea468e 100644 --- a/usr/src/lib/nsswitch/files/i386/Makefile +++ b/usr/src/lib/nsswitch/files/i386/Makefile @@ -23,7 +23,7 @@ # Copyright 1993,2001-2003 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # # lib/nsswitch/files/i386/Makefile @@ -33,4 +33,4 @@ LIBS = $(DYNLIB1) include ../../Makefile.targ -install: all $(ROOTLIBS) +install: all $(ROOTLIBS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/nsswitch/files/sparc/Makefile b/usr/src/lib/nsswitch/files/sparc/Makefile index e79a5949bb..13c233f678 100644 --- a/usr/src/lib/nsswitch/files/sparc/Makefile +++ b/usr/src/lib/nsswitch/files/sparc/Makefile @@ -23,7 +23,7 @@ # Copyright 1993,2001-2003 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # # lib/nsswitch/files/sparc/Makefile @@ -33,4 +33,4 @@ LIBS = $(DYNLIB1) include ../../Makefile.targ -install: all $(ROOTLIBS) +install: all $(ROOTLIBS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/nsswitch/files/sparcv9/Makefile b/usr/src/lib/nsswitch/files/sparcv9/Makefile index 1c6d8cc170..1509fc0993 100644 --- a/usr/src/lib/nsswitch/files/sparcv9/Makefile +++ b/usr/src/lib/nsswitch/files/sparcv9/Makefile @@ -20,7 +20,7 @@ # CDDL HEADER END # # -#ident "%Z%%M% %I% %E% SMI" + # # Copyright (c) 1993,2001 by Sun Microsystems, Inc. # All rights reserved. @@ -34,4 +34,4 @@ LIBS = $(DYNLIB1) include ../../Makefile.targ -install: all $(ROOT64DYNLIB) +install: all $(ROOT64DYNLIB) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/nsswitch/nis/Makefile.com b/usr/src/lib/nsswitch/nis/Makefile.com index bee295ee5c..0e083e1c0e 100644 --- a/usr/src/lib/nsswitch/nis/Makefile.com +++ b/usr/src/lib/nsswitch/nis/Makefile.com @@ -54,6 +54,14 @@ include ../../Makefile.com # install this library in the root filesystem include ../../../Makefile.rootfs +DYNLIB1 = nss_nis.so$(VERS) + +COMPATLINKS= usr/lib/$(DYNLIB1) +COMPATLINKS64= usr/lib/$(MACH64)/$(DYNLIB1) + +$(ROOT)/usr/lib/$(DYNLIB1) := COMPATLINKTARGET=../../lib/$(DYNLIB1) +$(ROOT)/usr/lib/$(MACH64)/$(DYNLIB1):= \ + COMPATLINKTARGET=../../../lib/$(MACH64)/$(DYNLIB1) LDLIBS += -lnsl -DYNLIB1 = nss_nis.so$(VERS) + diff --git a/usr/src/lib/nsswitch/nis/amd64/Makefile b/usr/src/lib/nsswitch/nis/amd64/Makefile index 1334471b25..2f85b65f33 100644 --- a/usr/src/lib/nsswitch/nis/amd64/Makefile +++ b/usr/src/lib/nsswitch/nis/amd64/Makefile @@ -23,7 +23,7 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # include ../Makefile.com @@ -33,4 +33,4 @@ LIBS = $(DYNLIB1) include ../../Makefile.targ -install: all $(ROOT64DYNLIB) +install: all $(ROOT64DYNLIB) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/nsswitch/nis/i386/Makefile b/usr/src/lib/nsswitch/nis/i386/Makefile index 7c905cb9ed..efacc329ce 100644 --- a/usr/src/lib/nsswitch/nis/i386/Makefile +++ b/usr/src/lib/nsswitch/nis/i386/Makefile @@ -23,7 +23,7 @@ # Copyright 1993,2001-2003 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # # lib/nsswitch/nis/i386/Makefile @@ -33,4 +33,4 @@ LIBS = $(DYNLIB1) include ../../Makefile.targ -install: all $(ROOTLIBS) +install: all $(ROOTLIBS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/nsswitch/nis/sparc/Makefile b/usr/src/lib/nsswitch/nis/sparc/Makefile index cc816ee636..8ffaa154cd 100644 --- a/usr/src/lib/nsswitch/nis/sparc/Makefile +++ b/usr/src/lib/nsswitch/nis/sparc/Makefile @@ -23,7 +23,7 @@ # Copyright 1993,2001-2003 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # # lib/nsswitch/nis/sparc/Makefile @@ -33,4 +33,4 @@ LIBS = $(DYNLIB1) include ../../Makefile.targ -install: all $(ROOTLIBS) +install: all $(ROOTLIBS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/nsswitch/nis/sparcv9/Makefile b/usr/src/lib/nsswitch/nis/sparcv9/Makefile index 66974953c6..02a0757556 100644 --- a/usr/src/lib/nsswitch/nis/sparcv9/Makefile +++ b/usr/src/lib/nsswitch/nis/sparcv9/Makefile @@ -20,7 +20,7 @@ # CDDL HEADER END # # -#ident "%Z%%M% %I% %E% SMI" + # # Copyright (c) 1993,2001 by Sun Microsystems, Inc. # All rights reserved. @@ -34,4 +34,4 @@ LIBS = $(DYNLIB1) include ../../Makefile.targ -install: all $(ROOT64DYNLIB) +install: all $(ROOT64DYNLIB) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/nsswitch/user/Makefile.com b/usr/src/lib/nsswitch/user/Makefile.com index 691d13d376..0a1803ff22 100644 --- a/usr/src/lib/nsswitch/user/Makefile.com +++ b/usr/src/lib/nsswitch/user/Makefile.com @@ -35,8 +35,15 @@ include ../../Makefile.com # install this library in the root filesystem include ../../../Makefile.rootfs -CPPFLAGS += -I../../../common/inc - DYNLIB1 = nss_user.so$(VERS) +COMPATLINKS= usr/lib/$(DYNLIB1) +COMPATLINKS64= usr/lib/$(MACH64)/$(DYNLIB1) + +$(ROOT)/usr/lib/$(DYNLIB1) := COMPATLINKTARGET=../../lib/$(DYNLIB1) +$(ROOT)/usr/lib/$(MACH64)/$(DYNLIB1) := \ + COMPATLINKTARGET=../../../lib/$(MACH64)/$(DYNLIB1) + +CPPFLAGS += -I../../../common/inc + all: $(DYNLIB1) diff --git a/usr/src/lib/nsswitch/user/amd64/Makefile b/usr/src/lib/nsswitch/user/amd64/Makefile index 1334471b25..2f85b65f33 100644 --- a/usr/src/lib/nsswitch/user/amd64/Makefile +++ b/usr/src/lib/nsswitch/user/amd64/Makefile @@ -23,7 +23,7 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # include ../Makefile.com @@ -33,4 +33,4 @@ LIBS = $(DYNLIB1) include ../../Makefile.targ -install: all $(ROOT64DYNLIB) +install: all $(ROOT64DYNLIB) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/nsswitch/user/i386/Makefile b/usr/src/lib/nsswitch/user/i386/Makefile index 173380a346..ffe5bd84ba 100644 --- a/usr/src/lib/nsswitch/user/i386/Makefile +++ b/usr/src/lib/nsswitch/user/i386/Makefile @@ -20,7 +20,7 @@ # CDDL HEADER END # # -#ident "%Z%%M% %I% %E% SMI" + # # Copyright (c) 1993,2001 by Sun Microsystems, Inc. # All rights reserved. @@ -33,4 +33,4 @@ LIBS = $(DYNLIB1) include ../../Makefile.targ -install: all $(ROOTLIBS) +install: all $(ROOTLIBS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/nsswitch/user/sparc/Makefile b/usr/src/lib/nsswitch/user/sparc/Makefile index 2d974133a9..6de0a45157 100644 --- a/usr/src/lib/nsswitch/user/sparc/Makefile +++ b/usr/src/lib/nsswitch/user/sparc/Makefile @@ -20,7 +20,7 @@ # CDDL HEADER END # # -#ident "%Z%%M% %I% %E% SMI" + # # Copyright (c) 1993,2001 by Sun Microsystems, Inc. # All rights reserved. @@ -33,4 +33,4 @@ LIBS = $(DYNLIB1) include ../../Makefile.targ -install: all $(ROOTLIBS) +install: all $(ROOTLIBS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/nsswitch/user/sparcv9/Makefile b/usr/src/lib/nsswitch/user/sparcv9/Makefile index 87fbebb765..7f1a6c94bf 100644 --- a/usr/src/lib/nsswitch/user/sparcv9/Makefile +++ b/usr/src/lib/nsswitch/user/sparcv9/Makefile @@ -20,7 +20,7 @@ # CDDL HEADER END # # -#ident "%Z%%M% %I% %E% SMI" + # # Copyright (c) 1993,2001 by Sun Microsystems, Inc. # All rights reserved. @@ -34,4 +34,4 @@ LIBS = $(DYNLIB1) include ../../Makefile.targ -install: all $(ROOT64DYNLIB) +install: all $(ROOT64DYNLIB) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/print/libhttp-core/Makefile.com b/usr/src/lib/print/libhttp-core/Makefile.com index 45b5c6fd9a..2a0e82e1b9 100644 --- a/usr/src/lib/print/libhttp-core/Makefile.com +++ b/usr/src/lib/print/libhttp-core/Makefile.com @@ -31,7 +31,6 @@ OBJECTS = http-addr.o http-support.o http.o ROOTLIBDIR = $(ROOT)/usr/lib/print include ../../../Makefile.lib -include ../../../Makefile.rootfs SRCDIR = ../common diff --git a/usr/src/lib/print/libipp-core/Makefile.com b/usr/src/lib/print/libipp-core/Makefile.com index 6e7599193a..d6134f1481 100644 --- a/usr/src/lib/print/libipp-core/Makefile.com +++ b/usr/src/lib/print/libipp-core/Makefile.com @@ -29,12 +29,9 @@ VERS = .0 OBJECTS = ipp.o ipp_types.o read.o strings.o write.o include ../../../Makefile.lib -include ../../../Makefile.rootfs SRCDIR = ../common -ROOTLIBDIR= $(ROOT)/usr/lib - LIBS = $(DYNLIB) diff --git a/usr/src/lib/print/libipp-listener/Makefile.com b/usr/src/lib/print/libipp-listener/Makefile.com index 52baf5f495..aed0d8e745 100644 --- a/usr/src/lib/print/libipp-listener/Makefile.com +++ b/usr/src/lib/print/libipp-listener/Makefile.com @@ -36,12 +36,9 @@ OBJECTS = \ set-printer-attributes.o validate-job.o include ../../../Makefile.lib -include ../../../Makefile.rootfs SRCDIR = ../common -ROOTLIBDIR= $(ROOT)/usr/lib - LIBS = $(DYNLIB) diff --git a/usr/src/lib/print/libpapi-common/Makefile.com b/usr/src/lib/print/libpapi-common/Makefile.com index 1af239bded..0a1f4f213a 100644 --- a/usr/src/lib/print/libpapi-common/Makefile.com +++ b/usr/src/lib/print/libpapi-common/Makefile.com @@ -29,9 +29,6 @@ VERS = .0 OBJECTS = attribute.o common.o library.o list.o misc.o status.o uri.o include ../../../Makefile.lib -include ../../../Makefile.rootfs - -ROOTLIBDIR= $(ROOT)/usr/lib SRCDIR = ../common diff --git a/usr/src/lib/print/libpapi-dynamic/Makefile.com b/usr/src/lib/print/libpapi-dynamic/Makefile.com index 2b5bb5c0f2..de7378e876 100644 --- a/usr/src/lib/print/libpapi-dynamic/Makefile.com +++ b/usr/src/lib/print/libpapi-dynamic/Makefile.com @@ -29,12 +29,9 @@ VERS = .0 OBJECTS = job.o nss.o printer.o psm.o service.o include ../../../Makefile.lib -include ../../../Makefile.rootfs SRCDIR = ../common -ROOTLIBDIR= $(ROOT)/usr/lib - LIBS = $(DYNLIB) diff --git a/usr/src/lib/print/libpapi-ipp/Makefile.com b/usr/src/lib/print/libpapi-ipp/Makefile.com index 4c08a5c3da..ef6b9110a3 100644 --- a/usr/src/lib/print/libpapi-ipp/Makefile.com +++ b/usr/src/lib/print/libpapi-ipp/Makefile.com @@ -27,10 +27,8 @@ LIBRARY = psm-ipp.a VERS = .1 OBJECTS = ipp-support.o job.o printer.o service.o -ROOTLIBDIR = $(ROOT)/usr/lib/print include ../../../Makefile.lib -include ../../../Makefile.rootfs SRCDIR = ../common diff --git a/usr/src/lib/print/libpapi-lpd/Makefile.com b/usr/src/lib/print/libpapi-lpd/Makefile.com index 8778603750..3de91a340b 100644 --- a/usr/src/lib/print/libpapi-lpd/Makefile.com +++ b/usr/src/lib/print/libpapi-lpd/Makefile.com @@ -31,7 +31,6 @@ OBJECTS = job.o library.o lpd-cancel.o lpd-job.o lpd-query.o printer.o \ service.o $(COMMON_OBJS) include ../../../Makefile.lib -include ../../../Makefile.rootfs SRCDIR = ../common diff --git a/usr/src/lib/print/libprint/Makefile.com b/usr/src/lib/print/libprint/Makefile.com index 661db1bbb4..6a79beed68 100644 --- a/usr/src/lib/print/libprint/Makefile.com +++ b/usr/src/lib/print/libprint/Makefile.com @@ -31,12 +31,9 @@ OBJECTS = \ ns_cmn_printer.o nss_convert.o nss_ldap.o nss_printer.o nss_write.o include ../../../Makefile.lib -include ../../../Makefile.rootfs SRCDIR = ../common -ROOTLIBDIR= $(ROOT)/usr/lib - LIBS = $(DYNLIB) diff --git a/usr/src/lib/storage/libg_fc/sparcv9/Makefile b/usr/src/lib/storage/libg_fc/sparcv9/Makefile index b86d3f1aa6..f20c879508 100644 --- a/usr/src/lib/storage/libg_fc/sparcv9/Makefile +++ b/usr/src/lib/storage/libg_fc/sparcv9/Makefile @@ -27,6 +27,6 @@ include ../../../Makefile.lib.64 .KEEP_STATE: -all: $(LIBS) +all: $(LIBS) install: all $(ROOTLIBS64) $(ROOTLINKS64) -- cgit v1.2.3 From 4c46c814833d7980b7ebf54590a97d7f91472bd5 Mon Sep 17 00:00:00 2001 From: Robert Mustacchi Date: Sun, 3 May 2020 04:19:27 +0000 Subject: 12691 Want means of getting the maximum user address in a process Reviewed by: Yuri Pankov Reviewed by: Dan McDonald Reviewed by: Patrick Mooney Approved by: Gordon Ross --- usr/src/lib/libc/port/gen/sysconf.c | 5 ++++- usr/src/man/man3c/sysconf.3c | 21 +++++++-------------- usr/src/uts/common/sys/sysconfig.h | 1 + usr/src/uts/common/sys/unistd.h | 25 +++++++++++++------------ usr/src/uts/common/syscall/sysconfig.c | 4 ++++ 5 files changed, 29 insertions(+), 27 deletions(-) (limited to 'usr/src/lib/libc') diff --git a/usr/src/lib/libc/port/gen/sysconf.c b/usr/src/lib/libc/port/gen/sysconf.c index 8e852ce1c8..904b848027 100644 --- a/usr/src/lib/libc/port/gen/sysconf.c +++ b/usr/src/lib/libc/port/gen/sysconf.c @@ -27,7 +27,7 @@ */ /* Copyright (c) 1988 AT&T */ -/* All Rights Reserved */ +/* All Rights Reserved */ /* sysconf(3C) - returns system configuration information */ @@ -464,6 +464,9 @@ sysconf(int name) case _SC_EPHID_MAX: return (_sysconfig(_CONFIG_EPHID_MAX)); + case _SC_UADDR_MAX: + return (_sysconfig(_CONFIG_UADDR_MAX)); + /* UNIX 03 names - XPG6/SUSv3/POSIX.1-2001 */ case _SC_REGEXP: diff --git a/usr/src/man/man3c/sysconf.3c b/usr/src/man/man3c/sysconf.3c index 570c9709ae..2c5cd02f3a 100644 --- a/usr/src/man/man3c/sysconf.3c +++ b/usr/src/man/man3c/sysconf.3c @@ -45,11 +45,10 @@ .\" Copyright (c) 2008, Sun Microsystems, Inc. All Rights Reserved. .\" Copyright (c) 2013 Gary Mills .\" -.TH SYSCONF 3C "Apr 16, 2013" +.TH SYSCONF 3C "May 04, 2020" .SH NAME sysconf \- get configurable system variables .SH SYNOPSIS -.LP .nf #include @@ -57,8 +56,6 @@ sysconf \- get configurable system variables .fi .SH DESCRIPTION -.sp -.LP The \fBsysconf()\fR function provides a method for an application to determine the current value of a configurable system limit or option (variable). .sp @@ -319,6 +316,12 @@ _SC_TTY_NAME_MAX TTYNAME_MAX Max length of tty _SC_TZNAME_MAX TZNAME_MAX Max number of bytes supported for name of a time zone +_SC_UADDR_MAX Maximum valid user + address in a process. + The returned value + should be cast to a + uintptr_t before + being interpreted. _SC_V6_ILP32_OFF32 _POSIX_V6_ILP32_OFF32 Supports X/Open ILP32 w/32-bit offset build @@ -424,8 +427,6 @@ l l . .TE .SH RETURN VALUES -.sp -.LP Upon successful completion, \fBsysconf()\fR returns the current variable value on the system. The value returned will not be more restrictive than the corresponding value described to the application when it was compiled with the @@ -474,8 +475,6 @@ _SC_SPLIT_CACHE .in -2 .SH ERRORS -.sp -.LP The \fBsysconf()\fR function will fail if: .sp .ne 2 @@ -487,8 +486,6 @@ The value of the \fIname\fR argument is invalid. .RE .SH ATTRIBUTES -.sp -.LP See \fBattributes\fR(5) for descriptions of the following attributes: .sp @@ -509,13 +506,9 @@ Standard See \fBstandards\fR(5). .TE .SH SEE ALSO -.sp -.LP \fBpooladm\fR(1M), \fBzoneadm\fR(1M), \fBfpathconf\fR(2), \fBseteuid\fR(2), \fBsetrlimit\fR(2), \fBconfstr\fR(3C), \fBattributes\fR(5), \fBstandards\fR(5) .SH NOTES -.sp -.LP A call to \fBsetrlimit()\fR can cause the value of \fBOPEN_MAX\fR to change. .sp .LP diff --git a/usr/src/uts/common/sys/sysconfig.h b/usr/src/uts/common/sys/sysconfig.h index 3a68d76ebe..f34713c59e 100644 --- a/usr/src/uts/common/sys/sysconfig.h +++ b/usr/src/uts/common/sys/sysconfig.h @@ -100,6 +100,7 @@ extern int mach_sysconfig(int); #define _CONFIG_SYMLOOP_MAX 46 /* maximum # of symlinks in pathname */ #define _CONFIG_EPHID_MAX 47 /* maximum ephemeral uid */ +#define _CONFIG_UADDR_MAX 48 /* maximum user address */ #ifdef __cplusplus } diff --git a/usr/src/uts/common/sys/unistd.h b/usr/src/uts/common/sys/unistd.h index f366e99f6a..591a3426f5 100644 --- a/usr/src/uts/common/sys/unistd.h +++ b/usr/src/uts/common/sys/unistd.h @@ -106,9 +106,9 @@ extern "C" { #define _SC_ARG_MAX 1 #define _SC_CHILD_MAX 2 #define _SC_CLK_TCK 3 -#define _SC_NGROUPS_MAX 4 +#define _SC_NGROUPS_MAX 4 #define _SC_OPEN_MAX 5 -#define _SC_JOB_CONTROL 6 +#define _SC_JOB_CONTROL 6 #define _SC_SAVED_IDS 7 #define _SC_VERSION 8 /* SVR4 names */ @@ -151,21 +151,21 @@ extern "C" { #define _SC_TIMER_MAX 44 /* XPG4 names */ #define _SC_2_C_BIND 45 -#define _SC_2_C_DEV 46 +#define _SC_2_C_DEV 46 #define _SC_2_C_VERSION 47 -#define _SC_2_FORT_DEV 48 -#define _SC_2_FORT_RUN 49 +#define _SC_2_FORT_DEV 48 +#define _SC_2_FORT_RUN 49 #define _SC_2_LOCALEDEF 50 -#define _SC_2_SW_DEV 51 +#define _SC_2_SW_DEV 51 #define _SC_2_UPE 52 #define _SC_2_VERSION 53 #define _SC_BC_BASE_MAX 54 -#define _SC_BC_DIM_MAX 55 +#define _SC_BC_DIM_MAX 55 #define _SC_BC_SCALE_MAX 56 #define _SC_BC_STRING_MAX 57 #define _SC_COLL_WEIGHTS_MAX 58 #define _SC_EXPR_NEST_MAX 59 -#define _SC_LINE_MAX 60 +#define _SC_LINE_MAX 60 #define _SC_RE_DUP_MAX 61 #define _SC_XOPEN_CRYPT 62 #define _SC_XOPEN_ENH_I18N 63 @@ -210,6 +210,7 @@ extern "C" { #define _SC_NPROCESSORS_MAX 516 /* maximum # of processors */ #define _SC_CPUID_MAX 517 /* maximum CPU id */ #define _SC_EPHID_MAX 518 /* maximum ephemeral id */ +#define _SC_UADDR_MAX 519 /* maximum user address */ /* * POSIX.1c (pthreads) names. These values are defined above @@ -351,7 +352,7 @@ extern "C" { #ifdef _XPG6 #define _POSIX_VERSION 200112L /* Supports IEEE Std 1003.1-2001 */ #else -#define _POSIX_VERSION 199506L /* Supports POSIX-1c DIS */ +#define _POSIX_VERSION 199506L /* Supports POSIX-1c DIS */ #endif #endif /* _POSIX_VERSION */ @@ -359,7 +360,7 @@ extern "C" { #ifdef _XPG6 #define _POSIX2_VERSION 200112L /* Supports IEEE Std 1003.1-2001 */ #else -#define _POSIX2_VERSION 199209L /* Supports ISO POSIX-2 DIS */ +#define _POSIX2_VERSION 199209L /* Supports ISO POSIX-2 DIS */ #endif #endif /* _POSIX2_VERSION */ @@ -395,14 +396,14 @@ extern "C" { #define _POSIX2_FORT_RUN 200112L /* Supports FORTRAN runtime */ #define _POSIX2_LOCALEDEF 200112L /* Supports creation of locales */ #define _POSIX2_SW_DEV 200112L /* Supports S/W Development Utility */ -#define _POSIX2_UPE 200112L /* Supports User Portability Utility */ +#define _POSIX2_UPE 200112L /* Supports User Portability Utility */ #else #define _POSIX2_C_BIND 1 /* Supports C Language Bindings */ #define _POSIX2_C_DEV 1 /* Supports C language dev utility */ #define _POSIX2_FORT_RUN 1 /* Supports FORTRAN runtime */ #define _POSIX2_LOCALEDEF 1 /* Supports creation of locales */ #define _POSIX2_SW_DEV 1 /* Supports S/W Development Utility */ -#define _POSIX2_UPE 1 /* Supports User Portability Utility */ +#define _POSIX2_UPE 1 /* Supports User Portability Utility */ #endif /* _XPG6 */ /* UNIX 03 names */ diff --git a/usr/src/uts/common/syscall/sysconfig.c b/usr/src/uts/common/syscall/sysconfig.c index 03f2fabe13..1d4a12ff00 100644 --- a/usr/src/uts/common/syscall/sysconfig.c +++ b/usr/src/uts/common/syscall/sysconfig.c @@ -46,6 +46,7 @@ #include #include #include +#include extern rctl_hndl_t rc_process_sigqueue; @@ -219,6 +220,9 @@ sysconfig(int which) case _CONFIG_EPHID_MAX: return (MAXEPHUID); + case _CONFIG_UADDR_MAX: + return ((long)(uintptr_t)curproc->p_as->a_userlimit); + case _CONFIG_SYMLOOP_MAX: return (MAXSYMLINKS); } -- cgit v1.2.3 From cf3ec608f736765ec9852eed5e611848a25de9a4 Mon Sep 17 00:00:00 2001 From: Robert Mustacchi Date: Wed, 20 May 2020 09:37:32 -0700 Subject: 12768 12392 regressed ftello64 behavior Reviewed by: Andy Fiddaman Reviewed by: John Levon Reviewed by: Andrew Stormont Approved by: Dan McDonald --- usr/src/lib/libc/port/stdio/ftell.c | 2 +- usr/src/pkg/manifests/system-test-libctest.mf | 2 + usr/src/test/libc-tests/runfiles/default.run | 2 + usr/src/test/libc-tests/tests/stdio/Makefile | 18 ++++-- usr/src/test/libc-tests/tests/stdio/ftello_12768.c | 73 ++++++++++++++++++++++ 5 files changed, 92 insertions(+), 5 deletions(-) create mode 100644 usr/src/test/libc-tests/tests/stdio/ftello_12768.c (limited to 'usr/src/lib/libc') diff --git a/usr/src/lib/libc/port/stdio/ftell.c b/usr/src/lib/libc/port/stdio/ftell.c index dae2abea03..31aabec082 100644 --- a/usr/src/lib/libc/port/stdio/ftell.c +++ b/usr/src/lib/libc/port/stdio/ftell.c @@ -91,7 +91,7 @@ ftell_common(FILE *iop) tres += adjust; FUNLOCKFILE(lk); - return ((long)tres); + return (tres); } long diff --git a/usr/src/pkg/manifests/system-test-libctest.mf b/usr/src/pkg/manifests/system-test-libctest.mf index d7aa433d1e..67594901aa 100644 --- a/usr/src/pkg/manifests/system-test-libctest.mf +++ b/usr/src/pkg/manifests/system-test-libctest.mf @@ -162,6 +162,8 @@ file path=opt/libc-tests/tests/stdio/fmemopentest.32 mode=0555 file path=opt/libc-tests/tests/stdio/fmemopentest.64 mode=0555 file path=opt/libc-tests/tests/stdio/ftell_ungetc.32 mode=0555 file path=opt/libc-tests/tests/stdio/ftell_ungetc.64 mode=0555 +file path=opt/libc-tests/tests/stdio/ftello_12768.64 mode=0555 +file path=opt/libc-tests/tests/stdio/ftello_12768.lfs mode=0555 file path=opt/libc-tests/tests/stdio/memstream.32 mode=0555 file path=opt/libc-tests/tests/stdio/memstream.64 mode=0555 file path=opt/libc-tests/tests/stdio/memstream_reopen.32 mode=0555 diff --git a/usr/src/test/libc-tests/runfiles/default.run b/usr/src/test/libc-tests/runfiles/default.run index 6e0346c200..0af74f8780 100644 --- a/usr/src/test/libc-tests/runfiles/default.run +++ b/usr/src/test/libc-tests/runfiles/default.run @@ -68,6 +68,8 @@ timeout = 600 [/opt/libc-tests/tests/stdio/fmemopentest.64] [/opt/libc-tests/tests/stdio/ftell_ungetc.32] [/opt/libc-tests/tests/stdio/ftell_ungetc.64] +[/opt/libc-tests/tests/stdio/ftello_12768.lfs] +[/opt/libc-tests/tests/stdio/ftello_12768.64] [/opt/libc-tests/tests/stdio/memstream.32] [/opt/libc-tests/tests/stdio/memstream.64] [/opt/libc-tests/tests/stdio/memstream_reopen.32] diff --git a/usr/src/test/libc-tests/tests/stdio/Makefile b/usr/src/test/libc-tests/tests/stdio/Makefile index b94c42df30..092d62bc60 100644 --- a/usr/src/test/libc-tests/tests/stdio/Makefile +++ b/usr/src/test/libc-tests/tests/stdio/Makefile @@ -23,17 +23,23 @@ PROGS = \ orientation_test \ test_mbrtowc +LFSPROGS = \ + ftello_12768 + PROGS32 = $(PROGS:%=%.32) -PROGS64 = $(PROGS:%=%.64) +PROGSLFS = $(LFSPROGS:%=%.lfs) +PROGS64 = $(PROGS:%=%.64) $(LFSPROGS:%=%.64) ROOTOPTDIR = $(ROOT)/opt/libc-tests/tests ROOTOPTSTDIO = $(ROOTOPTDIR)/stdio ROOTOPTPROGS = $(PROGS32:%=$(ROOTOPTSTDIO)/%) \ - $(PROGS64:%=$(ROOTOPTSTDIO)/%) + $(PROGS64:%=$(ROOTOPTSTDIO)/%) \ + $(PROGSLFS:%=$(ROOTOPTSTDIO)/%) include $(SRC)/cmd/Makefile.cmd CPPFLAGS += -D_REENTRANT -D__EXTENSIONS__ +LFSCPPFLAGS = -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 # # libumem is used to interpose on all of these tests to modify the @@ -58,10 +64,10 @@ orientation_test.64 := SMOFF += all_func_returns .KEEP_STATE: -install: $(ROOTOPTPROGS) - all: $(PROGS32) $(PROGS64) +install: $(ROOTOPTPROGS) + clean: $(ROOTOPTPROGS): $(PROGS32) $(PROGS64) $(ROOTOPTSTDIO) @@ -79,6 +85,10 @@ $(ROOTOPTSTDIO)/%: % $(LINK64.c) -o $@ $< $(LDLIBS64) $(POST_PROCESS) +%.lfs: %.c + $(LINK.c) $(LFSCPPFLAGS) -o $@ $< $(LDLIBS) + $(POST_PROCESS) + %.32: %.c $(LINK.c) -o $@ $< $(LDLIBS) $(POST_PROCESS) diff --git a/usr/src/test/libc-tests/tests/stdio/ftello_12768.c b/usr/src/test/libc-tests/tests/stdio/ftello_12768.c new file mode 100644 index 0000000000..014f207876 --- /dev/null +++ b/usr/src/test/libc-tests/tests/stdio/ftello_12768.c @@ -0,0 +1,73 @@ +/* + * This file and its contents are supplied under the terms of the + * Common Development and Distribution License ("CDDL"), version 1.0. + * You may only use this file in accordance with the terms of version + * 1.0 of the CDDL. + * + * A full copy of the text of the CDDL should have accompanied this + * source. A copy of the CDDL is also available via the Internet at + * http://www.illumos.org/license/CDDL. + */ + +/* + * Copyright 2020 Oxide Computer Company + */ + +/* + * Regression test for 12768 '12392 regressed ftello64 behavior'. The heart of + * the problem was a bad cast that resulted in us not properly transmitting that + * size. + */ + +#include +#include +#include +#include + +int +main(void) +{ + FILE *f; + size_t i; + int ret = EXIT_SUCCESS; + static off_t offsets[] = { + 23, + 0xa0000, /* 64 KiB */ + 0x100000, /* 1 MiB */ + 0x7fffffffULL, /* 2 GiB - 1 */ + 0xc0000000ULL, /* 3 GiB */ + 0x200005432ULL /* 8 GiB + misc */ + }; + + f = tmpfile(); + if (f == NULL) { + err(EXIT_FAILURE, "TEST FAILED: failed to create " + "temporary file"); + } + + for (i = 0; i < ARRAY_SIZE(offsets); i++) { + off_t ftret; + + if (fseeko(f, offsets[i], SEEK_SET) != 0) { + warn("TEST FAILED: failed to seek to %lld", + (long long)offsets[i]); + ret = EXIT_FAILURE; + } + + ftret = ftello(f); + if (ftret == -1) { + warn("TEST FAILED: failed to get stream position at " + "%lld", (long long)offsets[i]); + ret = EXIT_FAILURE; + } + + if (ftret != offsets[i]) { + warnx("TEST FAILED: stream position mismatch: expected " + "%lld, found %lld", (long long)offsets[i], + (long long)ftret); + ret = EXIT_FAILURE; + } + } + + return (ret); +} -- cgit v1.2.3