Attachment 24380 Details for Bug 20958 – Automake/autoconf patch

[patch] Automake/autoconf patch

libXt-1.0.5-crosscompile-makestr.patch (text/plain), 2.01 KB, created by Sven Rebhan on 2009-03-30 14:33:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Sven Rebhan

Created: 2009-03-30 14:33:46 UTC

Size: 2.01 KB

patch

obsolete

>--- configure.ac	2009-03-26 21:43:13.000000000 +0000
>+++ configure.ac.new	2009-03-26 21:43:50.000000000 +0000
>@@ -28,6 +28,10 @@
> dnl
> dnl
> AC_INIT(libXt, 1.0.5, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXt)
>+
>+AC_CANONICAL_BUILD
>+AC_CANONICAL_HOST
>+
> AM_INIT_AUTOMAKE([dist-bzip2])
> AM_MAINTAINER_MODE
> 
>@@ -37,6 +41,18 @@
> AC_PROG_CC
> AC_PROG_LIBTOOL
> 
>+AM_CONDITIONAL(CROSS_COMPILING, [ test $cross_compiling = yes ])
>+
>+if test "x${CC_FOR_BUILD+set}" != "xset" ; then
>+  if test "x$cross_compiling" = "xyes" ; then
>+    CC_FOR_BUILD=gcc
>+  else
>+    CC_FOR_BUILD=$CC
>+  fi
>+fi
>+AC_MSG_RESULT([$CC_FOR_BUILD])
>+AC_SUBST(CC_FOR_BUILD)
>+
> PKG_CHECK_MODULES(XT, sm x11 xproto kbproto)
> 
> # Needed for including Xalloca.h
>
>--- util/Makefile.am	2009-03-26 21:55:27.000000000 +0000
>+++ util/Makefile.am.new	2009-03-26 21:55:52.000000000 +0000
>@@ -1,7 +1,9 @@
> if INSTALL_MAKESTRS
> bin_PROGRAMS = makestrs
>+noinst_PROGRAMS = $(MAKESTRS_PROG)
> else
>-noinst_PROGRAMS = makestrs
>+noinst_PROGRAMS = makestrs
>+noinst_PROGRAMS += $(MAKESTRS_PROG)
> endif
> 
> EXTRA_DIST = \
>@@ -41,3 +42,11 @@
> 
> .man.$(APP_MAN_SUFFIX):
> 	sed $(MAN_SUBSTS) < $< > $@
>+
>+if CROSS_COMPILING
>+MAKESTRS_PROG=xmakestrs$(EXEEXT)
>+
>+xmakestrs$(EXEEXT): makestrs.c
>+	$(CC_FOR_BUILD) $(X11_CFLAGS) $(CPPFLAGS_FOR_BUILD) \
>+	$(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@ makestrs.c
>+endif
>
>--- src/Makefile.am	2006-12-19 03:40:53.000000000 +0000
>+++ src/Makefile.am.new	2009-03-26 22:03:18.000000000 +0000
>@@ -92,12 +92,19 @@
> 
> 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

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.