# HG changeset patch
# User Rich Burridge <rich.burridge@oracle.com>
# Date 1328888830 28800
# Node ID c613b3449c36f40cb193ca510fff0ebaa63dba47
# Parent  c6e4f94fd35d5a131e54f7a15967a6f01bc4826e
7079363 gcc-3.p5m package manifest file shouldn't deliver .la files
7143056 Userland consolidation should remove .la files and warn/error against new ones

diff -r c6e4f94fd35d -r c613b3449c36 components/autogen/autogen.p5m
--- a/components/autogen/autogen.p5m	Fri Feb 10 06:32:53 2012 -0800
+++ b/components/autogen/autogen.p5m	Fri Feb 10 07:47:10 2012 -0800
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -55,10 +55,8 @@
 file path=usr/include/autoopts/options.h
 file path=usr/include/autoopts/usage-txt.h
 file path=usr/lib/libguileopts.a
-file path=usr/lib/libguileopts.la
 file path=usr/lib/libguileopts.so.0.0.1
 file path=usr/lib/libopts.a
-file path=usr/lib/libopts.la
 file path=usr/lib/libopts.so.25.3.0
 file path=usr/lib/pkgconfig/autoopts.pc
 file path=usr/share/aclocal/autoopts.m4
diff -r c6e4f94fd35d -r c613b3449c36 components/gcc3/gcc-3.p5m
--- a/components/gcc3/gcc-3.p5m	Fri Feb 10 06:32:53 2012 -0800
+++ b/components/gcc3/gcc-3.p5m	Fri Feb 10 07:47:10 2012 -0800
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr/.*/man/.* -> default mangler.man.stability volatile >
@@ -329,14 +329,10 @@
 file path=usr/sfw/include/c++/3.4.3/vector
 file path=usr/sfw/lib/$(MACH64)/libfrtbegin.a
 file path=usr/sfw/lib/$(MACH64)/libg2c.a
-file path=usr/sfw/lib/$(MACH64)/libg2c.la
 file path=usr/sfw/lib/$(MACH64)/libiberty.a
 file path=usr/sfw/lib/$(MACH64)/libobjc.a
-file path=usr/sfw/lib/$(MACH64)/libobjc.la
 file path=usr/sfw/lib/$(MACH64)/libstdc++.a
-file path=usr/sfw/lib/$(MACH64)/libstdc++.la
 file path=usr/sfw/lib/$(MACH64)/libsupc++.a
-file path=usr/sfw/lib/$(MACH64)/libsupc++.la
 file path=usr/sfw/lib/gcc/$(GNU_ARCH)/3.4.3/$(MACH64)/crt1.o variant.arch=sparc
 file path=usr/sfw/lib/gcc/$(GNU_ARCH)/3.4.3/$(MACH64)/crtbegin.o
 file path=usr/sfw/lib/gcc/$(GNU_ARCH)/3.4.3/$(MACH64)/crtend.o
@@ -397,14 +393,10 @@
 file path=usr/sfw/lib/gcc/$(GNU_ARCH)/3.4.3/specs
 file path=usr/sfw/lib/libfrtbegin.a
 file path=usr/sfw/lib/libg2c.a
-file path=usr/sfw/lib/libg2c.la
 file path=usr/sfw/lib/libiberty.a
 file path=usr/sfw/lib/libobjc.a
-file path=usr/sfw/lib/libobjc.la
 file path=usr/sfw/lib/libstdc++.a
-file path=usr/sfw/lib/libstdc++.la
 file path=usr/sfw/lib/libsupc++.a
-file path=usr/sfw/lib/libsupc++.la
 file path=usr/sfw/lib/locale/be/LC_MESSAGES/gcc.mo
 file path=usr/sfw/lib/locale/ca/LC_MESSAGES/gcc.mo
 file path=usr/sfw/lib/locale/da/LC_MESSAGES/gcc.mo
diff -r c6e4f94fd35d -r c613b3449c36 components/gcc45/gcc-45.p5m
--- a/components/gcc45/gcc-45.p5m	Fri Feb 10 06:32:53 2012 -0800
+++ b/components/gcc45/gcc-45.p5m	Fri Feb 10 07:47:10 2012 -0800
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -985,20 +985,13 @@
 file path=usr/gcc/4.5/include/c++/$(COMPONENT_VERSION)/valarray
 file path=usr/gcc/4.5/include/c++/$(COMPONENT_VERSION)/vector
 file path=usr/gcc/4.5/lib/$(MACH64)/libgfortran.a
