package/fontconfig/host-tools.patch

   1 --- fontconfig-2.4.2/fc-lang/Makefile.am.orig   2007-06-24 07:02:54.000000000 +0200
   2 +++ fontconfig-2.4.2/fc-lang/Makefile.am        2007-06-24 07:05:14.000000000 +0200
   3 @@ -23,10 +23,16 @@
   4  #
   5
   6  CC = @CC_FOR_BUILD@
   7 +LD = @CC_FOR_BUILD@
   8 +AM_CPPFLAGS =
   9 +AM_CFLAGS = @CFLAGS_FOR_BUILD@
  10 +AM_LDFLAGS = @LDFLAGS_FOR_BUILD@
  11  EXEEXT = @EXEEXT_FOR_BUILD@
  12 -LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
  13 +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
  14 +       $(AM_CFLAGS)
  15 +LINK = $(LD) $(AM_CFLAGS) $(AM_LDFLAGS) -o $@
  16
  17 -INCLUDES=-I${top_srcdir}/src -I${top_srcdir} $(FREETYPE_CFLAGS) $(WARN_CFLAGS)
  18 +INCLUDES=-I${top_srcdir}/src -I${top_srcdir} $(WARN_CFLAGS)
  19
  20  TMPL=fclang.tmpl.h
  21  STMPL=${top_srcdir}/fc-lang/fclang.tmpl.h
  22 --- fontconfig-2.4.2/fc-case/Makefile.am.orig   2007-06-24 07:02:54.000000000 +0200
  23 +++ fontconfig-2.4.2/fc-case/Makefile.am        2007-06-24 07:05:14.000000000 +0200
  24 @@ -23,10 +23,16 @@
  25  #
  26
  27  CC = @CC_FOR_BUILD@
  28 +LD = @CC_FOR_BUILD@
  29 +AM_CPPFLAGS =
  30 +AM_CFLAGS = @CFLAGS_FOR_BUILD@
  31 +AM_LDFLAGS = @LDFLAGS_FOR_BUILD@
  32  EXEEXT = @EXEEXT_FOR_BUILD@
  33 -LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
  34 +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
  35 +       $(AM_CFLAGS)
  36 +LINK = $(LD) $(AM_CFLAGS) $(AM_LDFLAGS) -o $@
  37
  38 -INCLUDES=-I${top_srcdir}/src -I${top_srcdir} $(FREETYPE_CFLAGS) $(WARN_CFLAGS)
  39 +INCLUDES=-I${top_srcdir}/src -I${top_srcdir} $(WARN_CFLAGS)
  40
  41  TMPL=fccase.tmpl.h
  42  STMPL=${top_srcdir}/fc-case/${TMPL}
  43 --- fontconfig-2.4.2/fc-glyphname/Makefile.am.orig      2007-06-24 07:02:54.000000000 +0200
  44 +++ fontconfig-2.4.2/fc-glyphname/Makefile.am   2007-06-24 07:05:14.000000000 +0200
  45 @@ -23,10 +23,16 @@
  46  #
  47
  48  CC = @CC_FOR_BUILD@
  49 +LD = @CC_FOR_BUILD@
  50 +AM_CPPFLAGS =
  51 +AM_CFLAGS = @CFLAGS_FOR_BUILD@
  52 +AM_LDFLAGS = @LDFLAGS_FOR_BUILD@
  53  EXEEXT = @EXEEXT_FOR_BUILD@
  54 -LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
  55 +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
  56 +       $(AM_CFLAGS)
  57 +LINK = $(LD) $(AM_CFLAGS) $(AM_LDFLAGS) -o $@
  58
  59 -INCLUDES=-I${top_srcdir}/src -I${top_srcdir} $(FREETYPE_CFLAGS) $(WARN_CFLAGS)
  60 +INCLUDES=-I${top_srcdir}/src -I${top_srcdir} $(WARN_CFLAGS)
  61
  62  TMPL=fcglyphname.tmpl.h
  63  STMPL=${top_srcdir}/fc-glyphname/${TMPL}
  64 --- fontconfig-2.4.2/configure.in.orig  2007-06-24 07:02:54.000000000 +0200
  65 +++ fontconfig-2.4.2/configure.in       2007-06-24 07:02:59.000000000 +0200
  66 @@ -101,6 +101,8 @@
  67  AC_MSG_CHECKING([for a C compiler for build tools])
  68  if test $cross_compiling = yes; then
  69    AC_CHECK_PROGS(CC_FOR_BUILD, gcc cc)
  70 +  AC_SUBST(CFLAGS_FOR_BUILD)
  71 +  AC_SUBST(LDFLAGS_FOR_BUILD)
  72  else
  73    CC_FOR_BUILD=$CC
  74  fi
  75 --- fontconfig-2.4.2/fc-arch/Makefile.am.orig   2007-06-24 07:02:54.000000000 +0200
  76 +++ fontconfig-2.4.2/fc-arch/Makefile.am        2007-06-24 07:05:14.000000000 +0200
  77 @@ -23,10 +23,16 @@
  78  #
  79
  80  CC = @CC_FOR_BUILD@
  81 +LD = @CC_FOR_BUILD@
  82 +AM_CPPFLAGS =
  83 +AM_CFLAGS = @CFLAGS_FOR_BUILD@
  84 +AM_LDFLAGS = @LDFLAGS_FOR_BUILD@
  85  EXEEXT = @EXEEXT_FOR_BUILD@
  86 -LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
  87 +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
  88 +       $(AM_CFLAGS)
  89 +LINK = $(LD) $(AM_CFLAGS) $(AM_LDFLAGS) -o $@
  90
  91 -INCLUDES=-I${top_srcdir}/src -I${top_srcdir} $(FREETYPE_CFLAGS) $(WARN_CFLAGS)
  92 +INCLUDES=-I${top_srcdir}/src -I${top_srcdir} $(WARN_CFLAGS)
  93
  94  TMPL=fcarch.tmpl.h
  95  STMPL=${top_srcdir}/fc-arch/fcarch.tmpl.h