Lines 1-6
Link Here
|
1 |
--- configure.orig 2013-08-23 06:22:36.000000000 +0000 |
1 |
--- configure.orig 2014-05-08 09:28:26.000000000 +0200 |
2 |
+++ configure |
2 |
+++ configure 2014-05-08 09:31:54.000000000 +0200 |
3 |
@@ -545,9 +545,10 @@ if test $withsharedlibs = "yes"; then |
3 |
@@ -545,9 +545,10 @@ |
4 |
mksharedlib="$flexlink" |
4 |
mksharedlib="$flexlink" |
5 |
mkmaindll="$flexlink -maindll" |
5 |
mkmaindll="$flexlink -maindll" |
6 |
shared_libraries_supported=true;; |
6 |
shared_libraries_supported=true;; |
Lines 13-19
Link Here
|
13 |
bytecclinkopts="$bytecclinkopts -Wl,-E" |
13 |
bytecclinkopts="$bytecclinkopts -Wl,-E" |
14 |
byteccrpath="-Wl,-rpath," |
14 |
byteccrpath="-Wl,-rpath," |
15 |
mksharedlibrpath="-Wl,-rpath," |
15 |
mksharedlibrpath="-Wl,-rpath," |
16 |
@@ -557,7 +558,7 @@ if test $withsharedlibs = "yes"; then |
16 |
@@ -557,7 +558,7 @@ |
17 |
case "$bytecc" in |
17 |
case "$bytecc" in |
18 |
gcc*) |
18 |
gcc*) |
19 |
sharedcccompopts="-fPIC" |
19 |
sharedcccompopts="-fPIC" |
Lines 22-28
Link Here
|
22 |
byteccrpath="-Wl,-rpath," |
22 |
byteccrpath="-Wl,-rpath," |
23 |
mksharedlibrpath="-Wl,-rpath," |
23 |
mksharedlibrpath="-Wl,-rpath," |
24 |
shared_libraries_supported=true;; |
24 |
shared_libraries_supported=true;; |
25 |
@@ -573,11 +574,11 @@ if test $withsharedlibs = "yes"; then |
25 |
@@ -573,11 +574,11 @@ |
26 |
gcc*) |
26 |
gcc*) |
27 |
sharedcccompopts="-fPIC" |
27 |
sharedcccompopts="-fPIC" |
28 |
if sh ./solaris-ld; then |
28 |
if sh ./solaris-ld; then |
Lines 36-42
Link Here
|
36 |
bytecclinkopts="$bytecclinkopts -Wl,-E" |
36 |
bytecclinkopts="$bytecclinkopts -Wl,-E" |
37 |
natdynlinkopts="-Wl,-E" |
37 |
natdynlinkopts="-Wl,-E" |
38 |
byteccrpath="-Wl,-rpath," |
38 |
byteccrpath="-Wl,-rpath," |
39 |
@@ -601,12 +602,12 @@ if test $withsharedlibs = "yes"; then |
39 |
@@ -601,12 +602,12 @@ |
40 |
mksharedlibrpath="-rpath " |
40 |
mksharedlibrpath="-rpath " |
41 |
shared_libraries_supported=true;; |
41 |
shared_libraries_supported=true;; |
42 |
i[3456]86-*-darwin[89].*) |
42 |
i[3456]86-*-darwin[89].*) |
Lines 51-57
Link Here
|
51 |
bytecccompopts="$dl_defs $bytecccompopts" |
51 |
bytecccompopts="$dl_defs $bytecccompopts" |
52 |
dl_needs_underscore=false |
52 |
dl_needs_underscore=false |
53 |
shared_libraries_supported=true;; |
53 |
shared_libraries_supported=true;; |
54 |
@@ -616,7 +617,7 @@ if test $withsharedlibs = "yes"; then |
54 |
@@ -616,7 +617,7 @@ |
55 |
shared_libraries_supported=false;; |
55 |
shared_libraries_supported=false;; |
56 |
*-*-openbsd*) |
56 |
*-*-openbsd*) |
57 |
sharedcccompopts="-fPIC" |
57 |
sharedcccompopts="-fPIC" |
Lines 60-66
Link Here
|
60 |
bytecclinkopts="$bytecclinkopts -Wl,-E" |
60 |
bytecclinkopts="$bytecclinkopts -Wl,-E" |
61 |
natdynlinkopts="-Wl,-E" |
61 |
natdynlinkopts="-Wl,-E" |
62 |
byteccrpath="-Wl,-rpath," |
62 |
byteccrpath="-Wl,-rpath," |
63 |
@@ -651,6 +652,8 @@ if test $withsharedlibs = "yes"; then |
63 |
@@ -651,12 +652,15 @@ |
64 |
x86_64-*-kfreebsd*) natdynlink=true;; |
64 |
x86_64-*-kfreebsd*) natdynlink=true;; |
65 |
i[345]86-*-freebsd*) natdynlink=true;; |
65 |
i[345]86-*-freebsd*) natdynlink=true;; |
66 |
x86_64-*-freebsd*) natdynlink=true;; |
66 |
x86_64-*-freebsd*) natdynlink=true;; |
Lines 69-75
Link Here
|
69 |
i[345]86-*-openbsd*) natdynlink=true;; |
69 |
i[345]86-*-openbsd*) natdynlink=true;; |
70 |
x86_64-*-openbsd*) natdynlink=true;; |
70 |
x86_64-*-openbsd*) natdynlink=true;; |
71 |
i[345]86-*-netbsd*) natdynlink=true;; |
71 |
i[345]86-*-netbsd*) natdynlink=true;; |
72 |
@@ -680,6 +683,7 @@ case "$host" in |
72 |
x86_64-*-netbsd*) natdynlink=true;; |
|
|
73 |
i386-*-gnu0.3) natdynlink=true;; |
74 |
arm*-*-linux*) natdynlink=true;; |
75 |
+ arm*-*-freebsd*) natdynlink=true;; |
76 |
esac |
77 |
fi |
78 |
|
79 |
@@ -680,6 +684,7 @@ |
73 |
sparc*-*-gnu*) arch=sparc; system=gnu;; |
80 |
sparc*-*-gnu*) arch=sparc; system=gnu;; |
74 |
i[3456]86-*-linux*) arch=i386; system=linux_`sh ./runtest elf.c`;; |
81 |
i[3456]86-*-linux*) arch=i386; system=linux_`sh ./runtest elf.c`;; |
75 |
i[3456]86-*-*bsd*) arch=i386; system=bsd_`sh ./runtest elf.c`;; |
82 |
i[3456]86-*-*bsd*) arch=i386; system=bsd_`sh ./runtest elf.c`;; |
Lines 77-83
Link Here
|
77 |
i[3456]86-*-nextstep*) arch=i386; system=nextstep;; |
84 |
i[3456]86-*-nextstep*) arch=i386; system=nextstep;; |
78 |
i[3456]86-*-solaris*) if $arch64; then |
85 |
i[3456]86-*-solaris*) if $arch64; then |
79 |
arch=amd64; system=solaris |
86 |
arch=amd64; system=solaris |
80 |
@@ -695,6 +699,7 @@ case "$host" in |
87 |
@@ -695,6 +700,7 @@ |
81 |
fi;; |
88 |
fi;; |
82 |
i[3456]86-*-gnu*) arch=i386; system=gnu;; |
89 |
i[3456]86-*-gnu*) arch=i386; system=gnu;; |
83 |
powerpc*-*-linux*) arch=power; model=ppc; system=elf;; |
90 |
powerpc*-*-linux*) arch=power; model=ppc; system=elf;; |
Lines 85-91
Link Here
|
85 |
powerpc-*-netbsd*) arch=power; model=ppc; system=elf;; |
92 |
powerpc-*-netbsd*) arch=power; model=ppc; system=elf;; |
86 |
powerpc-*-openbsd*) arch=power; model=ppc; system=bsd_elf;; |
93 |
powerpc-*-openbsd*) arch=power; model=ppc; system=bsd_elf;; |
87 |
powerpc-*-rhapsody*) arch=power; model=ppc; system=rhapsody;; |
94 |
powerpc-*-rhapsody*) arch=power; model=ppc; system=rhapsody;; |
88 |
@@ -714,6 +719,7 @@ case "$host" in |
95 |
@@ -708,12 +714,14 @@ |
|
|
96 |
armv5te*-*-linux-gnueabi) arch=arm; model=armv5te; system=linux_eabi;; |
97 |
armv5*-*-linux-gnueabi) arch=arm; model=armv5; system=linux_eabi;; |
98 |
arm*-*-linux-gnueabi) arch=arm; system=linux_eabi;; |
99 |
+ armv6*-*-freebsd*) arch=arm; model=armv6; system=freebsd;; |
100 |
x86_64-*-linux*) arch=amd64; system=linux;; |
101 |
x86_64-*-gnu*) arch=amd64; system=gnu;; |
102 |
x86_64-*-freebsd*) arch=amd64; system=freebsd;; |
89 |
x86_64-*-netbsd*) arch=amd64; system=netbsd;; |
103 |
x86_64-*-netbsd*) arch=amd64; system=netbsd;; |
90 |
x86_64-*-openbsd*) arch=amd64; system=openbsd;; |
104 |
x86_64-*-openbsd*) arch=amd64; system=openbsd;; |
91 |
x86_64-*-darwin*) arch=amd64; system=macosx;; |
105 |
x86_64-*-darwin*) arch=amd64; system=macosx;; |
Lines 93-99
Link Here
|
93 |
esac |
107 |
esac |
94 |
|
108 |
|
95 |
# Some platforms exist both in 32-bit and 64-bit variants, not distinguished |
109 |
# Some platforms exist both in 32-bit and 64-bit variants, not distinguished |
96 |
@@ -734,7 +740,7 @@ else |
110 |
@@ -734,7 +742,7 @@ |
97 |
fi |
111 |
fi |
98 |
|
112 |
|
99 |
nativecccompopts='' |
113 |
nativecccompopts='' |
Lines 102-108
Link Here
|
102 |
# FIXME the naming of nativecclinkopts is broken: these are options for |
116 |
# FIXME the naming of nativecclinkopts is broken: these are options for |
103 |
# ld (for shared libs), not for cc |
117 |
# ld (for shared libs), not for cc |
104 |
nativeccrpath="$byteccrpath" |
118 |
nativeccrpath="$byteccrpath" |
105 |
@@ -803,6 +809,8 @@ case "$arch,$model,$system" in |
119 |
@@ -766,6 +774,8 @@ |
|
|
120 |
aspp='gcc -m64 -c';; |
121 |
amd64,*,*) as='as' |
122 |
aspp='gcc -c';; |
123 |
+ arm,*,freebsd*) as='cc -c'; |
124 |
+ aspp='cc -c';; |
125 |
arm,*,*) as='as'; |
126 |
aspp='gcc -c';; |
127 |
i386,*,solaris) as='as' |
128 |
@@ -803,6 +813,8 @@ |
106 |
amd64,*,linux) profiling='prof';; |
129 |
amd64,*,linux) profiling='prof';; |
107 |
amd64,*,gnu) profiling='prof';; |
130 |
amd64,*,gnu) profiling='prof';; |
108 |
arm,*,linux*) profiling='prof';; |
131 |
arm,*,linux*) profiling='prof';; |
Lines 111-117
Link Here
|
111 |
*) profiling='noprof';; |
134 |
*) profiling='noprof';; |
112 |
esac |
135 |
esac |
113 |
|
136 |
|
114 |
@@ -1204,7 +1212,7 @@ if test "$pthread_wanted" = "yes"; then |
137 |
@@ -1204,7 +1216,7 @@ |
115 |
case "$host" in |
138 |
case "$host" in |
116 |
*-*-solaris*) pthread_link="-lpthread -lposix4" |
139 |
*-*-solaris*) pthread_link="-lpthread -lposix4" |
117 |
pthread_caml_link="-cclib -lpthread -cclib -lposix4";; |
140 |
pthread_caml_link="-cclib -lpthread -cclib -lposix4";; |
Lines 120-126
Link Here
|
120 |
pthread_caml_link="-cclib -pthread";; |
143 |
pthread_caml_link="-cclib -pthread";; |
121 |
*-*-openbsd*) pthread_link="-pthread" |
144 |
*-*-openbsd*) pthread_link="-pthread" |
122 |
pthread_caml_link="-cclib -pthread";; |
145 |
pthread_caml_link="-cclib -pthread";; |
123 |
@@ -1218,7 +1226,7 @@ if test "$pthread_wanted" = "yes"; then |
146 |
@@ -1218,7 +1230,7 @@ |
124 |
bytecccompopts="$bytecccompopts -D_REENTRANT" |
147 |
bytecccompopts="$bytecccompopts -D_REENTRANT" |
125 |
nativecccompopts="$nativecccompopts -D_REENTRANT" |
148 |
nativecccompopts="$nativecccompopts -D_REENTRANT" |
126 |
case "$host" in |
149 |
case "$host" in |
Lines 129-135
Link Here
|
129 |
bytecccompopts="$bytecccompopts -D_THREAD_SAFE" |
152 |
bytecccompopts="$bytecccompopts -D_THREAD_SAFE" |
130 |
nativecccompopts="$nativecccompopts -D_THREAD_SAFE";; |
153 |
nativecccompopts="$nativecccompopts -D_THREAD_SAFE";; |
131 |
*-*-openbsd*) |
154 |
*-*-openbsd*) |
132 |
@@ -1388,7 +1396,6 @@ if test "$x11_include" = "not found"; th |
155 |
@@ -1388,7 +1400,6 @@ |
133 |
x11_libs="-L$dir" |
156 |
x11_libs="-L$dir" |
134 |
case "$host" in |
157 |
case "$host" in |
135 |
*-kfreebsd*-gnu) x11_link="-L$dir -lX11";; |
158 |
*-kfreebsd*-gnu) x11_link="-L$dir -lX11";; |
Lines 137-143
Link Here
|
137 |
*) x11_link="-L$dir -lX11";; |
160 |
*) x11_link="-L$dir -lX11";; |
138 |
esac |
161 |
esac |
139 |
fi |
162 |
fi |
140 |
@@ -1514,7 +1521,7 @@ if test $has_tk = true; then |
163 |
@@ -1514,7 +1525,7 @@ |
141 |
Tcl_DoOneEvent |
164 |
Tcl_DoOneEvent |
142 |
then |
165 |
then |
143 |
case "$host" in |
166 |
case "$host" in |
Lines 146-152
Link Here
|
146 |
*) tk_libs="-L/usr/pkg/lib $tk_libs $tk_x11_libs -ltk$tkmaj$tkmin -ltcl$tclmaj$tclmin -lpthread $tkauxlibs";; |
169 |
*) tk_libs="-L/usr/pkg/lib $tk_libs $tk_x11_libs -ltk$tkmaj$tkmin -ltcl$tclmaj$tclmin -lpthread $tkauxlibs";; |
147 |
esac |
170 |
esac |
148 |
else |
171 |
else |
149 |
@@ -1528,14 +1535,14 @@ if test $has_tk = true; then |
172 |
@@ -1528,14 +1539,14 @@ |
150 |
echo "Tcl/Tk libraries found." |
173 |
echo "Tcl/Tk libraries found." |
151 |
elif sh ./hasgot -L/sw/lib $tk_libs $tk_x11_libs $tkauxlibs Tk_SetGrid; then |
174 |
elif sh ./hasgot -L/sw/lib $tk_libs $tk_x11_libs $tkauxlibs Tk_SetGrid; then |
152 |
case "$host" in |
175 |
case "$host" in |
Lines 163-169
Link Here
|
163 |
*) tk_libs="-L/usr/pkg/lib $tk_libs";; |
186 |
*) tk_libs="-L/usr/pkg/lib $tk_libs";; |
164 |
esac |
187 |
esac |
165 |
echo "Tcl/Tk libraries found." |
188 |
echo "Tcl/Tk libraries found." |
166 |
@@ -1564,10 +1571,10 @@ fi |
189 |
@@ -1564,10 +1575,10 @@ |
167 |
# Look for BFD library |
190 |
# Look for BFD library |
168 |
|
191 |
|
169 |
if ./hasgot -i bfd.h && \ |
192 |
if ./hasgot -i bfd.h && \ |