17052472 pkg-config breaks sane-frontends build in 25
authorBrian Cameron <brian.cameron@oracle.com>
Mon, 08 Jul 2013 16:18:46 -0700
changeset 1381 15aec33b84fa
parent 1380 5f7d10f6436d
child 1382 3515c1afdfc8
17052472 pkg-config breaks sane-frontends build in 25 17052445 pkg-config man page is mostly empty in 25
components/pkg-config/Makefile
components/pkg-config/patches/0001-manpage.patch
--- a/components/pkg-config/Makefile	Mon Jul 08 07:15:06 2013 -0700
+++ b/components/pkg-config/Makefile	Mon Jul 08 16:18:46 2013 -0700
@@ -39,6 +39,9 @@
 include ../../make-rules/configure.mk
 include ../../make-rules/ips.mk
 
+# otherwise our default PKG_CONFIG_PATH will change to the 64-bit libdir
+CONFIGURE_LIBDIR.64 =   $(CONFIGURE_PREFIX)/lib
+
 CONFIGURE_OPTIONS += CFLAGS="$(CFLAGS)" 
 COMPONENT_TEST_ENV += PATH=/usr/gnu/bin:/usr/bin
 ASLR_MODE = $(ASLR_ENABLE)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/pkg-config/patches/0001-manpage.patch	Mon Jul 08 16:18:46 2013 -0700
@@ -0,0 +1,33 @@
+This patch fixes the manpage so it displays properly on Solaris.  Without this
+patch, the "mak pkg-config" command shows no output.
+--- pkg-config-0.23/pkg-config.1-orig	2013-07-08 01:48:06.890795558 -0500
++++ pkg-config-0.23/pkg-config.1	2013-07-08 01:50:15.263772090 -0500
[email protected]@ -2,27 +2,7 @@
+ .\" pkg-config manual page.
+ .\" (C) Red Hat, Inc. based on gnome-config man page (C) Miguel de Icaza ([email protected])
+ .\"
+-.
+-.\" Macros to disable groff line adjustment warnings that we can't easily
+-.\" fix in the text.
+-.ie \n(.g \{\
+-.  de DW
+-.    nr .oldwarn \n[.warn]
+-.    warn 0
+-.  .
+-.  de EW
+-.    warn \n[.oldwarn]
+-.  .
+-.\}
+-.el \
+-.\{ \
+-.  de DW
+-.  .
+-.  de EW
+-.  .
+-.\}
+-.
+-.TH pkg-config 1
++.TH pkg-config 1 "7 Jul 2013"
+ .SH NAME
+ pkg-config \- Return metainformation about installed libraries
+ .SH SYNOPSIS