summaryrefslogtreecommitdiffstats
path: root/patches/liblbxutil-1.0.1/liblbxutil-1.0.1-fix-cross-compile.diff
blob: dd87a82ba7690e422ccf2e6985ca09965a660517 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
#
# Submitted-By: Marc Kleine-Budde, 2006-01-19
# Committed-By: Marc Kleine-Budde
#
# Error:
#
# crosscompiling sux, x86 doesn't like it, when arm binaries are executed:
#
# /bin/sh ../libtool --mode=link arm-softfloat-linux-gnu-gcc -O
# -L/home/frogger/projects/pengutronix/ptxdist/ptxdist-0.9-trunk/local/arm-softfloat-linux-gnu/lib
# -L/home/frogger/projects/pengutronix/ptxdist/ptxdist-0.9-trunk/local/arm-softfloat-linux-gnu/usr/lib
# -o mkg3states mkg3states.o arm-softfloat-linux-gnu-gcc -O -o
# mkg3states mkg3states.o
# -L/home/frogger/projects/pengutronix/ptxdist/ptxdist-0.9-trunk/local/arm-softfloat-linux-gnu/lib
# -L/home/frogger/projects/pengutronix/ptxdist/ptxdist-0.9-trunk/local/arm-softfloat-linux-gnu/usr/lib
# rm -f g3states.h ./mkg3states -c > g3states.h_ && mv g3states.h_
# g3states.h /bin/sh: ./mkg3states: cannot execute binary file
# make[3]: *** [g3states.h] Error 126
#
#
# Description:
#
# build mkg3states for build not for host, using BSP hack, but works
# rediffed for Xorg7.1 by Luotao Fu, 2006-06-19
#
# State:
#
# submitted upstream
#
Index: liblbxutil-1.0.1/configure.ac
===================================================================
--- liblbxutil-1.0.1.orig/configure.ac	2007-10-18 09:39:19.000000000 +0200
+++ liblbxutil-1.0.1/configure.ac	2007-10-18 09:40:53.000000000 +0200
@@ -51,4 +51,5 @@
 
 AC_OUTPUT([Makefile
 	   src/Makefile
+	   src/image/Makefile
 	   lbxutil.pc])
Index: liblbxutil-1.0.1/src/Makefile.am
===================================================================
--- liblbxutil-1.0.1.orig/src/Makefile.am	2007-10-18 09:39:19.000000000 +0200
+++ liblbxutil-1.0.1/src/Makefile.am	2007-10-18 09:39:22.000000000 +0200
@@ -1,9 +1,6 @@
-lib_LTLIBRARIES = liblbxutil.la
-
-noinst_PROGRAMS = mkg3states
+SUBDIRS = image
 
-mkg3states_SOURCES =				\
-	$(srcdir)/image/mkg3states.c
+lib_LTLIBRARIES = liblbxutil.la
 
 liblbxutil_la_SOURCES =				\
 	$(srcdir)/lbx_zlib/reqstats.h		\
@@ -28,9 +25,9 @@
 
 $(srcdir)/image/dfaxg42d.c: g3states.h
 
-g3states.h: mkg3states
+g3states.h: image/mkg3states
 	-rm -f g3states.h
-	./mkg3states -c > g3states.h_ && mv g3states.h_ g3states.h
+	./image/mkg3states -c > g3states.h_ && mv g3states.h_ g3states.h
 
 liblbxutil_la_LDFLAGS = -version-number 1:0:0 -no-undefined
 
Index: liblbxutil-1.0.1/src/image/Makefile.am
===================================================================
--- /dev/null	1970-01-01 00:00:00.000000000 +0000
+++ liblbxutil-1.0.1/src/image/Makefile.am	2007-10-18 09:39:27.000000000 +0200
@@ -0,0 +1,15 @@
+# evil hack
+CFLAGS=$(CFLAGS_FOR_BUILD)
+CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
+LDFLAGS=$(LDFLAGS_FOR_BUILD)
+
+CC=$(CC_FOR_BUILD)
+LIBTOOL = @LIBTOOL@ --tag=CC
+
+noinst_PROGRAMS = mkg3states
+
+mkg3states_SOURCES =				\
+	mkg3states.c
+
+mkg3states_CFLAGS=$(CFLAGS_FOR_BUILD)
+mkg3states_LDFLAGS=$(LDFLAGS_FOR_BUILD)