22568631 /usr/lib/pkgconfig/autoopts.pc is 64-bit
authorRich Burridge <rich.burridge@oracle.com>
Wed, 20 Jan 2016 10:50:52 -0800
changeset 5299 a301501de846
parent 5298 2de3b6013893
child 5301 668f8ba776f1
22568631 /usr/lib/pkgconfig/autoopts.pc is 64-bit
components/autogen/autogen.p5m
components/autogen/patches/autoopts-mk-autoopts-pc.in.patch
--- a/components/autogen/autogen.p5m	Wed Jan 20 16:41:39 2016 +0000
+++ b/components/autogen/autogen.p5m	Wed Jan 20 10:50:52 2016 -0800
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -35,6 +35,7 @@
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid value=PSARC/2008/315 value=PSARC/2012/367
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+link path=usr/bin/$(MACH64)/autogen target=../autogen
 file path=usr/bin/$(MACH64)/autoopts-config
 file usr/bin/$(MACH64)/autogen path=usr/bin/autogen
 file path=usr/bin/autoopts-config
@@ -47,11 +48,13 @@
 link path=usr/lib/$(MACH64)/libopts.so target=libopts.so.25.11.5
 link path=usr/lib/$(MACH64)/libopts.so.25 target=libopts.so.25.11.5
 file path=usr/lib/$(MACH64)/libopts.so.25.11.5
+file $(MACH64)/autoopts/pkgconfig/autoopts.pc \
+    path=usr/lib/$(MACH64)/pkgconfig/autoopts.pc
 file path=usr/lib/libopts.a
 link path=usr/lib/libopts.so target=libopts.so.25.11.5
 link path=usr/lib/libopts.so.25 target=libopts.so.25.11.5
 file path=usr/lib/libopts.so.25.11.5
-file usr/share/pkgconfig/autoopts.pc path=usr/lib/pkgconfig/autoopts.pc
+file $(MACH32)/autoopts/pkgconfig/autoopts.pc path=usr/lib/pkgconfig/autoopts.pc
 file path=usr/share/aclocal/autoopts.m4
 file path=usr/share/autogen/aginfo.tpl
 file path=usr/share/autogen/aginfo3.tpl
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/autogen/patches/autoopts-mk-autoopts-pc.in.patch	Wed Jan 20 10:50:52 2016 -0800
@@ -0,0 +1,15 @@
+Fix the generation of the 64-bit /usr/lib/64/pkgconfig/autoopts.pc
+for Solaris based on changes to .../autoopts/mk-autoopts-pc.in already
+present upstream.
+
+--- autogen-5.16.2/autoopts/mk-autoopts-pc.in.orig	2016-01-19 16:17:03.319088249 -0800
++++ autogen-5.16.2/autoopts/mk-autoopts-pc.in	2016-01-19 16:17:23.599671581 -0800
[email protected]@ -31,7 +31,7 @@
+       cflags="-I${includedir}"
+ test '[email protected][email protected]' = Xno && static_libs=''
+ case "${libdir}" in
+-/lib | /lib64 | /usr/lib | /usr/lib64 )
++/lib | /lib64 | /usr/lib | /usr/lib64 | /usr/lib/* )
+     ldopts=''
+     ldflags=-lopts
+     ;;