r849 - in /unstable/x264/debian: changelog patches/20_use-deb-host-gnu-type.patch patches/series rules

[lool at users.alioth.debian.org]

Author: lool
Date: Sun Aug 12 09:53:47 2007
New Revision: 849

URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=849
Log:
* Pass DEB_HOST_GNU_TYPE to configure; the proper fix would be to add
  support for --build, but this requires larger refactoring.

Added:
    unstable/x264/debian/patches/20_use-deb-host-gnu-type.patch
Modified:
    unstable/x264/debian/changelog
    unstable/x264/debian/patches/series
    unstable/x264/debian/rules

Modified: unstable/x264/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/x264/debian/changelog?rev=849&op=diff
==============================================================================
--- unstable/x264/debian/changelog (original)
+++ unstable/x264/debian/changelog Sun Aug 12 09:53:47 2007
@@ -3,8 +3,10 @@
   * Cleanup rules.
   * Pass --quiltrc /dev/null to quilt.
   * get-orig-source implementaiton; thanks Kilian Krause.
+  * Pass DEB_HOST_GNU_TYPE to configure; the proper fix would be to add
+    support for --build, but this requires larger refactoring.
 
- -- Loic Minier <lool at dooz.org>  Sun, 12 Aug 2007 11:15:42 +0200
+ -- Loic Minier <lool at dooz.org>  Sun, 12 Aug 2007 11:48:36 +0200
 
 x264 (0.svn20070309-4) unstable; urgency=low
 

Added: unstable/x264/debian/patches/20_use-deb-host-gnu-type.patch
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/x264/debian/patches/20_use-deb-host-gnu-type.patch?rev=849&op=file
==============================================================================
--- unstable/x264/debian/patches/20_use-deb-host-gnu-type.patch (added)
+++ unstable/x264/debian/patches/20_use-deb-host-gnu-type.patch Sun Aug 12 09:53:47 2007
@@ -1,0 +1,18 @@
+Use $DEB_HOST_GNU_TYPE instead of ./config.guess if it's set; should really
+be a --build argument, but this requires some larger refactoring.
+
+--- x264-0.svn20070309.orig/configure	2007-08-12 11:46:20.000000000 +0200
++++ x264-0.svn20070309/configure	2007-08-12 11:48:22.000000000 +0200
+@@ -76,7 +76,11 @@
+   exit 1
+ fi
+ 
+-MACHINE="$(./config.guess)"
++if [ -n "$DEB_HOST_GNU_TYPE" ]; then
++    MACHINE="$DEB_HOST_GNU_TYPE"
++else
++    MACHINE="$(./config.guess)"
++fi
+ 
+ case "${MACHINE#*-*-}" in
+   beos*)

Modified: unstable/x264/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/x264/debian/patches/series?rev=849&op=diff
==============================================================================
--- unstable/x264/debian/patches/series (original)
+++ unstable/x264/debian/patches/series Sun Aug 12 09:53:47 2007
@@ -1,2 +1,3 @@
 005_link_with_shared_lib.diff
 010_altivec_crash.diff -p0
+20_use-deb-host-gnu-type.patch

Modified: unstable/x264/debian/rules
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/x264/debian/rules?rev=849&op=diff
==============================================================================
--- unstable/x264/debian/rules (original)
+++ unstable/x264/debian/rules Sun Aug 12 09:53:47 2007
@@ -2,6 +2,7 @@
 
 # This has to be exported to make some magic below work.
 export DH_OPTIONS
+export DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 
 confflags := \
 	--enable-debug \