Source: fontconfig
Version: 2.11.0-6.1
Tags: patch
User: helm...@debian.org
Usertags: rebootstrap

Even though fontconfig's build system tries to build edit-sgml with the
build arch compiler, it gets runes wrong and actually builds it with the
host arch compiler. The build fails when edit-sgml is executed.

The attached patch fixes the Makefile.am to actually build edit-sgml
with CC_FOR_BUILD as was intended.

Helmut
diff -Nru fontconfig-2.11.0/debian/changelog fontconfig-2.11.0/debian/changelog
--- fontconfig-2.11.0/debian/changelog
+++ fontconfig-2.11.0/debian/changelog
@@ -1,3 +1,10 @@
+fontconfig (2.11.0-6.2) UNRELEASED; urgency=low
+
+  * Non-maintainer upload.
+  * Compile build-tool edit-sgml with CC_FOR_BUILD. (Closes: #-1)
+
+ -- Helmut Grohne <hel...@subdivi.de>  Thu, 02 Oct 2014 07:35:05 +0200
+
 fontconfig (2.11.0-6.1) unstable; urgency=low
 
   * Non-maintainer upload to delayed.
diff -Nru fontconfig-2.11.0/debian/patches/06_cross.patch 
fontconfig-2.11.0/debian/patches/06_cross.patch
--- fontconfig-2.11.0/debian/patches/06_cross.patch
+++ fontconfig-2.11.0/debian/patches/06_cross.patch
@@ -0,0 +1,16 @@
+Index: fontconfig-2.11.0/doc/Makefile.am
+===================================================================
+--- fontconfig-2.11.0.orig/doc/Makefile.am
++++ fontconfig-2.11.0/doc/Makefile.am
+@@ -121,7 +121,10 @@
+ edit_sgml_SOURCES =   \
+       edit-sgml.c     \
+       $(NULL)
+-edit_sgml_CC = $(CC_FOR_BUILD)
++$(edit_sgml_OBJECTS) : CC=$(CC_FOR_BUILD)
++$(edit_sgml_OBJECTS) : CFLAGS=$(CFLAGS_FOR_BUILD)
++$(edit_sgml_OBJECTS) : CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
++edit_sgml_LINK = $(CC_FOR_BUILD) -o $@
+ #
+ check_SCRIPTS =                       \
+       check-missing-doc       \
diff -Nru fontconfig-2.11.0/debian/patches/series 
fontconfig-2.11.0/debian/patches/series
--- fontconfig-2.11.0/debian/patches/series
+++ fontconfig-2.11.0/debian/patches/series
@@ -3,3 +3,4 @@
 03_locale_c.utf8.patch
 04_mgopen_fonts.patch
 05_doc_files.patch
+06_cross.patch

Reply via email to