-file path=usr/gcc/4.5/lib/$(MACH64)/libgfortran.la
 file path=usr/gcc/4.5/lib/$(MACH64)/libgomp.a
-file path=usr/gcc/4.5/lib/$(MACH64)/libgomp.la
 file path=usr/gcc/4.5/lib/$(MACH64)/libgomp.spec
 file path=usr/gcc/4.5/lib/$(MACH64)/libobjc.a
-file path=usr/gcc/4.5/lib/$(MACH64)/libobjc.la
 file path=usr/gcc/4.5/lib/$(MACH64)/libssp.a
-file path=usr/gcc/4.5/lib/$(MACH64)/libssp.la
 file path=usr/gcc/4.5/lib/$(MACH64)/libssp_nonshared.a
-file path=usr/gcc/4.5/lib/$(MACH64)/libssp_nonshared.la
 file path=usr/gcc/4.5/lib/$(MACH64)/libstdc++.a
-file path=usr/gcc/4.5/lib/$(MACH64)/libstdc++.la
 file path=usr/gcc/4.5/lib/$(MACH64)/libsupc++.a
-file path=usr/gcc/4.5/lib/$(MACH64)/libsupc++.la
 file \
     path=usr/gcc/4.5/lib/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/$(MACH64)/crt1.o \
     variant.arch=sparc
@@ -1029,8 +1022,6 @@
 file \
     path=usr/gcc/4.5/lib/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/$(MACH64)/libgfortranbegin.a
 file \
-    path=usr/gcc/4.5/lib/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/$(MACH64)/libgfortranbegin.la
-file \
     path=usr/gcc/4.5/lib/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/cc1 mode=0555
 file \
     path=usr/gcc/4.5/lib/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/cc1obj mode=0555
@@ -1206,8 +1197,6 @@
 file \
     path=usr/gcc/4.5/lib/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/libgfortranbegin.a
 file \
-    path=usr/gcc/4.5/lib/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/libgfortranbegin.la
-file \
     path=usr/gcc/4.5/lib/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/lto-wrapper mode=0555
 file \
     path=usr/gcc/4.5/lib/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/lto1 mode=0555
@@ -1480,20 +1469,13 @@
 file \
     path=usr/gcc/4.5/lib/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/plugin/include/version.h
 file path=usr/gcc/4.5/lib/libgfortran.a
-file path=usr/gcc/4.5/lib/libgfortran.la
 file path=usr/gcc/4.5/lib/libgomp.a
-file path=usr/gcc/4.5/lib/libgomp.la
 file path=usr/gcc/4.5/lib/libgomp.spec
 file path=usr/gcc/4.5/lib/libobjc.a
-file path=usr/gcc/4.5/lib/libobjc.la
 file path=usr/gcc/4.5/lib/libssp.a
-file path=usr/gcc/4.5/lib/libssp.la
 file path=usr/gcc/4.5/lib/libssp_nonshared.a
-file path=usr/gcc/4.5/lib/libssp_nonshared.la
 file path=usr/gcc/4.5/lib/libstdc++.a
-file path=usr/gcc/4.5/lib/libstdc++.la
 file path=usr/gcc/4.5/lib/libsupc++.a
-file path=usr/gcc/4.5/lib/libsupc++.la
 
 file path=usr/gcc/4.5/share/info/cpp.info
 file path=usr/gcc/4.5/share/info/cppinternals.info
diff -r c6e4f94fd35d -r c613b3449c36 components/ghostscript/ghostscript.p5m
--- a/components/ghostscript/ghostscript.p5m	Fri Feb 10 06:32:53 2012 -0800
+++ b/components/ghostscript/ghostscript.p5m	Fri Feb 10 07:47:10 2012 -0800
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 <transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
 
@@ -114,7 +114,6 @@
 file path=usr/lib/cups/filter/pstoraster mode=0555
 file path=usr/lib/libgs.so.$(COMPONENT_VERSION)
 file path=usr/lib/libijs.a
-file path=usr/lib/libijs.la
 file path=usr/lib/pkgconfig/ijs.pc
 file path=usr/share/cups/model/pxlcolor.ppd
 file path=usr/share/cups/model/pxlmono.ppd
