Mercurial > illumos > illumos-gate
changeset 10262:f0a682e100e9
PSARC 2005/425 EOF /usr/ucb/cc & /usr/ucb/lint
6868909 remove /usr/ucb versions of cc, lint, ld
author | Garrett D'Amore <Garrett.Damore@Sun.COM> |
---|---|
date | Wed, 05 Aug 2009 15:46:35 -0700 |
parents | f3fec2334981 |
children | 56e344f46306 |
files | usr/src/pkgdefs/SUNWscpu/postinstall usr/src/pkgdefs/SUNWscpu/prototype_com usr/src/ucbcmd/Makefile usr/src/ucbcmd/cc/Makefile usr/src/ucbcmd/cc/cc.sh usr/src/ucbcmd/ld/Makefile usr/src/ucbcmd/ld/ld.sh usr/src/ucbcmd/lint.d/Makefile usr/src/ucbcmd/lint.d/lintcmd.sh |
diffstat | 9 files changed, 0 insertions(+), 464 deletions(-) [+] |
line wrap: on
line diff
--- a/usr/src/pkgdefs/SUNWscpu/postinstall Wed Aug 05 15:31:33 2009 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,33 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. -# -# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE -# or http://www.opensolaris.org/os/licensing. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# -# -#ident "%Z%%M% %I% %E% SMI" -# -# Copyright (c) 1991 by Sun Microsystems, Inc. -# - -# Remove the "arch" command, we nuked it, but it comes back -if [ -d $BASEDIR/usr/kvm ] ; then - if [ -f $BASEDIR/usr/kvm/arch ] ; then - rm $BASEDIR/usr/kvm/arch - fi -fi
--- a/usr/src/pkgdefs/SUNWscpu/prototype_com Wed Aug 05 15:31:33 2009 -0400 +++ b/usr/src/pkgdefs/SUNWscpu/prototype_com Wed Aug 05 15:46:35 2009 -0700 @@ -35,7 +35,6 @@ # packaging files i pkginfo i copyright -i postinstall i depend # # source locations relative to the prototype file @@ -58,7 +57,6 @@ f none usr/ucb/basename 755 root bin f none usr/ucb/bgplot 755 root bin f none usr/ucb/biff 755 root bin -f none usr/ucb/cc 555 root bin f none usr/ucb/chown 755 root bin s none usr/ucb/clear=../bin/clear f none usr/ucb/crtplot 755 root bin @@ -87,8 +85,6 @@ f none usr/ucb/hpplot 755 root bin f none usr/ucb/implot 755 root bin f none usr/ucb/install 755 root bin -f none usr/ucb/ld 555 root bin -f none usr/ucb/lint 555 root bin f none usr/ucb/ln 755 root bin s none usr/ucb/logger=../bin/logger f none usr/ucb/ls 755 root bin
--- a/usr/src/ucbcmd/Makefile Wed Aug 05 15:31:33 2009 -0400 +++ b/usr/src/ucbcmd/Makefile Wed Aug 05 15:46:35 2009 -0700 @@ -32,7 +32,6 @@ COMMON_SUBDIRS= \ basename \ biff \ - cc \ chown \ df \ du \ @@ -44,8 +43,6 @@ from \ groups \ install.d \ - ld \ - lint.d \ ln \ ls \ mkstr \
--- a/usr/src/ucbcmd/cc/Makefile Wed Aug 05 15:31:33 2009 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,42 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. -# -# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE -# or http://www.opensolaris.org/os/licensing. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# -#ident "%Z%%M% %I% %E% SMI" -# -# Copyright 2005 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# - -PROG= cc - -include ../Makefile.ucbcmd - -.KEEP_STATE: - -all: $(PROG) - -install: all $(ROOTBIN) $(ROOTPROG) - -clean: - -lint: - -include ../Makefile.ucbtarg
--- a/usr/src/ucbcmd/cc/cc.sh Wed Aug 05 15:31:33 2009 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,141 +0,0 @@ -#!/usr/bin/sh -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. -# -# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE -# or http://www.opensolaris.org/os/licensing. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# -# -# Copyright 1995 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# - -# Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T -# All Rights Reserved - -# -# University Copyright- Copyright (c) 1982, 1986, 1988 -# The Regents of the University of California -# All Rights Reserved -# -# University Acknowledgment- Portions of this document are derived from -# software developed by the University of California, Berkeley, and its -# contributors. -# - -#ident "%Z%%M% %I% %E% SMI" - -# cc command for BSD compatibility package: -# -# BSD compatibility package header files (/usr/ucbinclude) -# are included before SVr4 default (/usr/include) files but -# after any directories specified on the command line via -# the -I option. Thus, the BSD header files are included -# next to last, and SVr4 header files are searched last. -# -# BSD compatibility package libraries (/usr/ucblib) are -# searched next to third to last. SVr4 default libraries -# (/usr/ccs/lib and /usr/lib) are searched next to last -# -# Because the BSD compatibility package C library does not -# contain all the C library routines of /usr/ccs/lib/libc.a, -# the BSD package C library is named /usr/ucblib/libucb.a -# and is passed explicitly to cc. This ensures that libucb.a -# will be searched first for routines and that -# /usr/ccs/lib/libc.a will be searched afterwards for routines -# not found in /usr/ucblib/libucb.a. Also because sockets is -# provided in libc under BSD, /usr/lib/libsocket and /usr/lib/nsl -# are also included as default libraries. -# -# NOTE: the -Y L, and -Y U, options of cc are not valid - -if [ -f /usr/ccs/bin/ucbcc ] -then - - if [ $# -eq 0 ] - then - # use this to get the usage message from /usr/ccs/bin/ucbcc - /usr/ccs/bin/ucbcc - ret=$? - exit $ret - fi - - - UCB_LIB_DIR=/usr/ucblib - CCS_LIB_DIR=/usr/ccs/lib - USR_LIB=/usr/lib - TYPE= - dopt= - cgdir= - - for i in $* - do - case $i in - -cg*) - cgdir=`echo $i | sed -n 's/-//p'` - ;; - -Bstatic|-Bdynamic) - dopt=$i - ;; - -xarch=v9) - TYPE=/sparcv9 - ;; - esac - done - - if [ x$LD_RUN_PATH = x ] - then - LD_RUN_PATH=$UCB_LIB_DIR$TYPE - else - LD_RUN_PATH=$LD_RUN_PATH:$UCB_LIB_DIR$TYPE - fi - export LD_RUN_PATH - - if [ "$dopt" = "-Bstatic" ] - then - LIBS="-lucb -lsocket -lnsl -lelf" - else - LIBS="-lucb -lsocket -lnsl -lelf -laio" - fi - - # get the directory where ucbcc points to and set the LD_LIBRARY_PATH - # to that directory so as to get the necessary libraries. - cclink=`/usr/bin/ls -ln /usr/ccs/bin/ucbcc | awk '{print $11}'` - ccdir=`/usr/bin/dirname $cclink` - if [ "$cgdir" != "" ] - then - # can not have cgdir set and compile in 64bit mode, so - # reset variables back to 32bit mode - TYPE= - nccdir="$ccdir/../lib/$cgdir:$ccdir/../lib:$ccdir/$cgdir:$ccdir" - else - nccdir="$ccdir/../lib$TYPE:$ccdir$TYPE" - fi - - LD_LIBRARY_PATH=$UCB_LIB_DIR$TYPE:$CCS_LIB_DIR$TYPE:$USR_LIB$TYPE - export LD_LIBRARY_PATH - - /usr/ccs/bin/ucbcc -Xs \ - -YP,:$UCB_LIB_DIR$TYPE:$nccdir:$CCS_LIB_DIR$TYPE:$USR_LIB$TYPE \ - "$@" -I/usr/ucbinclude $LIBS - ret=$? - exit $ret -else - echo "/usr/ucb/cc: language optional software package not installed" - exit 1 -fi
--- a/usr/src/ucbcmd/ld/Makefile Wed Aug 05 15:31:33 2009 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,42 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. -# -# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE -# or http://www.opensolaris.org/os/licensing. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# -#ident "%Z%%M% %I% %E% SMI" -# -# Copyright 2005 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# - -PROG= ld - -include ../Makefile.ucbcmd - -.KEEP_STATE: - -all: $(PROG) - -install: all $(ROOTBIN) $(ROOTPROG) - -clean: - -lint: - -include ../Makefile.ucbtarg
--- a/usr/src/ucbcmd/ld/ld.sh Wed Aug 05 15:31:33 2009 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,77 +0,0 @@ -#!/usr/bin/sh -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. -# -# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE -# or http://www.opensolaris.org/os/licensing. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# -# Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T -# All Rights Reserved - - -#ident "%Z%%M% %I% %E% SMI" /* SVr4.0 1.7 */ - -# Copyright (c) 1984 AT&T -# All Rights Reserved - - -# Portions Copyright(c) 1988, Sun Microsystems, Inc. -# All Rights Reserved - -# ld command for BSD compatibility package: -# -# BSD compatibility package libraries (/usr/ucblib) are -# searched next to third to last. SVr4 default libraries -# (/usr/ccs/lib and /usr/lib) are searched next to last and -# last respectively. -# -# Because the BSD compatibility package C library does not -# contain all the C library routines of /usr/ccs/lib/libc.a, -# the BSD package C library is named /usr/ucblib/libucb.a -# and is passed explicitly to ld. This ensures that libucb.a -# will be searched first for routines and that -# /usr/ccs/lib/libc.a will be searched afterwards for routines -# not found in /usr/ucblib/libucb.a. Also because sockets is -# provided in libc under BSD, /usr/lib/libsocket and /usr/lib/nsl -# are also included as default libraries. -# -# NOTE: the -Y L, and -Y U, options of ld are not valid - -opts= -LIBS="-lucb -lresolv -lsocket -lnsl -lelf" - -if [ $# -eq 0 ] -then - exit 1 -elif [ $# -gt 0 ] -then - for i in $* - do - case $i in - -r) - LIBS="" - opts="$opts $i" - shift;; - *) - opts="$opts $i" - shift;; - esac - done -fi - -LD_RUN_PATH=/usr/ucblib /usr/ccs/bin/ld -YP,:/usr/ucblib:/usr/ccs/lib:/usr/lib $opts $LIBS
--- a/usr/src/ucbcmd/lint.d/Makefile Wed Aug 05 15:31:33 2009 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,45 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. -# -# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE -# or http://www.opensolaris.org/os/licensing. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# -#ident "%Z%%M% %I% %E% SMI" -# -# Copyright 2005 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# - -PROG= lintcmd -REALPROG= lint - -include ../Makefile.ucbcmd - -.KEEP_STATE: - -all: $(PROG) - -install: all $(ROOTBIN) $(ROOTPROG) - $(RM) $(ROOTBIN)/$(REALPROG) - $(MV) $(ROOTBIN)/$(PROG) $(ROOTBIN)/$(REALPROG) - -clean: - -lint: - -include ../Makefile.ucbtarg
--- a/usr/src/ucbcmd/lint.d/lintcmd.sh Wed Aug 05 15:31:33 2009 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,77 +0,0 @@ -#!/usr/bin/sh -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. -# -# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE -# or http://www.opensolaris.org/os/licensing. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# -# -# Copyright 1989 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# - -# Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T -# All Rights Reserved - -# University Copyright- Copyright (c) 1982, 1986, 1988 -# The Regents of the University of California -# All Rights Reserved -# -# University Acknowledgment- Portions of this document are derived from -# software developed by the University of California, Berkeley, and its -# contributors. - -#pragma ident "%Z%%M% %I% %E% SMI" - - -# lint command for BSD compatibility package: -# -# BSD compatibility package header files (/usr/ucbinclude) -# are included before SVr4 default (/usr/include) files but -# after any directories specified on the command line via -# the -I option. Thus, the BSD header files are included -# next to last, and SVr4 header files are searched last. -# -# BSD compatibility package libraries are searched first. -# -# Because the BSD compatibility package C lint library does not -# contain all the C library routines of /usr/ccs/lib/llib-lc, -# the BSD package C library is named /usr/ucblib/llib-lucb -# and is passed explicitly to lint. This ensures that llib-lucb -# will be searched first for routines and that -# /usr/ccs/lib/llib-lc will be searched afterwards for routines -# not found in /usr/ucblib/llib-lucb. Also because sockets is -# provided in libc under BSD, /usr/lib/llib-lsocket and -# /usr/lib/llib-lnsl are also included as default libraries. -# -# Note: Lint does not allow you to reset the search PATH for -# libraries. The following uses the -L option to point to -# /usr/ucblib. There are however some combinations of options -# specified by the user that could overrule the intended path. -# - -if [ -f /usr/ccs/bin/ucblint ] -then - /usr/ccs/bin/ucblint -L/usr/ucblib -Xs "$@" -I/usr/ucbinclude \ - -L/usr/ucblib -lucb -lsocket -lnsl -lelf - ret=$? - exit $ret -else - echo "/usr/ucb/lint: language optional software not installed" - exit 1 -fi