[Glibc-bsd-commits] r3491 - in trunk/freebsd-buildutils/debian: . patches

[Robert Millan]

Author: rmh
Date: 2011-06-26 23:50:25 +0000 (Sun, 26 Jun 2011)
New Revision: 3491

Modified:
   trunk/freebsd-buildutils/debian/changelog
   trunk/freebsd-buildutils/debian/patches/18_fix_sysdir.diff
Log:
18_fix_sysdir.diff: Bring back search in relative paths (removing it breaks kfreebsd builds).

Modified: trunk/freebsd-buildutils/debian/changelog
===================================================================
--- trunk/freebsd-buildutils/debian/changelog	2011-06-26 16:05:57 UTC (rev 3490)
+++ trunk/freebsd-buildutils/debian/changelog	2011-06-26 23:50:25 UTC (rev 3491)
@@ -1,3 +1,10 @@
+freebsd-buildutils (8.2-3) UNRELEASED; urgency=low
+
+  * 18_fix_sysdir.diff: Bring back search in relative paths (removing it
+    breaks kfreebsd builds).
+
+ -- Robert Millan <rmh at debian.org>  Mon, 27 Jun 2011 00:29:42 +0200
+
 freebsd-buildutils (8.2-2) unstable; urgency=low
 
   * 18_fix_sysdir.diff: Fix SYSDIR path to make kernel modules buildable.

Modified: trunk/freebsd-buildutils/debian/patches/18_fix_sysdir.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/18_fix_sysdir.diff	2011-06-26 16:05:57 UTC (rev 3490)
+++ trunk/freebsd-buildutils/debian/patches/18_fix_sysdir.diff	2011-06-26 23:50:25 UTC (rev 3491)
@@ -1,22 +1,21 @@
 --- a/src/share/mk/bsd.kmod.mk
 +++ b/src/share/mk/bsd.kmod.mk
-@@ -1,15 +1,10 @@
+@@ -1,15 +1,17 @@
  # $FreeBSD$
  
--# Search for kernel source tree in standard places.
--.for _dir in ${.CURDIR}/../.. ${.CURDIR}/../../.. ${.CURDIR}/../../../.. \
++KVER!=		uname -r
++
+ # Search for kernel source tree in standard places.
+ .for _dir in ${.CURDIR}/../.. ${.CURDIR}/../../.. ${.CURDIR}/../../../.. \
 -    ${.CURDIR}/../../../../.. /sys /usr/src/sys
--.if !defined(SYSDIR) && exists(${_dir}/kern/) && exists(${_dir}/conf/kmod.mk)
--SYSDIR=	${_dir}
--.endif
--.endfor
--.if !defined(SYSDIR) || !exists(${SYSDIR}/kern/) || \
--    !exists(${SYSDIR}/conf/kmod.mk)
++    ${.CURDIR}/../../../../.. /usr/src/kfreebsd-headers-${KVER}/sys
+ .if !defined(SYSDIR) && exists(${_dir}/kern/) && exists(${_dir}/conf/kmod.mk)
+ SYSDIR=	${_dir}
+ .endif
+ .endfor
+ .if !defined(SYSDIR) || !exists(${SYSDIR}/kern/) || \
+     !exists(${SYSDIR}/conf/kmod.mk)
 -.error "can't find kernel source tree"
-+KVER!=	uname -r
-+SYSDIR=	/usr/src/kfreebsd-headers-${KVER}/sys
-+
-+.if !exists(${SYSDIR}/kern/) || !exists(${SYSDIR}/conf/kmod.mk)
 +.error "can't find kernel headers, install kfreebsd-headers-${KVER} package"
  .endif