diff -r c6e4f94fd35d -r c613b3449c36 components/graphviz/Makefile
--- a/components/graphviz/Makefile	Fri Feb 10 06:32:53 2012 -0800
+++ b/components/graphviz/Makefile	Fri Feb 10 07:47:10 2012 -0800
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 
 include ../../make-rules/shared-macros.mk
@@ -37,8 +37,6 @@
 include ../../make-rules/configure.mk
 include ../../make-rules/ips.mk
 
-PKGMOGRIFY_TRANSFORMS +=	$(WS_TOP)/transforms/libtool-drop
-
 PATH =		/usr/bin:/usr/gnu/bin:/usr/php/5.2/bin
 
 # GMP header files for the guile extension (no --with- flag)
diff -r c6e4f94fd35d -r c613b3449c36 components/guile/guile.p5m
--- a/components/guile/guile.p5m	Fri Feb 10 06:32:53 2012 -0800
+++ b/components/guile/guile.p5m	Fri Feb 10 07:47:10 2012 -0800
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr/share/guile/.+/scripts/.+$ -> default mode 0555>
@@ -177,29 +177,17 @@
 file path=usr/include/libguile/version.h
 file path=usr/include/libguile/vports.h
 file path=usr/include/libguile/weaks.h
-file path=usr/lib/$(MACH64)/libguile-srfi-srfi-1-v-3.la
 file path=usr/lib/$(MACH64)/libguile-srfi-srfi-1-v-3.so.3.0.1
-file path=usr/lib/$(MACH64)/libguile-srfi-srfi-13-14-v-3.la
 file path=usr/lib/$(MACH64)/libguile-srfi-srfi-13-14-v-3.so.3.0.1
-file path=usr/lib/$(MACH64)/libguile-srfi-srfi-4-v-3.la
 file path=usr/lib/$(MACH64)/libguile-srfi-srfi-4-v-3.so.3.0.1
-file path=usr/lib/$(MACH64)/libguile-srfi-srfi-60-v-2.la
 file path=usr/lib/$(MACH64)/libguile-srfi-srfi-60-v-2.so.2.0.2
-file path=usr/lib/$(MACH64)/libguile.la
 file path=usr/lib/$(MACH64)/libguile.so.17.1.2
-file path=usr/lib/$(MACH64)/libguilereadline-v-17.la
 file path=usr/lib/$(MACH64)/libguilereadline-v-17.so.17.0.3
-file path=usr/lib/libguile-srfi-srfi-1-v-3.la
 file path=usr/lib/libguile-srfi-srfi-1-v-3.so.3.0.1
-file path=usr/lib/libguile-srfi-srfi-13-14-v-3.la
 file path=usr/lib/libguile-srfi-srfi-13-14-v-3.so.3.0.1
-file path=usr/lib/libguile-srfi-srfi-4-v-3.la
 file path=usr/lib/libguile-srfi-srfi-4-v-3.so.3.0.1
-file path=usr/lib/libguile-srfi-srfi-60-v-2.la
 file path=usr/lib/libguile-srfi-srfi-60-v-2.so.2.0.2
-file path=usr/lib/libguile.la
 file path=usr/lib/libguile.so.17.1.2
-file path=usr/lib/libguilereadline-v-17.la
 file path=usr/lib/libguilereadline-v-17.so.17.0.3
 file path=usr/share/aclocal/guile.m4
 file path=usr/share/guile/1.8/guile-procedures.txt
diff -r c6e4f94fd35d -r c613b3449c36 make-rules/ips.mk
--- a/make-rules/ips.mk	Fri Feb 10 06:32:53 2012 -0800
+++ b/make-rules/ips.mk	Fri Feb 10 07:47:10 2012 -0800
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -49,6 +49,8 @@
 # order is important
 GENERATE_TRANSFORMS +=		$(WS_TOP)/transforms/generate-cleanup
 
+PKGMOGRIFY_TRANSFORMS +=	$(WS_TOP)/transforms/libtool-drop
+
 COMPARISON_TRANSFORMS +=	$(WS_TOP)/transforms/comparison-cleanup
 COMPARISON_TRANSFORMS +=	$(PKGMOGRIFY_TRANSFORMS)