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

Re: glibc 2.21-5 ftbfs



Hi,

Aurelien Jarno wrote:
> On 2015-12-23 17:30, Samuel Thibault wrote:
> > So it looks like there are no /usr/include/sys files any more in the
> > kernel headers?  If so we can just drop the statement.  If you want to
> 
> It seems it has been changed in the last kfreebsd-kernel-headers upload.

Sorry, my fault for not noticing this.  In kfreebsd-amd64 builds,
/usr/include/sys still exists because of gcc-multilib.

> That said, I don't think we can just drop this entry as this would
> likely breaks the cross-compilation case.

I think so, yes.

> > keep backward compatibility, we can also make the statement failure
> > non-fatal.
> 
> Likely either that, or a check if the directory exists before running
> the command.

A patch for this is attached.

Thank you,
Regards,
-- 
Steven Chamberlain
steven@pyro.eu.org
--- a/debian/sysdeps/kfreebsd.mk	2015-09-09 15:01:41.000000000 +0000
+++ b/debian/sysdeps/kfreebsd.mk	2015-12-25 01:59:01.355433000 +0000
@@ -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)/sys ; 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)/sys ; 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

Attachment: signature.asc
Description: Digital signature


Reply to: