Hi
When building T2 trunk cross compile, I came across the following:
(1) building font-adobe is broken
I get the following error:
/usr/bin/ucs2any: Can't read mapping file
'/usr/X11R7/share/fonts/X11/util/map-ISO8859-1': No such file or directory
It trying to execute /usr/bin/ucs2any against the TARGET's supplied file
by using the path on the HOST's system.
(2) package/x11/mesa/mesa_use_correct_linker.patch.cross
No longer required.
(3) package/xorg/libx11/keysymdef_include.patch.cross
Re-apply keysymdef patch
# --- T2-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# T2 SDE: package/.../libx11/keysymdef_include.patch.cross
# Copyright (C) 2010 The T2 SDE Project
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- T2-COPYRIGHT-NOTE-END ---
--- libX11-1.3.4/configure.vanilla 2010-08-10 17:47:38.700957022 -0500
+++ libX11-1.3.4/configure 2010-08-10 17:49:26.097018311 -0500
@@ -14315,8 +14315,20 @@ fi
#
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking keysymdef.h" >&5
$as_echo_n "checking keysymdef.h... " >&6; }
-dir=`$PKG_CONFIG --variable=includedir xproto`
-KEYSYMDEF="$dir/X11/keysymdef.h"
+
+# Check whether --with-keysymdef was given.
+if test "${with_keysymdef+set}" = set; then :
+ withval=$with_keysymdef; KEYSYMDEF=$withval
+else
+ KEYSYMDEF=""
+fi
+
+
+if test x$KEYSYMDEF = x; then
+ dir=`pkg-config --variable=includedir xproto`
+ KEYSYMDEF="$dir/X11/keysymdef.h"
+fi
+
if test -f "$KEYSYMDEF"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $KEYSYMDEF" >&5
$as_echo "$KEYSYMDEF" >&6; }
(4) package/x11/mesa/compile.patch.cross
Fix cross builds for Mesa
# --- T2-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# T2 SDE: package/.../mesa/compile.patch.cross
# Copyright (C) 2010 The T2 SDE Project
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- T2-COPYRIGHT-NOTE-END ---
--- Mesa-7.8.2/src/glsl/apps/Makefile.orig 2010-04-27 16:41:21.000000000
-0500
+++ Mesa-7.8.2/src/glsl/apps/Makefile 2010-08-10 21:44:54.253503320 -0500
@@ -5,8 +5,8 @@ TOP = ../../..
include $(TOP)/configs/current
LIBS = \
- $(TOP)/src/glsl/pp/libglslpp.a \
- $(TOP)/src/glsl/cl/libglslcl.a
+ $(TOP)/src/glsl/pp/libglslppx.a \
+ $(TOP)/src/glsl/cl/libglslclx.a
SOURCES = \
compile.c \
@@ -26,10 +26,10 @@ INCLUDES = -I.
.SUFFIXES: .c
.c:
- $(APP_CC) $(INCLUDES) $(CFLAGS) $(LDFLAGS) $< $(LIBS) -o $@
+ $(HOSTCC) $(INCLUDES) $(CFLAGS) $(LDFLAGS) $< $(LIBS) -o $@
.c.o:
- $(APP_CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) $< -o $@
+ $(HOSTCC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) $< -o $@
##### TARGETS #####
--- Mesa-7.8.2/src/glsl/Makefile.template.orig 2010-08-10 21:41:25.756334835
-0500
+++ Mesa-7.8.2/src/glsl/Makefile.template 2010-08-10 21:43:38.397503486
-0500
@@ -14,6 +14,7 @@
### Basic defines ###
OBJECTS = $(C_SOURCES:.c=.o)
+OBJX = $(C_SOURCES:.c=.xo)
INCLUDES = \
-I. \
@@ -22,11 +23,14 @@ INCLUDES = \
##### TARGETS #####
-default: depend lib$(LIBNAME).a
+default: depend lib$(LIBNAME).a lib$(LIBNAME)x.a
lib$(LIBNAME).a: $(OBJECTS) Makefile $(TOP)/src/glsl/Makefile.template
$(MKLIB) -o $(LIBNAME) -static $(OBJECTS)
+lib$(LIBNAME)x.a: $(OBJX) Makefile $(TOP)/src/glsl/Makefile.template
+ $(MKLIB) -o $(LIBNAME)x -static $(OBJX)
+
depend: $(C_SOURCES)
rm -f depend
touch depend
@@ -35,6 +39,7 @@ depend: $(C_SOURCES)
# Remove .o and backup files
clean:
rm -f $(OBJECTS) lib$(LIBNAME).a depend depend.bak
+ rm -f $(OBJX) lib$(LIBNAME)x.a
# Dummy target
install:
@@ -46,5 +51,8 @@ install:
.c.o:
$(CC) -c $(INCLUDES) $(CFLAGS) $(LIBRARY_DEFINES) $< -o $@
+%.xo: %.c
+ $(HOSTCC) -c $(INCLUDES) $(CFLAGS) $(LIBRARY_DEFINES) $< -o $@
+
-include depend
--
Rich Coe [email protected]
-----------------------------------------------------------
If you wish to unsubscribe from this mailing, send mail to
[email protected] with a subject of: unsubscribe t2
