Attachment 30979 Details for Bug 20958 – 0001-fix-cross-compile-again.patch

[patch] 0001-fix-cross-compile-again.patch

0001-fix-cross-compile-again.patch (text/plain), 2.75 KB, created by Rémi Cardona on 2009-11-05 03:13:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rémi Cardona

Created: 2009-11-05 03:13:21 UTC

Size: 2.75 KB

patch

obsolete

>From da5ba611fbff6f939a7cec9ca41fa7df0f76a197 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?R=C3=A9mi=20Cardona?= <remi@gentoo.org>
>Date: Thu, 5 Nov 2009 11:55:22 +0100
>Subject: [PATCH] fix cross-compile again
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>makestrs should always be built for the target arch. When cross-compiling,
>create a native version "xmakestrs" which will always be noinst, and use it
>to generate the other sources.
>
>This avoids installing a makestrs built for the wrong arch.
>
>Based on this patch :
>http://overlays.gentoo.org/proj/embedded/browser/openmoko/trunk/openmoko-target/x11-libs/libXt/files/libXt-1.0.7-crosscompile-makestr.patch
>
>Signed-off-by: RÃ©mi Cardona <remi@gentoo.org>
>---
> configure.ac     |    2 ++
> src/Makefile.am  |    8 +++++++-
> util/Makefile.am |   15 ++++++++++-----
> 3 files changed, 19 insertions(+), 6 deletions(-)
>
>diff --git a/configure.ac b/configure.ac
>index 6a66d45..73bfbc0 100755
>--- a/configure.ac
>+++ b/configure.ac
>@@ -40,6 +40,8 @@ AC_PROG_LIBTOOL
> AM_PROG_CC_C_O
> XORG_DEFAULT_OPTIONS
> 
>+AM_CONDITIONAL(CROSS_COMPILING, [ test $cross_compiling = yes ])
>+
> if test x"$CC_FOR_BUILD" = x; then
> 	if test x"$cross_compiling" = xyes; then
> 		AC_CHECK_PROGS(CC_FOR_BUILD, gcc cc)
>diff --git a/src/Makefile.am b/src/Makefile.am
>index a43fb22..6b767a7 100644
>--- a/src/Makefile.am
>+++ b/src/Makefile.am
>@@ -92,12 +92,18 @@ BUILT_FILES = $(BUILT_SOURCE) $(BUILT_HEADER)
> 
> STRING_LIST = $(top_srcdir)/util/string.list
> 
>+if CROSS_COMPILING
>+MAKESTRS=$(top_builddir)/util/xmakestrs
>+else
>+MAKESTRS=$(top_builddir)/util/makestrs
>+endif
>+
> all-local: $(BUILT_FILES)
> 
> $(BUILT_HEADER): $(BUILT_SOURCE)
> 
> $(BUILT_SOURCE):
>-	$(top_builddir)/util/makestrs -i $(top_srcdir) $(STRINGSABIOPTIONS) < $(STRING_LIST) > StringDefs.c
>+	$(MAKESTRS) -i $(top_srcdir) $(STRINGSABIOPTIONS) < $(STRING_LIST) > StringDefs.c
> 	mkdir -p $(top_builddir)/src
> 	mkdir -p $(top_builddir)/include/X11
> 	cp StringDefs.h $(top_builddir)/include/X11
>diff --git a/util/Makefile.am b/util/Makefile.am
>index d51365e..6853d89 100644
>--- a/util/Makefile.am
>+++ b/util/Makefile.am
>@@ -1,13 +1,10 @@
> if INSTALL_MAKESTRS
> bin_PROGRAMS = makestrs
>+noinst_PROGRAMS = $(MAKESTRS_PROG)
> else
>-noinst_PROGRAMS = makestrs
>+noinst_PROGRAMS = makestrs $(MAKESTRS_PROG)
> endif
> 
>-CC = @CC_FOR_BUILD@
>-CFLAGS = @CFLAGS_FOR_BUILD@
>-LDFLAGS = @LDFLAGS_FOR_BUILD@
>-
> EXTRA_DIST = \
> 	Shell.ht \
> 	StrDefs.ct \
>@@ -45,3 +42,11 @@ SUFFIXES = .$(APP_MAN_SUFFIX) .man
> 
> .man.$(APP_MAN_SUFFIX):
> 	$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
>+
>+if CROSS_COMPILING
>+MAKESTRS_PROG=xmakestrs$(EXEEXT)
>+
>+xmakestrs$(EXEEXT): makestrs.c
>+	$(AM_V_GEN)$(CC_FOR_BUILD) $(X11_CFLAGS) $(CPPFLAGS_FOR_BUILD) \
>+	$(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@ makestrs.c
>+endif
>-- 
>1.6.5.2
>

Actions: View | Splinter Review

Attachments on bug 20958: 24380 | 30979 | 31061

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.