# HG changeset patch # User Garrett D'Amore # Date 1302021074 25200 # Node ID ab46f88a2660f35ae5d429a920af508c914868c1 # Parent 9a080c1fd46c2dffcfb7cfdc202ab90e2cdd2cf1 842 src/lib/Makefile has libc_i18n vestiges Reviewed by: Rich Lowe Reviewed by: Albert Lee Approved by: Gordon Ross diff -r 9a080c1fd46c -r ab46f88a2660 usr/src/lib/Makefile --- a/usr/src/lib/Makefile Fri Mar 25 18:38:13 2011 -0400 +++ b/usr/src/lib/Makefile Tue Apr 05 09:31:14 2011 -0700 @@ -53,9 +53,6 @@ ../cmd/sgs/libconv \ ../cmd/sgs/libdl .WAIT -$(CLOSED_BUILD)SUBDIRS += \ - $(CLOSED)/lib/libc_i18n - SUBDIRS += \ libc .WAIT \ ../cmd/sgs/libelf .WAIT \ @@ -506,7 +503,6 @@ $($(MACH)_HDRSUBDIRS) $(CLOSED_BUILD)HDRSUBDIRS += \ - $(CLOSED)/lib/libc_i18n \ $(CLOSED)/lib/libike i386_HDRSUBDIRS= \ @@ -567,7 +563,6 @@ auditd_plugins: libbsm libnsl libsecdb gss_mechs/mech_krb5: libgss libnsl libsocket libresolv pkcs11 libadt_jni: libbsm -$(CLOSED_BUILD)libc: $(CLOSED)/lib/libc_i18n libast: libsocket libadutils: libldap5 libresolv libsocket libnsl nsswitch: libadutils libidmap diff -r 9a080c1fd46c -r ab46f88a2660 usr/src/lib/libc/README --- a/usr/src/lib/libc/README Fri Mar 25 18:38:13 2011 -0400 +++ b/usr/src/lib/libc/README Tue Apr 05 09:31:14 2011 -0700 @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# The Solaris Process Model Unification project: PSARC/2002/117 Solaris Process Model Unification @@ -187,21 +185,6 @@ ----- -Some i18n code cannot be distributed as open source. To enable the rest of -libc to be distributed as open source, those i18n files now live in a -separate libc_i18n directory. Those source files are position-independently -compiled and are archived into the libc_i18n.a library. The libc_i18n.a -archive library is installed into the $(ROOTFS_LIBDIR) and -$(ROOTFS_LIBDIR64) directories. During link phase, libc.so.1 links with -libc_i18n.a in the proto area. Therefore, the build of the libc_i18n tree -needs to be done before the build of the libc tree. Also the compilation -conditions such as the setting of CFLAGS and CPPFLAGS for the libc_i18n -stuff need to be compatible with the ones for the libc stuff. Whenever -changes that affect the compilation conditions of libc occur, the changes -should be propagated to libc_i18n. - ------ - The putback of the project: 6416832 libaio and librt can and should be folded into libc introduced several libc-private locking interfaces: diff -r 9a080c1fd46c -r ab46f88a2660 usr/src/pkg/manifests/developer-build-onbld.mf --- a/usr/src/pkg/manifests/developer-build-onbld.mf Fri Mar 25 18:38:13 2011 -0400 +++ b/usr/src/pkg/manifests/developer-build-onbld.mf Tue Apr 05 09:31:14 2011 -0700 @@ -114,7 +114,6 @@ file path=opt/onbld/bin/jstyle mode=0555 file path=opt/onbld/bin/make_pkg_db mode=0555 file path=opt/onbld/bin/mapfilechk mode=0555 -file path=opt/onbld/bin/mkclosed mode=0555 file path=opt/onbld/bin/mkreadme_osol mode=0555 file path=opt/onbld/bin/mktpl mode=0555 file path=opt/onbld/bin/nightly mode=0555 diff -r 9a080c1fd46c -r ab46f88a2660 usr/src/tools/scripts/Makefile --- a/usr/src/tools/scripts/Makefile Fri Mar 25 18:38:13 2011 -0400 +++ b/usr/src/tools/scripts/Makefile Tue Apr 05 09:31:14 2011 -0700 @@ -39,7 +39,6 @@ flg.flp \ genoffsets \ hgsetup \ - mkclosed \ nightly \ onu \ protocmp.terse \ diff -r 9a080c1fd46c -r ab46f88a2660 usr/src/tools/scripts/mkclosed.sh --- a/usr/src/tools/scripts/mkclosed.sh Fri Mar 25 18:38:13 2011 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,74 +0,0 @@ -#! /usr/bin/ksh -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License (the "License"). -# You may not use this file except in compliance with the License. -# -# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE -# or http://www.opensolaris.org/os/licensing. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# - -# -# Copyright 2007 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# ident "%Z%%M% %I% %E% SMI" -# - -# -# Generate a minimal set of closed binaries from a proto area. Useful -# when building just the open tree. -# - -usage="mkclosed isa root closed-root" - -if [ $# -ne 3 ]; then - print -u2 "usage: $usage" - exit 1 -fi - -isa=$1 -case "$isa" in -i386) plat64=amd64;; -sparc) plat64=sparcv9;; -*) print -u2 "unknown isa: $isa" - exit 1 - ;; -esac - -protoroot=$2 -closedroot=$3 - -# -# Make closedroot an absolute path if it isn't already. This is -# needed for the cpio invocation below. -# -[[ $closedroot = /* ]] || closedroot=`pwd`/$closedroot - -# Check arguments before modifying filesystem. -cd $protoroot || exit 1 - -mkdir -p $closedroot || exit 1 - -# -# Copy files from the proto area to the new closed tree. We use cpio -# rather than a tar pipeline to make it easier to detect errors. -# -# We need /lib/libc_i18n.a & /lib/{sparcv9,amd64}/libc_i18n.a -# - -mkdir -p $closedroot/lib/$plat64 -cp lib/libc_i18n.a $closedroot/lib -cp lib/$plat64/libc_i18n.a $closedroot/lib/$plat64 diff -r 9a080c1fd46c -r ab46f88a2660 usr/src/tools/scripts/nightly.sh --- a/usr/src/tools/scripts/nightly.sh Fri Mar 25 18:38:13 2011 -0400 +++ b/usr/src/tools/scripts/nightly.sh Tue Apr 05 09:31:14 2011 -0700 @@ -2672,11 +2672,7 @@ if [ "$SO_FLAG" = "y" -a "$build_ok" = y ]; then # - # Copy the open sources into their own tree, set up the closed - # binaries, and set up the environment. The build looks for - # the closed binaries in a location that depends on whether - # it's a DEBUG build, so we might need to make two copies. - # + # Copy the open sources into their own tree. # If copy_source fails, it will have already generated an # error message and set build_ok=n, so we don't need to worry # about that here. @@ -2685,34 +2681,7 @@ fi if [ "$SO_FLAG" = "y" -a "$build_ok" = y ]; then - - echo "\n==== Generating skeleton closed binaries for" \ - "open-only build ====\n" | \ - tee -a $LOGFILE >> $mail_msg_file - - rm -rf $CODEMGR_WS/closed.skel - if [ "$D_FLAG" = y ]; then - mkclosed $MACH $ROOT $CODEMGR_WS/closed.skel/root_$MACH \ - >>$LOGFILE 2>&1 - if (( $? != 0 )) ; then - echo "Couldn't create skeleton DEBUG closed binaries." | - tee -a $mail_msg_file >> $LOGFILE - fi - fi - if [ "$F_FLAG" = n ]; then - root=$ROOT - [ "$MULTI_PROTO" = yes ] && root=$ROOT-nd - mkclosed $MACH $root $CODEMGR_WS/closed.skel/root_$MACH-nd \ - >>$LOGFILE 2>&1 - if (( $? != 0 )) ; then - echo "Couldn't create skeleton non-DEBUG closed binaries." | - tee -a $mail_msg_file >> $LOGFILE - fi - fi - SRC=$OPEN_SRCDIR/usr/src - # Try not to clobber any user-provided closed binaries. - export ON_CLOSED_BINS=$CODEMGR_WS/closed.skel export CLOSED_IS_PRESENT=no fi @@ -2738,10 +2707,6 @@ normal_build fi -if [[ "$SO_FLAG" = "y" && "$build_ok" = "y" ]]; then - rm -rf $ON_CLOSED_BINS -fi - # # There are several checks that need to look at the proto area, but # they only need to look at one, and they don't care whether it's