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

Bug#451293: xorg: mass bug filing for cross build support



Package: xorg
Version: 7.3+3
Severity: wishlist
Tags: patch
User: codehelp@debian.org
Usertags: crossbuilt

--- Please enter the report below this line. ---

As part of the long term mass bug filing for cross building support,
(http://lists.debian.org/debian-devel/2007/11/msg00116.html), I've
prepared this patch for debian/rules.

The cross building support in Debian has been recently rewritten -
particularly in respect of how environment variables and overrides are
handled - so this patch is now needed to allow xorg to correctly
identify the cross compiler.

--- xorg-7.3+3/debian/rules 
+++ xorg.new/debian/rules 
@@ -11,6 +11,14 @@
 # Licensed under the GNU General Public License, version 2.  See the file
 # /usr/share/common-licenses/GPL or <http://www.gnu.org/copyleft/gpl.txt>.
 # Acknowledgements to Stephen Early, Mark Eichin, and Manoj Srivastava.
+
+DEB_HOST_GNU_TYPE=$(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE=$(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
+CC=$(DEB_HOST_GNU_TYPE)-gcc
+else
+CC ?=gcc
+endif
 
 # debhelper
 export DH_OPTIONS


--- System information. ---
Architecture: amd64
Kernel:       Linux 2.6.22-2-amd64

Debian Release: lenny/sid
  500 unstable        www.linux.codehelp.co.uk 
  500 unstable        www.emdebian.org 
  500 unstable        ftp.uk.debian.org 

--- Package information. ---
Depends                      (Version) | Installed
======================================-+-===============
xserver-xorg                           | 1:7.3+3
libgl1-mesa-glx                        | 7.0.2-1
libgl1-mesa-dri                        | 
libglu1-mesa                           | 7.0.2-1
xfonts-base             (>= 1:1.0.0-1) | 1:1.0.0-5
xfonts-100dpi           (>= 1:1.0.0-1) | 1:1.0.0-4
xfonts-75dpi            (>= 1:1.0.0-1) | 1:1.0.0-4
xfonts-scalable         (>= 1:1.0.0-1) | 1:1.0.0-6
xbase-clients           (>= 1:1.0.1-1) | 1:7.3+3
xutils                  (>= 1:1.0.1-1) | 1:7.3+3
xkb-data                               | 1.0~cvs.20070916-1
xterm                                  | 229-1
 OR x-terminal-emulator                | 
sparc-utils                            | 
 OR not+sparc                          | 

-- 


Neil Williams
=============
http://www.data-freedom.org/
http://www.nosoftwarepatents.com/
http://www.linux.codehelp.co.uk/

Attachment: pgpIeKG3j3SwB.pgp
Description: PGP signature


Reply to: