Package: fontconfig
Version: 2.4.91-1
Severity: wishlist
Tags: patch
User: [EMAIL PROTECTED]
Usertags: crossbuilt

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

(I was struggling with this all through DebConf7 but the fault lay
elsewhere and now that the rewritten cross-build tools have
migrated into testing, I can finally let you know the result.)

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.

fontconfig merely needs a value passed to --with-arch for ./configure
when cross compiling and this patch ensures that the value is only set
for a crossbuild. The rewritten cross building tools do the rest by
providing correct support for CC_FOR_BUILD.

Thanks.

--- fontconfig-2.4.91/debian/rules 
+++ fontconfig.new/debian/rules 
@@ -9,7 +9,15 @@
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/class/autotools.mk
 
-DEB_CONFIGURE_EXTRA_FLAGS := --disable-docs 
--with-add-fonts=/usr/X11R6/lib/X11/fonts,/usr/local/share/fonts
+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))
+WITHARCH=--with-arch=$(DEB_HOST_GNU_TYPE)
+else
+WITHARCH=
+endif
+
+DEB_CONFIGURE_EXTRA_FLAGS := $(WITHARCH) --disable-docs 
--with-add-fonts=/usr/X11R6/lib/X11/fonts,/usr/local/share/fonts
 
 # tight versioning
 DEB_DH_MAKESHLIBS_ARGS_libfontconfig1 := -V"libfontconfig1 (>= 2.4.0)" 
--add-udeb="fontconfig-udeb"


--- 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
===========================================-+-======================
libc6                          (>= 2.6.1-1) | 2.6.1-6
libexpat1                       (>= 1.95.8) | 1.95.8-4
libfontconfig1                   (>= 2.4.0) | 2.4.91-1
libfreetype6                     (>= 2.3.5) | 2.3.5-1+b1
zlib1g                (>= 1:1.2.3.3.dfsg-1) | 1:1.2.3.3.dfsg-7
defoma                           (>= 0.7.0) | 0.11.10-0.1
fontconfig-config                           | 2.4.91-1


-- 


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

Attachment: pgpzeCq7GvbDR.pgp
Description: PGP signature

Reply via email to