Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/share/mk make .pc files depend upon configure files if they ...



details:   https://anonhg.NetBSD.org/src/rev/ce844a13499a
branches:  trunk
changeset: 787196:ce844a13499a
user:      mrg <mrg%NetBSD.org@localhost>
date:      Wed Jun 05 23:14:13 2013 +0000

description:
make .pc files depend upon configure files if they exist.  this
will force them to be rebuilt when the version has changed.
this fixes one of the most often broken parts of update builds
after a version update.

diffstat:

 share/mk/bsd.x11.mk |  14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)

diffs (35 lines):

diff -r 698d26437459 -r ce844a13499a share/mk/bsd.x11.mk
--- a/share/mk/bsd.x11.mk       Wed Jun 05 23:12:37 2013 +0000
+++ b/share/mk/bsd.x11.mk       Wed Jun 05 23:14:13 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.x11.mk,v 1.107 2013/06/03 07:39:07 mrg Exp $
+#      $NetBSD: bsd.x11.mk,v 1.108 2013/06/05 23:14:13 mrg Exp $
 
 .include <bsd.init.mk>
 
@@ -229,7 +229,8 @@
 realall:       ${_PKGCONFIG_FILES:O:u}
 realinstall:   pkgconfig-install
 
-.for _pkg in ${PKGCONFIG:O:u}
+.for _pkg in ${PKGCONFIG:O:u}  # {
+
 PKGDIST.${_pkg}?=      ${X11SRCDIR.${PKGDIST:U${_pkg}}}
 _PKGDEST.${_pkg}=      ${DESTDIR}${X11USRLIBDIR}/pkgconfig/${_pkg}.pc
 
@@ -241,7 +242,14 @@
 
 ${_PKGDEST.${_pkg}}: ${_pkg}.pc __fileinstall
 pkgconfig-install: ${_PKGDEST.${_pkg}}
-.endfor
+
+# Add a dependancy on the configure file if it exists; this way we
+# will rebuild the .pc file if the version in configure changes.
+.if exists(${PKGDIST.${_pkg}}/configure)
+${_pkg}.pc: ${PKGDIST.${_pkg}}/configure
+.endif
+
+.endfor                                # }
 
 # XXX
 # The sed script is very, very ugly.  What we actually need is a



Home | Main Index | Thread Index | Old Index