Mercurial > unleashed > wips

changeset 20267:32fcd0d6a59d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
don't build _msg for ast stuff
author Lauri Tirkkonen <lotheac@iki.fi>
date Wed, 09 Jan 2019 21:08:34 +0000
parents dbc881e1b3d4
children b42a8c081deb
files exception_lists/packaging usr/src/lib/Makefile usr/src/lib/Makefile.astmsg usr/src/lib/libast/Makefile.com usr/src/lib/libcmd/Makefile.com usr/src/lib/libdll/Makefile.com usr/src/lib/libpp/Makefile.com usr/src/lib/libshell/Makefile.com usr/src/lib/libsum/Makefile.com usr/src/pkg/manifests/consolidation-osnet-osnet-message-files.mf
diffstat 10 files changed, 0 insertions(+), 119 deletions(-) [+]
line wrap: on
line diff
--- a/exception_lists/packaging	Wed Jan 09 20:51:41 2019 +0000
+++ b/exception_lists/packaging	Wed Jan 09 21:08:34 2019 +0000
@@ -329,7 +329,6 @@
 usr/lib/amd64/libdll.so			i386
 # libpp (a helper library needed by AST's msgcc)
 usr/lib/libpp.so
-usr/lib/locale/C/LC_MESSAGES/libpp
 # libshell
 usr/lib/libshell.so
 usr/lib/amd64/libshell.so		i386
--- a/usr/src/lib/Makefile	Wed Jan 09 20:51:41 2019 +0000
+++ b/usr/src/lib/Makefile	Wed Jan 09 21:08:34 2019 +0000
@@ -252,15 +252,12 @@
 	gss_mechs/mech_dh	\
 	gss_mechs/mech_krb5	\
 	krb5		\
-	libast		\
 	libc		\
 	libcfgadm	\
-	libcmd		\
 	libcontract	\
 	libdhcputil	\
 	libdiskmgt	\
 	libdladm	\
-	libdll		\
 	libgss		\
 	libidmap	\
 	libilb		\
@@ -272,17 +269,14 @@
 	libofmt		\
 	libpam		\
 	libpool		\
-	libpp		\
 	libreparse	\
 	libsasl		\
 	libscf		\
 	libsecdb	\
 	libshare	\
-	libshell	\
 	libsldap	\
 	libsmbfs	\
 	libsmedia	\
-	libsum		\
 	libvrrpadm	\
 	libvscan	\
 	libzfs		\
