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

[Robert Millan]

Author: rmh
Date: 2012-05-10 17:58:01 +0000 (Thu, 10 May 2012)
New Revision: 4259

Modified:
   trunk/kfreebsd-kernel-headers/debian/changelog
   trunk/kfreebsd-kernel-headers/debian/rules
Log:
Remove old Biarch support (for -m64) on i386. The rest of toolchain doesn't support it, and when it does it'll have to be with Multiarch anyway.

Modified: trunk/kfreebsd-kernel-headers/debian/changelog
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/changelog	2012-05-08 06:28:45 UTC (rev 4258)
+++ trunk/kfreebsd-kernel-headers/debian/changelog	2012-05-10 17:58:01 UTC (rev 4259)
@@ -2,8 +2,11 @@
 
   * Apply s/_SYS_QUEUE_H_/_FREEBSD_SYS_QUEUE_H_/g sed rule to avoid
     collision with GNU <sys/queue.h> header protection.
+  * Remove old Biarch support (for -m64) on i386. The rest of toolchain
+    doesn't support it, and when it does it'll have to be with Multiarch
+    anyway.
 
- -- Robert Millan <rmh at debian.org>  Fri, 27 Apr 2012 22:58:02 +0200
+ -- Robert Millan <rmh at debian.org>  Thu, 10 May 2012 19:57:38 +0200
 
 kfreebsd-kernel-headers (9.0-1) experimental; urgency=low
 

Modified: trunk/kfreebsd-kernel-headers/debian/rules
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/rules	2012-05-08 06:28:45 UTC (rev 4258)
+++ trunk/kfreebsd-kernel-headers/debian/rules	2012-05-10 17:58:01 UTC (rev 4259)
@@ -97,18 +97,21 @@
 	dh_installdirs
 	dh_install --sourcedir=$(CURDIR)
 
-ifneq ($(filter i386 amd64, $(kfreebsd_cpu)),)
+ifneq ($(filter amd64, $(kfreebsd_cpu)),)
 	sh debian/generate-asm.sh $(kfreebsd_cpu) $(CURDIR)/sys $(HEADERS_PACKAGE)/usr/include
-	# Install "x86" directory (only on i386 and amd64).
-	mkdir -p $(HEADERS_PACKAGE)/usr/include/x86
-	cd $(CURDIR)/sys/x86/include \
-		&& find . -type f -name "*.h" -exec cp --parents {} $(HEADERS_PACKAGE)/usr/include/x86 \;
 else
 	mkdir -p $(HEADERS_PACKAGE)/usr/include/machine
 	cd $(CURDIR)/sys/$(kfreebsd_cpu)/include \
 		&& find . -type f -name "*.h" -exec cp --parents {} $(HEADERS_PACKAGE)/usr/include/machine \;
 endif
 
+ifneq ($(filter i386 amd64, $(kfreebsd_cpu)),)
+	# Install "x86" directory (only on i386 and amd64).
+	mkdir -p $(HEADERS_PACKAGE)/usr/include/x86
+	cd $(CURDIR)/sys/x86/include \
+		&& find . -type f -name "*.h" -exec cp --parents {} $(HEADERS_PACKAGE)/usr/include/x86 \;
+endif
+
 	# headers must be tested after they're installed
 	$(MAKE) -C test