[Glibc-bsd-commits] r5769 - trunk/kfreebsd-kernel-headers/debian

[stevenc-guest at alioth.debian.org]

Author: stevenc-guest
Date: 2015-09-04 23:58:15 +0000 (Fri, 04 Sep 2015)
New Revision: 5769

Modified:
   trunk/kfreebsd-kernel-headers/debian/changelog
   trunk/kfreebsd-kernel-headers/debian/rules
Log:
Install compatibility symlinks on kfreebsd-amd64 for -m32 multilib.
(Closes: #797324)


Modified: trunk/kfreebsd-kernel-headers/debian/changelog
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/changelog	2015-08-27 10:14:30 UTC (rev 5768)
+++ trunk/kfreebsd-kernel-headers/debian/changelog	2015-09-04 23:58:15 UTC (rev 5769)
@@ -3,6 +3,8 @@
   * Limit libc0.1-dev dependency to !nocheck profile.  (Thanks, Helmut
     Grohne).  (Closes: #796903)
   * Note new dependency on dh-exec.
+  * Install compatibility symlinks on kfreebsd-amd64 for -m32 multilib.
+    (Closes: #797324)
 
  -- Steven Chamberlain <steven at pyro.eu.org>  Tue, 25 Aug 2015 17:12:43 +0100
 

Modified: trunk/kfreebsd-kernel-headers/debian/rules
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/rules	2015-08-27 10:14:30 UTC (rev 5768)
+++ trunk/kfreebsd-kernel-headers/debian/rules	2015-09-04 23:58:15 UTC (rev 5769)
@@ -128,6 +128,14 @@
 		&& find . -type f -name "*.h" -exec cp --parents {} $(HEADERS_PACKAGE)/usr/include/$(DEB_HOST_MULTIARCH)/x86 \;
 endif
 
+ifneq ($(filter amd64, $(kfreebsd_cpu)),)
+	# Install compatibility symlinks for -m32 multilib (only on amd64).
+	mkdir -p $(HEADERS_PACKAGE)/usr/include/i386-kfreebsd-gnu
+	for i in x86 machine machine-i386 sys vm osreldate.h; do \
+		ln -sf /usr/include/$(DEB_HOST_MULTIARCH)/$$i $(HEADERS_PACKAGE)/usr/include/i386-kfreebsd-gnu/ ; \
+	done
+endif
+
 ifeq (,$(filter $(DEB_BUILD_OPTIONS),nocheck))
 	# headers must be tested after they're installed
 	$(MAKE) -C test