--- a/usr/src/lib/Makefile.astmsg	Wed Jan 09 20:51:41 2019 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,95 +0,0 @@
-#
-# 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 2008 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-#
-# Temporarily control building AST l10n catalogs until all build
-# machines have been updated.
-#
-
-# Should we build AST l10n catalogs ?
-# This can be overridden at build time via:
-# $ export ON_BUILD_AST_L10N_CATALOGS=0
-ON_BUILD_AST_L10N_CATALOGS=1
-
-DO_BUILD_AST_CATALOGS_1=	$(ON_BUILD_AST_L10N_CATALOGS:0=$(POUND_SIGN))
-DONT_BUILD_AST_CATALOGS_1=	$(ON_BUILD_AST_L10N_CATALOGS:1=$(POUND_SIGN))
-DO_BUILD_AST_CATALOGS=		$(DO_BUILD_AST_CATALOGS_1:1=)
-DONT_BUILD_AST_CATALOGS=	$(DONT_BUILD_AST_CATALOGS_1:0=)
-
-#
-# l10n message catalog generation for AST libraries
-#
-
-MSGLIBNAME= $(LIBRARY:.a=)
-ASTMSGCATALOG= $(ROOT)/usr/lib/locale/C/LC_MESSAGES/$(MSGLIBNAME)
-
-$(DO_BUILD_AST_CATALOGS)ASTMSGCC= \
-	PATH="/usr/ast/bin/:/bin:/usr/bin" \
-		/usr/bin/ksh93 /usr/ast/bin/msgcc >>msgcc.out 2>&1
-
-ASTMSGS=  $(OBJECTS:%.o=msgs/%.mso)
-
-# cpp defines needed by msgcc
-i386_ASTMSGCCFLAGS=	-D__i386
-amd64_ASTMSGCCFLAGS=	-D__amd64
-sparc_ASTMSGCCFLAGS=	-D__sparc
-sparcv9_ASTMSGCCFLAGS=	-D__sparcv9
-ASTMSGCCFLAGS= -D_STDC_C99 -D__STDC__ -D__BUILTIN_VA_ARG_INCR $($(TARGETMACH)_ASTMSGCCFLAGS)
-
-msgs/%.mso: ../common/%.c
-	@mkdir -p "$$(dirname "$@")" ; \
-	print "# Processing file $< to $@" >>msgcc.out  ; \
-	$(ASTMSGCC) -M-set=ast $(ASTMSGCCFLAGS) $(CFLAGS) $(CPPFLAGS) -c "$<" -o "$@"
-msgs/%.mso: ../%.c
-	@mkdir -p "$$(dirname "$@")" ; \
-	print "# Processing file $< to $@" >>msgcc.out  ; \
-	$(ASTMSGCC) -M-set=ast $(ASTMSGCCFLAGS) $(CFLAGS) $(CPPFLAGS) -c "$<" -o "$@"
-
-$(MSGLIBNAME).msg: $(ASTMSGS)
-	@print "# Processing files $(ASTMSGS) to $@" >>msgcc.out ; \
-	$(ASTMSGCC) -M-set=ast $(ASTMSGCCFLAGS) $(CFLAGS) $(CPPFLAGS) -o $@ $(ASTMSGS)
-
-$(ASTMSGCATALOG): $(MSGLIBNAME).msg
-	@$(RM) "$(ASTMSGCATALOG)" ; \
-	sed 's/^$$translation msgcc .*//' <"$(MSGLIBNAME).msg" | gencat "$@" - ; \
-	$(CHMOD) 0644 $(ASTMSGCATALOG)
-
-# Main catalog target
-$(DO_BUILD_AST_CATALOGS)_msg: $(ASTMSGCATALOG)
-
-# Create empty catalog file when we do not build it (to avoid that we have to hack the
-# package database each time we toggle the switch)
-$(DONT_BUILD_AST_CATALOGS)_msg:
-$(DONT_BUILD_AST_CATALOGS)	$(RM) $(ASTMSGCATALOG) ; \
-	$(TOUCH) $(ASTMSGCATALOG) ; \
-	$(CHMOD) 0644 $(ASTMSGCATALOG)
-
-# Add message catalogs to the list of files to "clobber"
-CLOBBERFILES += \
-	$(ASTMSGS) \
-	$(ASTMSGCATALOG) \
-	$(MSGLIBNAME).msg \
-	msgcc.out
--- a/usr/src/lib/libast/Makefile.com	Wed Jan 09 20:51:41 2019 +0000
+++ b/usr/src/lib/libast/Makefile.com	Wed Jan 09 21:08:34 2019 +0000
@@ -656,8 +656,6 @@
 	$(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<
 	$(POST_PROCESS_O)
 
-include ../../Makefile.astmsg
-
 include ../../Makefile.lib
 
 # mapfile-vers does not live with the sources in in common/ to make
--- a/usr/src/lib/libcmd/Makefile.com	Wed Jan 09 20:51:41 2019 +0000
+++ b/usr/src/lib/libcmd/Makefile.com	Wed Jan 09 21:08:34 2019 +0000
@@ -79,8 +79,6 @@
 	wc.o \
 	wclib.o
 
-include ../../Makefile.astmsg
-
 include ../../Makefile.lib
 
 # mapfile-vers does not live with the sources in in common/ to make
--- a/usr/src/lib/libdll/Makefile.com	Wed Jan 09 20:51:41 2019 +0000
+++ b/usr/src/lib/libdll/Makefile.com	Wed Jan 09 21:08:34 2019 +0000
@@ -38,8 +38,6 @@
 	dllplug.o \
 	dllscan.o
 
-include ../../Makefile.astmsg
-
 include ../../Makefile.lib
 
 # mapfile-vers does not live with the sources in in common/ to make
--- a/usr/src/lib/libpp/Makefile.com	Wed Jan 09 20:51:41 2019 +0000
+++ b/usr/src/lib/libpp/Makefile.com	Wed Jan 09 21:08:34 2019 +0000
@@ -54,8 +54,6 @@
 	ppsearch.o \
 	pptrace.o
 
-include ../../Makefile.astmsg
-
 include ../../Makefile.lib
 
 # mapfile-vers does not live with the sources in in common/ to make
--- a/usr/src/lib/libshell/Makefile.com	Wed Jan 09 20:51:41 2019 +0000
+++ b/usr/src/lib/libshell/Makefile.com	Wed Jan 09 21:08:34 2019 +0000
@@ -112,8 +112,6 @@
 LIBSHELLMACH= $(TARGETMACH)
 LIBSHELLBASE=..
 
-include ../../Makefile.astmsg
-
 include ../../Makefile.lib
 
 # mapfile-vers does not live with the sources in in common/ to make
--- a/usr/src/lib/libsum/Makefile.com	Wed Jan 09 20:51:41 2019 +0000
+++ b/usr/src/lib/libsum/Makefile.com	Wed Jan 09 21:08:34 2019 +0000
@@ -32,8 +32,6 @@
 OBJECTS= \
 	sumlib.o
 
-include ../../Makefile.astmsg
-
 include ../../Makefile.lib
 
 # mapfile-vers does not live with the sources in in common/ to make
--- a/usr/src/pkg/manifests/consolidation-osnet-osnet-message-files.mf	Wed Jan 09 20:51:41 2019 +0000
+++ b/usr/src/pkg/manifests/consolidation-osnet-osnet-message-files.mf	Wed Jan 09 21:08:34 2019 +0000
@@ -280,11 +280,6 @@
 file path=usr/lib/locale/C/LC_MESSAGES/SUNW_OST_SYSOSPAM.po group=sys \
     mode=0644
 file path=usr/lib/locale/C/LC_MESSAGES/ZFS.po mode=0644
-file path=usr/lib/locale/C/LC_MESSAGES/libast group=sys mode=0644
-file path=usr/lib/locale/C/LC_MESSAGES/libcmd group=sys mode=0644
-file path=usr/lib/locale/C/LC_MESSAGES/libdll group=sys mode=0644
-file path=usr/lib/locale/C/LC_MESSAGES/libshell group=sys mode=0644
-file path=usr/lib/locale/C/LC_MESSAGES/libsum group=sys mode=0644
 file path=usr/lib/locale/C/LC_MESSAGES/mailx.help group=sys mode=0644
 file path=usr/lib/locale/C/LC_MESSAGES/priv_names group=sys mode=0644
 file path=usr/lib/locale/C/LC_MESSAGES/uxlibc.src group=sys mode=0644