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

r6839 - in glibc-package/trunk/debian: . sysdeps



Author: aurel32
Date: 2015-12-24 16:52:56 +0000 (Thu, 24 Dec 2015)
New Revision: 6839

Modified:
   glibc-package/trunk/debian/changelog
   glibc-package/trunk/debian/sysdeps/kfreebsd.mk
Log:
sysdeps/kfreebsd.mk: test if the header directory exists before
trying to link directories from there. Fixes FTBFS on GNU/kFreeBSD.

Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog	2015-12-23 09:43:56 UTC (rev 6838)
+++ glibc-package/trunk/debian/changelog	2015-12-24 16:52:56 UTC (rev 6839)
@@ -1,3 +1,11 @@
+glibc (2.21-6) UNRELEASED; urgency=medium
+
+  [ Aurelien Jarno ]
+  * sysdeps/kfreebsd.mk: test if the header directory exists before
+    trying to link directories from there. Fixes FTBFS on GNU/kFreeBSD.
+
+ -- Aurelien Jarno <aurel32@debian.org>  Thu, 24 Dec 2015 17:51:01 +0100
+
 glibc (2.21-5) unstable; urgency=medium
 
   [ Samuel Thibault ]

Modified: glibc-package/trunk/debian/sysdeps/kfreebsd.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/kfreebsd.mk	2015-12-23 09:43:56 UTC (rev 6838)
+++ glibc-package/trunk/debian/sysdeps/kfreebsd.mk	2015-12-24 16:52:56 UTC (rev 6839)
@@ -43,12 +43,16 @@
 
 	mkdir -p debian/include/sys
 	# Link to any headers found in the old locations first
-	find $(KFREEBSD_HEADERS)/sys -mindepth 1 \
-		-exec ln -sf '{}' debian/include/sys ';'
+	if test -d $(KFREEBSD_HEADERS) ; then \
+	    find $(KFREEBSD_HEADERS)/sys -mindepth 1 \
+		-exec ln -sf '{}' debian/include/sys ';' ; \
+	fi
 	# Link to any headers found at the new multiarch location,
 	# replacing any existing links
-	find $(KFREEBSD_ARCH_HEADERS)/sys -mindepth 1 \
-		-exec ln -sf '{}' debian/include/sys ';'
+	if test -d $(KFREEBSD_ARCH_HEADERS) ; then \
+	    find $(KFREEBSD_ARCH_HEADERS)/sys -mindepth 1 \
+		-exec ln -sf '{}' debian/include/sys ';' ; \
+	fi
 
 	# To make configure happy if libc0.1-dev is not installed.
 	touch debian/include/assert.h


Reply to: