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
88
89
90
91
92
93
94
95
96
97
98
99
|
#! /bin/sh /usr/share/dpatch/dpatch-run
## libtool.dpatch by Enrico Tassi <gareuselesinge@debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: No description.
@DPATCH@
diff -urNad trunk~/script/Makefile.common trunk/script/Makefile.common
--- trunk~/script/Makefile.common 2009-12-23 11:09:23.000000000 +0100
+++ trunk/script/Makefile.common 2010-01-23 16:42:38.000000000 +0100
@@ -143,7 +143,8 @@
# the target library
$(ODIR)/$(MODULE)$(DLLEXT): $(addprefix $(ODIR)/,$(addsuffix .$O,$(OFILES)))
$I
- $H $(LD) $(LDFLAGS) -shared -o $@ $^ $(LIBS)
+ $H $(LD) $(LDFLAGS) -shared -rpath /usr/lib -version-info 0:0:0 \
+ -o $(ODIR)/liblua5.1-$(MODULE)$(DLLEXT) $^ $(LIBS)
# if config.h changes, chances are that make-xml must be run again.
$(ODIR)/types.xml: script/make-xml.lua $(ODIR)/config.h $(ODIR)/config.lua $(IDIR)/spec.lua
diff -urNad trunk~/script/config.linux.lua trunk/script/config.linux.lua
--- trunk~/script/config.linux.lua 2009-12-23 14:41:56.000000000 +0100
+++ trunk/script/config.linux.lua 2010-01-23 16:42:25.000000000 +0100
@@ -63,7 +63,7 @@
-- output file with ".so" extension
cfg_m("O", "o")
-cfg_m("DLLEXT", ".so")
+cfg_m("DLLEXT", ".la")
-- cfg_m("ODLL", "gtk.so")
-- need to generate "position independent code"
diff -urNad trunk~/script/configure.lua trunk/script/configure.lua
--- trunk~/script/configure.lua 2009-12-23 14:44:34.000000000 +0100
+++ trunk/script/configure.lua 2010-01-23 16:42:25.000000000 +0100
@@ -589,9 +589,11 @@
summary("Debugging symbols", use_debug and "on" or "off")
- cfg_m("CC", cc)
+ cfg_m("CC", 'libtool --silent --tag=CC --mode=compile gcc')
+ cfg_m("LD", 'libtool --silent --tag=CC --mode=link gcc')
cfg_l('cc = "%s"', cc)
- cfg_m("HOSTCC", host_cc)
+ cfg_m("HOSTCC", 'libtool --silent --tag=CC --mode=compile gcc')
+ cfg_m("HOSTLD", 'libtool --silent --tag=CC --mode=link gcc')
cfg_m("DYNLINK", use_dynlink)
if cross_run then
cfg_m("CROSS_RUN", cross_run)
diff -urNad trunk~/src/gnome/Makefile trunk/src/gnome/Makefile
--- trunk~/src/gnome/Makefile 2009-12-23 11:09:23.000000000 +0100
+++ trunk/src/gnome/Makefile 2010-01-23 16:42:25.000000000 +0100
@@ -53,7 +53,7 @@
$(ODIR)/ffi-types: $(ODIR)/ffi-types.$(O)
$I
- $H ${HOSTCC} $(CFLAGS) -o $@ $< -lffi
+ $H ${HOSTLD} $(CFLAGS) -o $@ $< -lffi
# -- cmph hash functions --
@@ -79,7 +79,8 @@
$(ODIR)/file2c: src/file2c.c
$I
- $H ${HOSTCC} -o $@ $^
+ $H ${HOSTCC} -c $^
+ $H ${HOSTLD} -o $@ $(^:%.c=%.$(O))
# -- special targets --
diff -urNad trunk~/src/gnome/Makefile.rej trunk/src/gnome/Makefile.rej
--- trunk~/src/gnome/Makefile.rej 1970-01-01 01:00:00.000000000 +0100
+++ trunk/src/gnome/Makefile.rej 2010-01-23 16:42:25.000000000 +0100
@@ -0,0 +1,12 @@
+--- src/gnome/Makefile 2009-03-11 23:58:58.000000000 +0100
++++ src/gnome/Makefile 2009-05-02 17:40:14.000000000 +0200
+@@ -31,7 +31,8 @@
+
+ ${ODIR}test-vararg${EXESUFFIX}: $(IDIR)/test-vararg.c
+ $I
+- $H $(CC) $(CFLAGS) -I $(ODIR) -Wall -o $@ $^
++ $H $(CC) $(CFLAGS) -I $(ODIR) -Wall -o $(^:%.c=%.$(O)) -c $^
++ $H $(LD) $(CFLAGS) -I $(ODIR) -Wall -o $@ $(^:%.c=%.$(O))
+
+ # rule to build the library.
+
diff -urNad trunk~/src/hash/Makefile.inc trunk/src/hash/Makefile.inc
--- trunk~/src/hash/Makefile.inc 2009-12-23 11:10:09.000000000 +0100
+++ trunk/src/hash/Makefile.inc 2010-01-23 16:42:25.000000000 +0100
@@ -28,7 +28,7 @@
$(BINDIR)gnomedev.so: $(ODIR)/gnomedev-native.o \
$(ODIR)/hash-functions-native.o $(GENERATOR)
$I
- $H $(HOSTCC) -shared -o $@ $^ $(CMPH_LIBS)
+ $H gcc -shared -o $@ $^ $(CMPH_LIBS)
$H ln -s -f $@ .
# -- general rules --
|
