Bug#425445: libx11-6: fails to cross-build. tries to run cross-built makekeys utility

Julien Cristau Sun, 12 Aug 2007 14:32:59 -0700

On Sun, Aug 12, 2007 at 22:15:15 +0100, Neil Williams wrote:

> On Sun, 12 Aug 2007 22:58:48 +0200
> Julien Cristau <[EMAIL PROTECTED]> wrote:
> > The override command is gnu make specific, so that's not a good
> > solution.
> 
> Which is preferable:
> 1. Require GNU make to cross-build, or
> 2. Hardcode gcc into a series of *manual* make rules in src/utils/
> 3. find a different way to generate the makekeys output
> ?
> 
Whatever can be accepted upstream.  Which means that 1 is not an option.


> I could envisage a method in this part of debian/rules:
> 
> ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
>       confflags += --build=$(DEB_HOST_GNU_TYPE)
> else
>       confflags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
>       # add emdebian patch to quilt here
> endif
> 
> Presumably, quilt can be used to add 023_gnu_cross.diff (renamed to
> indicate cross-building only and reliance on GNU make?) to the patch
> series only if cross-building? (I don't use quilt much.)
> 
> This way, the override command would only be used if cross-building the
> Debian package so we can be fairly sure that GNU make is being used.
> Certainly, Emdebian will be using GNU make.
> 
> OK, it means the patch can't go upstream but if debian/rules can
> arrange to add the patch (via quilt) only when cross-building, I'd be
> happy with that.
> 
I'm not really interested in a patch which can't go upstream.

Does the attached debdiff fix your build (on top of experimental's
2:1.1.3-1)?

Thanks,
Julien

diff -u libx11-1.1.3/Makefile.in libx11-1.1.3/Makefile.in
--- libx11-1.1.3/Makefile.in
+++ libx11-1.1.3/Makefile.in
@@ -100,6 +100,7 @@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
diff -u libx11-1.1.3/configure libx11-1.1.3/configure
--- libx11-1.1.3/configure
+++ libx11-1.1.3/configure
@@ -874,6 +874,7 @@
 FFLAGS
 ac_ct_F77
 LIBTOOL
+CC_FOR_BUILD
 RAWCPP
 RAWCPPFLAGS
 XCB_TRUE
@@ -4463,7 +4464,7 @@
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 4466 "configure"' > conftest.$ac_ext
+  echo '#line 4467 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -7205,11 +7206,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7208: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7209: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7212: \$? = $ac_status" >&5
+   echo "$as_me:7213: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -7495,11 +7496,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7498: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7499: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7502: \$? = $ac_status" >&5
+   echo "$as_me:7503: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -7599,11 +7600,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7602: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7603: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:7606: \$? = $ac_status" >&5
+   echo "$as_me:7607: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -9961,7 +9962,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 9964 "configure"
+#line 9965 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10061,7 +10062,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 10064 "configure"
+#line 10065 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12481,11 +12482,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:12484: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:12485: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:12488: \$? = $ac_status" >&5
+   echo "$as_me:12489: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -12585,11 +12586,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:12588: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:12589: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:12592: \$? = $ac_status" >&5
+   echo "$as_me:12593: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -14162,11 +14163,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14165: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14166: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:14169: \$? = $ac_status" >&5
+   echo "$as_me:14170: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -14266,11 +14267,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14269: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14270: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:14273: \$? = $ac_status" >&5
+   echo "$as_me:14274: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -16466,11 +16467,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16469: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16470: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:16473: \$? = $ac_status" >&5
+   echo "$as_me:16474: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -16756,11 +16757,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16759: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16760: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:16763: \$? = $ac_status" >&5
+   echo "$as_me:16764: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -16860,11 +16861,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16863: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16864: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:16867: \$? = $ac_status" >&5
+   echo "$as_me:16868: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -20310,6 +20311,54 @@
 
 
 
+if test x"$cross_compiling" = xyes; then
+       for ac_prog in gcc cc
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with 
args.
+set dummy $ac_prog; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_CC_FOR_BUILD+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$CC_FOR_BUILD"; then
+  ac_cv_prog_CC_FOR_BUILD="$CC_FOR_BUILD" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x 
"$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_CC_FOR_BUILD="$ac_prog"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+CC_FOR_BUILD=$ac_cv_prog_CC_FOR_BUILD
+if test -n "$CC_FOR_BUILD"; then
+  { echo "$as_me:$LINENO: result: $CC_FOR_BUILD" >&5
+echo "${ECHO_T}$CC_FOR_BUILD" >&6; }
+else
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+  test -n "$CC_FOR_BUILD" && break
+done
+
+else
+       CC_FOR_BUILD="$CC"
+fi
+
+
 
 
 for ac_prog in cpp
@@ -25342,6 +25391,7 @@
 FFLAGS!$FFLAGS$ac_delim
 ac_ct_F77!$ac_ct_F77$ac_delim
 LIBTOOL!$LIBTOOL$ac_delim
+CC_FOR_BUILD!$CC_FOR_BUILD$ac_delim
 RAWCPP!$RAWCPP$ac_delim
 RAWCPPFLAGS!$RAWCPPFLAGS$ac_delim
 XCB_TRUE!$XCB_TRUE$ac_delim
@@ -25415,7 +25465,7 @@
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 79; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 80; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff -u libx11-1.1.3/include/Makefile.in libx11-1.1.3/include/Makefile.in
--- libx11-1.1.3/include/Makefile.in
+++ libx11-1.1.3/include/Makefile.in
@@ -79,6 +79,7 @@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
diff -u libx11-1.1.3/debian/changelog libx11-1.1.3/debian/changelog
--- libx11-1.1.3/debian/changelog
+++ libx11-1.1.3/debian/changelog
@@ -1,3 +1,12 @@
+libx11 (2:1.1.3-2) UNRELEASED; urgency=low
+
+  * Fix cross-build:
+    add patch 016_fix_cross_compiling.diff, and pass
+    --enable-malloc0returnsnull=yes to configure when cross-compiling
+    (closes: #425445).  Thanks, Neil Williams!
+
+ -- Julien Cristau <[EMAIL PROTECTED]>  Sun, 12 Aug 2007 17:46:49 +0200
+
 libx11 (2:1.1.3-1) experimental; urgency=low
 
   [ Julien Cristau ]
diff -u libx11-1.1.3/debian/patches/series libx11-1.1.3/debian/patches/series
--- libx11-1.1.3/debian/patches/series
+++ libx11-1.1.3/debian/patches/series
@@ -11,0 +12 @@
+016_fix_cross_compiling.diff
diff -u libx11-1.1.3/debian/rules libx11-1.1.3/debian/rules
--- libx11-1.1.3/debian/rules
+++ libx11-1.1.3/debian/rules
@@ -38,7 +38,9 @@
 ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
        confflags += --build=$(DEB_HOST_GNU_TYPE)
 else
-       confflags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
+       confflags += --build=$(DEB_BUILD_GNU_TYPE) \
+                    --host=$(DEB_HOST_GNU_TYPE) \
+                    --enable-malloc0returnsnull=yes
 endif
 
 confflags += --enable-man-pages=3
diff -u libx11-1.1.3/man/xkb/Makefile.in libx11-1.1.3/man/xkb/Makefile.in
--- libx11-1.1.3/man/xkb/Makefile.in
+++ libx11-1.1.3/man/xkb/Makefile.in
@@ -78,6 +78,7 @@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
diff -u libx11-1.1.3/man/Makefile.in libx11-1.1.3/man/Makefile.in
--- libx11-1.1.3/man/Makefile.in
+++ libx11-1.1.3/man/Makefile.in
@@ -90,6 +90,7 @@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
diff -u libx11-1.1.3/modules/Makefile.in libx11-1.1.3/modules/Makefile.in
--- libx11-1.1.3/modules/Makefile.in
+++ libx11-1.1.3/modules/Makefile.in
@@ -72,6 +72,7 @@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
diff -u libx11-1.1.3/modules/im/Makefile.in libx11-1.1.3/modules/im/Makefile.in
--- libx11-1.1.3/modules/im/Makefile.in
+++ libx11-1.1.3/modules/im/Makefile.in
@@ -72,6 +72,7 @@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
diff -u libx11-1.1.3/modules/im/ximcp/Makefile.in 
libx11-1.1.3/modules/im/ximcp/Makefile.in
--- libx11-1.1.3/modules/im/ximcp/Makefile.in
+++ libx11-1.1.3/modules/im/ximcp/Makefile.in
@@ -108,6 +108,7 @@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
diff -u libx11-1.1.3/modules/lc/Makefile.in libx11-1.1.3/modules/lc/Makefile.in
--- libx11-1.1.3/modules/lc/Makefile.in
+++ libx11-1.1.3/modules/lc/Makefile.in
@@ -72,6 +72,7 @@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
diff -u libx11-1.1.3/modules/lc/Utf8/Makefile.in 
libx11-1.1.3/modules/lc/Utf8/Makefile.in
--- libx11-1.1.3/modules/lc/Utf8/Makefile.in
+++ libx11-1.1.3/modules/lc/Utf8/Makefile.in
@@ -99,6 +99,7 @@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
diff -u libx11-1.1.3/modules/lc/def/Makefile.in 
libx11-1.1.3/modules/lc/def/Makefile.in
--- libx11-1.1.3/modules/lc/def/Makefile.in
+++ libx11-1.1.3/modules/lc/def/Makefile.in
@@ -98,6 +98,7 @@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
diff -u libx11-1.1.3/modules/lc/gen/Makefile.in 
libx11-1.1.3/modules/lc/gen/Makefile.in
--- libx11-1.1.3/modules/lc/gen/Makefile.in
+++ libx11-1.1.3/modules/lc/gen/Makefile.in
@@ -98,6 +98,7 @@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
diff -u libx11-1.1.3/modules/lc/xlocale/Makefile.in 
libx11-1.1.3/modules/lc/xlocale/Makefile.in
--- libx11-1.1.3/modules/lc/xlocale/Makefile.in
+++ libx11-1.1.3/modules/lc/xlocale/Makefile.in
@@ -98,6 +98,7 @@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
diff -u libx11-1.1.3/modules/om/Makefile.in libx11-1.1.3/modules/om/Makefile.in
--- libx11-1.1.3/modules/om/Makefile.in
+++ libx11-1.1.3/modules/om/Makefile.in
@@ -72,6 +72,7 @@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
diff -u libx11-1.1.3/modules/om/generic/Makefile.in 
libx11-1.1.3/modules/om/generic/Makefile.in
--- libx11-1.1.3/modules/om/generic/Makefile.in
+++ libx11-1.1.3/modules/om/generic/Makefile.in
@@ -101,6 +101,7 @@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
diff -u libx11-1.1.3/nls/C/Makefile.in libx11-1.1.3/nls/C/Makefile.in
--- libx11-1.1.3/nls/C/Makefile.in
+++ libx11-1.1.3/nls/C/Makefile.in
@@ -78,6 +78,7 @@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
diff -u libx11-1.1.3/nls/Makefile.in libx11-1.1.3/nls/Makefile.in
--- libx11-1.1.3/nls/Makefile.in
+++ libx11-1.1.3/nls/Makefile.in
@@ -87,6 +87,7 @@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
diff -u libx11-1.1.3/nls/armscii-8/Makefile.in 
libx11-1.1.3/nls/armscii-8/Makefile.in
--- libx11-1.1.3/nls/armscii-8/Makefile.in
+++ libx11-1.1.3/nls/armscii-8/Makefile.in
@@ -78,6 +78,7 @@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
diff -u libx11-1.1.3/nls/el_GR.UTF-8/Makefile.in 
libx11-1.1.3/nls/el_GR.UTF-8/Makefile.in
--- libx11-1.1.3/nls/el_GR.UTF-8/Makefile.in
+++ libx11-1.1.3/nls/el_GR.UTF-8/Makefile.in
@@ -78,6 +78,7 @@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
diff -u libx11-1.1.3/nls/en_US.UTF-8/Makefile.in 
libx11-1.1.3/nls/en_US.UTF-8/Makefile.in
--- libx11-1.1.3/nls/en_US.UTF-8/Makefile.in
+++ libx11-1.1.3/nls/en_US.UTF-8/Makefile.in
@@ -78,6 +78,7 @@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
diff -u libx11-1.1.3/nls/georgian-academy/Makefile.in 
libx11-1.1.3/nls/georgian-academy/Makefile.in
--- libx11-1.1.3/nls/georgian-academy/Makefile.in
+++ libx11-1.1.3/nls/georgian-academy/Makefile.in
@@ -78,6 +78,7 @@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
diff -u libx11-1.1.3/nls/georgian-ps/Makefile.in 
libx11-1.1.3/nls/georgian-ps/Makefile.in
--- libx11-1.1.3/nls/georgian-ps/Makefile.in
+++ libx11-1.1.3/nls/georgian-ps/Makefile.in
@@ -78,6 +78,7 @@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
diff -u libx11-1.1.3/nls/ibm-cp1133/Makefile.in 
libx11-1.1.3/nls/ibm-cp1133/Makefile.in
--- libx11-1.1.3/nls/ibm-cp1133/Makefile.in
+++ libx11-1.1.3/nls/ibm-cp1133/Makefile.in
@@ -78,6 +78,7 @@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
diff -u libx11-1.1.3/nls/iscii-dev/Makefile.in 
libx11-1.1.3/nls/iscii-dev/Makefile.in
--- libx11-1.1.3/nls/iscii-dev/Makefile.in
+++ libx11-1.1.3/nls/iscii-dev/Makefile.in
@@ -78,6 +78,7 @@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
diff -u libx11-1.1.3/nls/isiri-3342/Makefile.in 
libx11-1.1.3/nls/isiri-3342/Makefile.in
--- libx11-1.1.3/nls/isiri-3342/Makefile.in
+++ libx11-1.1.3/nls/isiri-3342/Makefile.in
@@ -78,6 +78,7 @@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
diff -u libx11-1.1.3/nls/iso8859-1/Makefile.in 
libx11-1.1.3/nls/iso8859-1/Makefile.in
--- libx11-1.1.3/nls/iso8859-1/Makefile.in
+++ libx11-1.1.3/nls/iso8859-1/Makefile.in
@@ -78,6 +78,7 @@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
diff -u libx11-1.1.3/nls/iso8859-10/Makefile.in 
libx11-1.1.3/nls/iso8859-10/Makefile.in
--- libx11-1.1.3/nls/iso8859-10/Makefile.in
+++ libx11-1.1.3/nls/iso8859-10/Makefile.in
@@ -78,6 +78,7 @@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
diff -u libx11-1.1.3/nls/iso8859-11/Makefile.in 
libx11-1.1.3/nls/iso8859-11/Makefile.in
--- libx11-1.1.3/nls/iso8859-11/Makefile.in
+++ libx11-1.1.3/nls/iso8859-11/Makefile.in
@@ -78,6 +78,7 @@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
diff -u libx11-1.1.3/nls/iso8859-13/Makefile.in 
libx11-1.1.3/nls/iso8859-13/Makefile.in
--- libx11-1.1.3/nls/iso8859-13/Makefile.in
+++ libx11-1.1.3/nls/iso8859-13/Makefile.in
@@ -78,6 +78,7 @@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
diff -u libx11-1.1.3/nls/iso8859-14/Makefile.in 
libx11-1.1.3/nls/iso8859-14/Makefile.in
--- libx11-1.1.3/nls/iso8859-14/Makefile.in
+++ libx11-1.1.3/nls/iso8859-14/Makefile.in
@@ -78,6 +78,7 @@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
diff -u libx11-1.1.3/nls/iso8859-15/Makefile.in 
libx11-1.1.3/nls/iso8859-15/Makefile.in
--- libx11-1.1.3/nls/iso8859-15/Makefile.in
+++ libx11-1.1.3/nls/iso8859-15/Makefile.in
@@ -78,6 +78,7 @@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
diff -u libx11-1.1.3/nls/iso8859-2/Makefile.in 
libx11-1.1.3/nls/iso8859-2/Makefile.in
--- libx11-1.1.3/nls/iso8859-2/Makefile.in
+++ libx11-1.1.3/nls/iso8859-2/Makefile.in
@@ -78,6 +78,7 @@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
diff -u libx11-1.1.3/nls/iso8859-3/Makefile.in 
libx11-1.1.3/nls/iso8859-3/Makefile.in
--- libx11-1.1.3/nls/iso8859-3/Makefile.in
+++ libx11-1.1.3/nls/iso8859-3/Makefile.in
@@ -78,6 +78,7 @@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
diff -u libx11-1.1.3/nls/iso8859-4/Makefile.in 
libx11-1.1.3/nls/iso8859-4/Makefile.in
--- libx11-1.1.3/nls/iso8859-4/Makefile.in
+++ libx11-1.1.3/nls/iso8859-4/Makefile.in
@@ -78,6 +78,7 @@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
diff -u libx11-1.1.3/nls/iso8859-5/Makefile.in 
libx11-1.1.3/nls/iso8859-5/Makefile.in
--- libx11-1.1.3/nls/iso8859-5/Makefile.in
+++ libx11-1.1.3/nls/iso8859-5/Makefile.in
@@ -78,6 +78,7 @@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
diff -u libx11-1.1.3/nls/iso8859-6/Makefile.in 
libx11-1.1.3/nls/iso8859-6/Makefile.in
--- libx11-1.1.3/nls/iso8859-6/Makefile.in
+++ libx11-1.1.3/nls/iso8859-6/Makefile.in
@@ -78,6 +78,7 @@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
diff -u libx11-1.1.3/nls/iso8859-7/Makefile.in 
libx11-1.1.3/nls/iso8859-7/Makefile.in
--- libx11-1.1.3/nls/iso8859-7/Makefile.in
+++ libx11-1.1.3/nls/iso8859-7/Makefile.in
@@ -78,6 +78,7 @@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
diff -u libx11-1.1.3/nls/iso8859-8/Makefile.in 
libx11-1.1.3/nls/iso8859-8/Makefile.in
--- libx11-1.1.3/nls/iso8859-8/Makefile.in
+++ libx11-1.1.3/nls/iso8859-8/Makefile.in
@@ -78,6 +78,7 @@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
diff -u libx11-1.1.3/nls/iso8859-9/Makefile.in 
libx11-1.1.3/nls/iso8859-9/Makefile.in
--- libx11-1.1.3/nls/iso8859-9/Makefile.in
+++ libx11-1.1.3/nls/iso8859-9/Makefile.in
@@ -78,6 +78,7 @@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
diff -u libx11-1.1.3/nls/iso8859-9e/Makefile.in 
libx11-1.1.3/nls/iso8859-9e/Makefile.in
--- libx11-1.1.3/nls/iso8859-9e/Makefile.in
+++ libx11-1.1.3/nls/iso8859-9e/Makefile.in
@@ -78,6 +78,7 @@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
diff -u libx11-1.1.3/nls/ja.JIS/Makefile.in libx11-1.1.3/nls/ja.JIS/Makefile.in
--- libx11-1.1.3/nls/ja.JIS/Makefile.in
+++ libx11-1.1.3/nls/ja.JIS/Makefile.in
@@ -78,6 +78,7 @@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
diff -u libx11-1.1.3/nls/ja.S90/Makefile.in libx11-1.1.3/nls/ja.S90/Makefile.in
--- libx11-1.1.3/nls/ja.S90/Makefile.in
+++ libx11-1.1.3/nls/ja.S90/Makefile.in
@@ -78,6 +78,7 @@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
diff -u libx11-1.1.3/nls/ja.SJIS/Makefile.in 
libx11-1.1.3/nls/ja.SJIS/Makefile.in
--- libx11-1.1.3/nls/ja.SJIS/Makefile.in
+++ libx11-1.1.3/nls/ja.SJIS/Makefile.in
@@ -78,6 +78,7 @@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
diff -u libx11-1.1.3/nls/ja.U90/Makefile.in libx11-1.1.3/nls/ja.U90/Makefile.in
--- libx11-1.1.3/nls/ja.U90/Makefile.in
+++ libx11-1.1.3/nls/ja.U90/Makefile.in
@@ -78,6 +78,7 @@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
diff -u libx11-1.1.3/nls/ja/Makefile.in libx11-1.1.3/nls/ja/Makefile.in
--- libx11-1.1.3/nls/ja/Makefile.in
+++ libx11-1.1.3/nls/ja/Makefile.in
@@ -78,6 +78,7 @@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
diff -u libx11-1.1.3/nls/ja_JP.UTF-8/Makefile.in 
libx11-1.1.3/nls/ja_JP.UTF-8/Makefile.in
--- libx11-1.1.3/nls/ja_JP.UTF-8/Makefile.in
+++ libx11-1.1.3/nls/ja_JP.UTF-8/Makefile.in
@@ -78,6 +78,7 @@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
diff -u libx11-1.1.3/nls/ko/Makefile.in libx11-1.1.3/nls/ko/Makefile.in
--- libx11-1.1.3/nls/ko/Makefile.in
+++ libx11-1.1.3/nls/ko/Makefile.in
@@ -78,6 +78,7 @@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
diff -u libx11-1.1.3/nls/ko_KR.UTF-8/Makefile.in 
libx11-1.1.3/nls/ko_KR.UTF-8/Makefile.in
--- libx11-1.1.3/nls/ko_KR.UTF-8/Makefile.in
+++ libx11-1.1.3/nls/ko_KR.UTF-8/Makefile.in
@@ -78,6 +78,7 @@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
diff -u libx11-1.1.3/nls/koi8-c/Makefile.in libx11-1.1.3/nls/koi8-c/Makefile.in
--- libx11-1.1.3/nls/koi8-c/Makefile.in
+++ libx11-1.1.3/nls/koi8-c/Makefile.in
@@ -78,6 +78,7 @@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
diff -u libx11-1.1.3/nls/koi8-r/Makefile.in libx11-1.1.3/nls/koi8-r/Makefile.in
--- libx11-1.1.3/nls/koi8-r/Makefile.in
+++ libx11-1.1.3/nls/koi8-r/Makefile.in
@@ -78,6 +78,7 @@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
diff -u libx11-1.1.3/nls/koi8-u/Makefile.in libx11-1.1.3/nls/koi8-u/Makefile.in
--- libx11-1.1.3/nls/koi8-u/Makefile.in
+++ libx11-1.1.3/nls/koi8-u/Makefile.in
@@ -78,6 +78,7 @@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
diff -u libx11-1.1.3/nls/microsoft-cp1251/Makefile.in 
libx11-1.1.3/nls/microsoft-cp1251/Makefile.in
--- libx11-1.1.3/nls/microsoft-cp1251/Makefile.in
+++ libx11-1.1.3/nls/microsoft-cp1251/Makefile.in
@@ -78,6 +78,7 @@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
diff -u libx11-1.1.3/nls/microsoft-cp1255/Makefile.in 
libx11-1.1.3/nls/microsoft-cp1255/Makefile.in
--- libx11-1.1.3/nls/microsoft-cp1255/Makefile.in
+++ libx11-1.1.3/nls/microsoft-cp1255/Makefile.in
@@ -78,6 +78,7 @@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
diff -u libx11-1.1.3/nls/microsoft-cp1256/Makefile.in 
libx11-1.1.3/nls/microsoft-cp1256/Makefile.in
--- libx11-1.1.3/nls/microsoft-cp1256/Makefile.in
+++ libx11-1.1.3/nls/microsoft-cp1256/Makefile.in
@@ -78,6 +78,7 @@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
diff -u libx11-1.1.3/nls/mulelao-1/Makefile.in 
libx11-1.1.3/nls/mulelao-1/Makefile.in
--- libx11-1.1.3/nls/mulelao-1/Makefile.in
+++ libx11-1.1.3/nls/mulelao-1/Makefile.in
@@ -78,6 +78,7 @@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
diff -u libx11-1.1.3/nls/nokhchi-1/Makefile.in 
libx11-1.1.3/nls/nokhchi-1/Makefile.in
--- libx11-1.1.3/nls/nokhchi-1/Makefile.in
+++ libx11-1.1.3/nls/nokhchi-1/Makefile.in
@@ -78,6 +78,7 @@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
diff -u libx11-1.1.3/nls/pt_BR.UTF-8/Makefile.in 
libx11-1.1.3/nls/pt_BR.UTF-8/Makefile.in
--- libx11-1.1.3/nls/pt_BR.UTF-8/Makefile.in
+++ libx11-1.1.3/nls/pt_BR.UTF-8/Makefile.in
@@ -78,6 +78,7 @@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
diff -u libx11-1.1.3/nls/ru_RU.UTF-8/Makefile.in 
libx11-1.1.3/nls/ru_RU.UTF-8/Makefile.in
--- libx11-1.1.3/nls/ru_RU.UTF-8/Makefile.in
+++ libx11-1.1.3/nls/ru_RU.UTF-8/Makefile.in
@@ -78,6 +78,7 @@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
diff -u libx11-1.1.3/nls/tatar-cyr/Makefile.in 
libx11-1.1.3/nls/tatar-cyr/Makefile.in
--- libx11-1.1.3/nls/tatar-cyr/Makefile.in
+++ libx11-1.1.3/nls/tatar-cyr/Makefile.in
@@ -78,6 +78,7 @@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
diff -u libx11-1.1.3/nls/th_TH.UTF-8/Makefile.in 
libx11-1.1.3/nls/th_TH.UTF-8/Makefile.in
--- libx11-1.1.3/nls/th_TH.UTF-8/Makefile.in
+++ libx11-1.1.3/nls/th_TH.UTF-8/Makefile.in
@@ -78,6 +78,7 @@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
diff -u libx11-1.1.3/nls/th_TH/Makefile.in libx11-1.1.3/nls/th_TH/Makefile.in
--- libx11-1.1.3/nls/th_TH/Makefile.in
+++ libx11-1.1.3/nls/th_TH/Makefile.in
@@ -78,6 +78,7 @@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
diff -u libx11-1.1.3/nls/tscii-0/Makefile.in 
libx11-1.1.3/nls/tscii-0/Makefile.in
--- libx11-1.1.3/nls/tscii-0/Makefile.in
+++ libx11-1.1.3/nls/tscii-0/Makefile.in
@@ -78,6 +78,7 @@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
diff -u libx11-1.1.3/nls/vi_VN.tcvn/Makefile.in 
libx11-1.1.3/nls/vi_VN.tcvn/Makefile.in
--- libx11-1.1.3/nls/vi_VN.tcvn/Makefile.in
+++ libx11-1.1.3/nls/vi_VN.tcvn/Makefile.in
@@ -78,6 +78,7 @@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
diff -u libx11-1.1.3/nls/vi_VN.viscii/Makefile.in 
libx11-1.1.3/nls/vi_VN.viscii/Makefile.in
--- libx11-1.1.3/nls/vi_VN.viscii/Makefile.in
+++ libx11-1.1.3/nls/vi_VN.viscii/Makefile.in
@@ -78,6 +78,7 @@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
diff -u libx11-1.1.3/nls/zh_CN.UTF-8/Makefile.in 
libx11-1.1.3/nls/zh_CN.UTF-8/Makefile.in
--- libx11-1.1.3/nls/zh_CN.UTF-8/Makefile.in
+++ libx11-1.1.3/nls/zh_CN.UTF-8/Makefile.in
@@ -78,6 +78,7 @@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
diff -u libx11-1.1.3/nls/zh_CN.gb18030/Makefile.in 
libx11-1.1.3/nls/zh_CN.gb18030/Makefile.in
--- libx11-1.1.3/nls/zh_CN.gb18030/Makefile.in
+++ libx11-1.1.3/nls/zh_CN.gb18030/Makefile.in
@@ -78,6 +78,7 @@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
diff -u libx11-1.1.3/nls/zh_CN.gbk/Makefile.in 
libx11-1.1.3/nls/zh_CN.gbk/Makefile.in
--- libx11-1.1.3/nls/zh_CN.gbk/Makefile.in
+++ libx11-1.1.3/nls/zh_CN.gbk/Makefile.in
@@ -78,6 +78,7 @@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
diff -u libx11-1.1.3/nls/zh_CN/Makefile.in libx11-1.1.3/nls/zh_CN/Makefile.in
--- libx11-1.1.3/nls/zh_CN/Makefile.in
+++ libx11-1.1.3/nls/zh_CN/Makefile.in
@@ -78,6 +78,7 @@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
diff -u libx11-1.1.3/nls/zh_HK.UTF-8/Makefile.in 
libx11-1.1.3/nls/zh_HK.UTF-8/Makefile.in
--- libx11-1.1.3/nls/zh_HK.UTF-8/Makefile.in
+++ libx11-1.1.3/nls/zh_HK.UTF-8/Makefile.in
@@ -78,6 +78,7 @@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
diff -u libx11-1.1.3/nls/zh_HK.big5/Makefile.in 
libx11-1.1.3/nls/zh_HK.big5/Makefile.in
--- libx11-1.1.3/nls/zh_HK.big5/Makefile.in
+++ libx11-1.1.3/nls/zh_HK.big5/Makefile.in
@@ -78,6 +78,7 @@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
diff -u libx11-1.1.3/nls/zh_HK.big5hkscs/Makefile.in 
libx11-1.1.3/nls/zh_HK.big5hkscs/Makefile.in
--- libx11-1.1.3/nls/zh_HK.big5hkscs/Makefile.in
+++ libx11-1.1.3/nls/zh_HK.big5hkscs/Makefile.in
@@ -78,6 +78,7 @@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
diff -u libx11-1.1.3/nls/zh_TW.UTF-8/Makefile.in 
libx11-1.1.3/nls/zh_TW.UTF-8/Makefile.in
--- libx11-1.1.3/nls/zh_TW.UTF-8/Makefile.in
+++ libx11-1.1.3/nls/zh_TW.UTF-8/Makefile.in
@@ -78,6 +78,7 @@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
diff -u libx11-1.1.3/nls/zh_TW.big5/Makefile.in 
libx11-1.1.3/nls/zh_TW.big5/Makefile.in
--- libx11-1.1.3/nls/zh_TW.big5/Makefile.in
+++ libx11-1.1.3/nls/zh_TW.big5/Makefile.in
@@ -78,6 +78,7 @@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
diff -u libx11-1.1.3/nls/zh_TW/Makefile.in libx11-1.1.3/nls/zh_TW/Makefile.in
--- libx11-1.1.3/nls/zh_TW/Makefile.in
+++ libx11-1.1.3/nls/zh_TW/Makefile.in
@@ -78,6 +78,7 @@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
diff -u libx11-1.1.3/src/util/Makefile.in libx11-1.1.3/src/util/Makefile.in
--- libx11-1.1.3/src/util/Makefile.in
+++ libx11-1.1.3/src/util/Makefile.in
@@ -62,6 +62,9 @@
        --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
        $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+       --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+       $(LDFLAGS) -o $@
 SOURCES = makekeys.c
 DIST_SOURCES = makekeys.c
 ETAGS = etags
@@ -80,8 +83,9 @@
 AWK = @AWK@
 BIGFONT_CFLAGS = @BIGFONT_CFLAGS@
 BIGFONT_LIBS = @BIGFONT_LIBS@
-CC = @CC@
+CC = @CC_FOR_BUILD@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
@@ -224,9 +228,6 @@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 makekeys_CFLAGS = $(X11_CFLAGS)
-
-#override CC = gcc
-LINK = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 EXTRA_DIST = mkks.sh
 
 # Check source code with tools like lint & sparse
diff -u libx11-1.1.3/src/xcms/Makefile.in libx11-1.1.3/src/xcms/Makefile.in
--- libx11-1.1.3/src/xcms/Makefile.in
+++ libx11-1.1.3/src/xcms/Makefile.in
@@ -100,6 +100,7 @@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
diff -u libx11-1.1.3/src/xkb/Makefile.in libx11-1.1.3/src/xkb/Makefile.in
--- libx11-1.1.3/src/xkb/Makefile.in
+++ libx11-1.1.3/src/xkb/Makefile.in
@@ -83,6 +83,7 @@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
diff -u libx11-1.1.3/src/xlibi18n/Makefile.in 
libx11-1.1.3/src/xlibi18n/Makefile.in
--- libx11-1.1.3/src/xlibi18n/Makefile.in
+++ libx11-1.1.3/src/xlibi18n/Makefile.in
@@ -111,6 +111,7 @@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
diff -u libx11-1.1.3/src/Makefile.in libx11-1.1.3/src/Makefile.in
--- libx11-1.1.3/src/Makefile.in
+++ libx11-1.1.3/src/Makefile.in
@@ -241,6 +241,7 @@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
only in patch2:
unchanged:
--- libx11-1.1.3.orig/debian/patches/016_fix_cross_compiling.diff
+++ libx11-1.1.3/debian/patches/016_fix_cross_compiling.diff
@@ -0,0 +1,47 @@
+From f438f69ee4246fb27053426a285d1d6ffa7fa60e Mon Sep 17 00:00:00 2001
+From: Julien Cristau <[EMAIL PROTECTED]>
+Date: Sun, 12 Aug 2007 16:54:48 +0200
+Subject: [PATCH] Build makekeys with CC_FOR_BUILD to fix cross-compiling
+
+makekeys is run during the build process, so needs to be built
+with a native compiler.
+---
+ configure.ac         |    6 ++++++
+ src/util/Makefile.am |    3 +--
+ 2 files changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index f49b9ed..3125dc4 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -18,6 +18,13 @@ AC_CONFIG_HEADER([include/X11/XlibConf.h])
+ AC_PROG_LIBTOOL
+ AC_PROG_CC
+ 
++if test x"$cross_compiling" = xyes; then
++      AC_CHECK_PROGS(CC_FOR_BUILD, gcc cc)
++else
++      CC_FOR_BUILD="$CC"
++fi
++AC_SUBST(CC_FOR_BUILD)
++
+ XORG_PROG_RAWCPP
+ 
+ # Build with XCB support?
+diff --git a/src/util/Makefile.am b/src/util/Makefile.am
+index 3ff421d..c9e81c0 100644
+--- a/src/util/Makefile.am
++++ b/src/util/Makefile.am
+@@ -4,8 +4,7 @@ noinst_PROGRAMS=makekeys
+ 
+ makekeys_CFLAGS=$(X11_CFLAGS)
+ 
+-#override CC = gcc
+-LINK = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CC = @CC_FOR_BUILD@
+ 
+ EXTRA_DIST = mkks.sh
+ 
+-- 
+1.5.2.4
+

signature.asc
Description: Digital signature

Bug#425445: libx11-6: fails to cross-build. tries to run cross-built makekeys utility

Reply via email to