[Glibc-bsd-commits] r5244 - trunk/kfreebsd-11/debian

[rmh at alioth.debian.org]

Author: rmh
Date: 2013-12-17 23:15:48 +0000 (Tue, 17 Dec 2013)
New Revision: 5244

Modified:
   trunk/kfreebsd-11/debian/changelog
   trunk/kfreebsd-11/debian/control.in
   trunk/kfreebsd-11/debian/rules
Log:
Build and install linker.hints. (Closes: #684595)

Modified: trunk/kfreebsd-11/debian/changelog
===================================================================
--- trunk/kfreebsd-11/debian/changelog	2013-12-17 23:13:41 UTC (rev 5243)
+++ trunk/kfreebsd-11/debian/changelog	2013-12-17 23:15:48 UTC (rev 5244)
@@ -10,6 +10,7 @@
   * Remove the kludges that modify srcdir in build target. Use override
     variables instead when possible. This will allow sharing the srcdir
     later.
+  * Build and install linker.hints. (Closes: #684595)
 
  -- Robert Millan <rmh at debian.org>  Fri, 29 Nov 2013 14:05:10 +0100
 

Modified: trunk/kfreebsd-11/debian/control.in
===================================================================
--- trunk/kfreebsd-11/debian/control.in	2013-12-17 23:13:41 UTC (rev 5243)
+++ trunk/kfreebsd-11/debian/control.in	2013-12-17 23:15:48 UTC (rev 5244)
@@ -6,8 +6,7 @@
 Vcs-Browser: http://anonscm.debian.org/viewvc/glibc-bsd/trunk/kfreebsd-@major@/
 Vcs-Svn: svn://anonscm.debian.org/glibc-bsd/trunk/kfreebsd-@major@/
 Build-Depends: debhelper (>= 5.0.0), bzip2, sharutils, flex-old | flex,
-# for aicasm
- freebsd-buildutils (>= 10~svn258496-1~),
+ freebsd-buildutils (>= 10.0~svn259404-1),
  freebsd-glue (>= 0.1.5),
  byacc,
  @cc_pkg@, libdb-dev,

Modified: trunk/kfreebsd-11/debian/rules
===================================================================
--- trunk/kfreebsd-11/debian/rules	2013-12-17 23:13:41 UTC (rev 5243)
+++ trunk/kfreebsd-11/debian/rules	2013-12-17 23:15:48 UTC (rev 5244)
@@ -255,6 +255,10 @@
 		../../boot/modules/$(version)-$(abiname)-$* \
 		$(IMAGE_PACKAGE)-$*/lib/modules/$(version)-$(abiname)-$*
 
+	# Assert linker.hints presence (upstream build system silently skips it when
+	# it can't find kldxref).
+	test -e $(IMAGE_PACKAGE)-$*/lib/modules/$(version)-$(abiname)-$*/linker.hints
+
 	# remove loader.conf (part of kfreebsd-loader)
 	rm -f $(IMAGE_PACKAGE)-$*/boot/loader.conf
 	rm -rf $(IMAGE_PACKAGE)-$*/boot/defaults