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

[rmh at alioth.debian.org]

Author: rmh
Date: 2013-06-20 00:10:24 +0000 (Thu, 20 Jun 2013)
New Revision: 4545

Removed:
   trunk/kfreebsd-kernel-headers/debian/generate-asm.sh
Modified:
   trunk/kfreebsd-kernel-headers/debian/changelog
   trunk/kfreebsd-kernel-headers/debian/control
   trunk/kfreebsd-kernel-headers/debian/rules
Log:
Adapt to Multiarch-style include paths.

Modified: trunk/kfreebsd-kernel-headers/debian/changelog
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/changelog	2013-06-19 23:51:09 UTC (rev 4544)
+++ trunk/kfreebsd-kernel-headers/debian/changelog	2013-06-20 00:10:24 UTC (rev 4545)
@@ -4,8 +4,9 @@
     <sys/param.h>).
   * test/termios_collision.c: New testcase, checks for termios
     collisions (see previous fix in rev 4460 / bug #700027).
+  * Adapt to Multiarch-style include paths.
 
- -- Robert Millan <rmh at debian.org>  Tue, 18 Jun 2013 21:06:59 +0200
+ -- Robert Millan <rmh at debian.org>  Thu, 20 Jun 2013 02:09:52 +0200
 
 kfreebsd-kernel-headers (0.84) unstable; urgency=low
 

Modified: trunk/kfreebsd-kernel-headers/debian/control
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/control	2013-06-19 23:51:09 UTC (rev 4544)
+++ trunk/kfreebsd-kernel-headers/debian/control	2013-06-20 00:10:24 UTC (rev 4545)
@@ -5,7 +5,8 @@
 Uploaders: Aurelien Jarno <aurel32 at debian.org>,
  Guillem Jover <guillem at debian.org>,
  Robert Millan <rmh at debian.org>
-Build-Depends: debhelper (>= 7), quilt, kfreebsd-source-9.0
+Build-Depends: debhelper (>= 7), quilt, kfreebsd-source-9.0,
+ dpkg-dev (>= 1.16.0~),
 Vcs-Browser: http://anonscm.debian.org/viewvc/glibc-bsd/trunk/kfreebsd-kernel-headers/
 Vcs-Svn: svn://anonscm.debian.org/glibc-bsd/trunk/kfreebsd-kernel-headers/
 Standards-Version: 3.9.4

Deleted: trunk/kfreebsd-kernel-headers/debian/generate-asm.sh
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/generate-asm.sh	2013-06-19 23:51:09 UTC (rev 4544)
+++ trunk/kfreebsd-kernel-headers/debian/generate-asm.sh	2013-06-20 00:10:24 UTC (rev 4545)
@@ -1,91 +0,0 @@
-#!/bin/sh -e
-
-# Idea borrowed from RedHat's kernel package
-
-arch="$1"
-dir_in="$2"
-dir_out="$3"
-
-if [ ! -d "$dir_in" ] ; then
-	echo "$dir_in" does not exist, or is not a directory
-	exit 1
-fi
-
-case "$arch" in
-	amd64)
-		define_biarch="#ifdef __i386__"
-		arch="amd64"
-		biarch="i386"
-		;;
-	i386)
-		define_biarch="#ifdef __x86_64__"
-		arch="i386"
-		biarch="amd64"
-		;;
-	*)
-		echo Invalid architecture >&2
-		exit 1
-esac
-
-machine_dir="$arch/include"
-machine_dir_biarch="$biarch/include"
-
-# The directory to create in /usr/include. 
-machine_dir_out="machine-$arch"
-machine_dir_out_biarch="machine-$biarch"
-
-if [ ! -d "$dir_in/$machine_dir" ] || [ ! -d "$dir_in/$machine_dir_biarch" ] ; then
-	echo E: $machine_dir and $machine_dir_biarch must exist, or you will have problems
-	exit 1
-fi
-
-mkdir -p $dir_out/machine
-cp -a $dir_in/$machine_dir $dir_out/$machine_dir_out
-cp -a $dir_in/$machine_dir_biarch $dir_out/$machine_dir_out_biarch
-
-dirs=$( (( cd "$dir_in/$machine_dir"; find . -type d ); ( cd "$dir_in/$machine_dir_biarch"; find . -type d )) | sort -u )
-files=$( (( cd "$dir_in/$machine_dir"; find . -name "*.h" -type f ); ( cd "$dir_in/$machine_dir_biarch"; find . -name "*.h" -type f )) | sed 's/^.\///g' | sort -u )
-
-for h in $dirs; do
-	mkdir -p "$dir_out/machine/$h"
-done
-
-for h in $files; do
-	name=$(echo $h | tr a-z. A-Z_)
-	file_out="$dir_out/machine/$h"
-	# common header
-	cat > $file_out << EOF
-/* All machine/ files are generated and point to the corresponding
- * file in $machine_dir_out or $machine_dir_out_biarch.
- */
-
-EOF
-
-	if [ -f $dir_in/$machine_dir/$h ] && [ -f $dir_in/$machine_dir_biarch/$h ]; then
-		cat >> $file_out <<EOF
-$define_biarch
-# include <$machine_dir_out_biarch/$h>
-#else
-# include <$machine_dir_out/$h>
-#endif
-EOF
-
-	elif [ -f $dir_in/$machine_dir/$h ]; then
-		cat >> $file_out <<EOF
-$define_biarch
-# error This header is not available for $biarch
-#else
-# include <$machine_dir_out/$h>
-#endif
-EOF
-	else
-		cat >> $file_out <<EOF
-$define_biarch
-# include <$machine_dir_out_biarch/$h>
-#else
-# error This header is not available for $arch
-#endif
-EOF
-	fi
-
-done

Modified: trunk/kfreebsd-kernel-headers/debian/rules
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/rules	2013-06-19 23:51:09 UTC (rev 4544)
+++ trunk/kfreebsd-kernel-headers/debian/rules	2013-06-20 00:10:24 UTC (rev 4545)
@@ -100,12 +100,14 @@
 	dh_installdirs
 	dh_install --sourcedir=$(CURDIR)
 
-ifneq ($(filter amd64, $(kfreebsd_cpu)),)
-	sh debian/generate-asm.sh $(kfreebsd_cpu) $(CURDIR)/sys $(HEADERS_PACKAGE)/usr/include
-else
-	mkdir -p $(HEADERS_PACKAGE)/usr/include/machine
+	mkdir -p $(HEADERS_PACKAGE)/usr/include/$(DEB_HOST_MULTIARCH)/machine
 	cd $(CURDIR)/sys/$(kfreebsd_cpu)/include \
-		&& find . -type f -name "*.h" -exec cp --parents {} $(HEADERS_PACKAGE)/usr/include/machine \;
+		&& find . -type f -name "*.h" -exec cp --parents {} $(HEADERS_PACKAGE)/usr/include/$(DEB_HOST_MULTIARCH)/machine \;
+
+ifeq ($(kfreebsd_cpu), amd64)
+	mkdir -p $(HEADERS_PACKAGE)/usr/include/i386-kfreebsd-gnu/machine
+	cd $(CURDIR)/sys/i386/include \
+		&& find . -type f -name "*.h" -exec cp --parents {} $(HEADERS_PACKAGE)/usr/include/i386-kfreebsd-gnu/machine \;
 endif
 
 ifneq ($(filter i386 amd64, $(kfreebsd_cpu)),)