1
diff -ruN heimdal-0.6.2-old/aclocal.m4 heimdal-0.6.2/aclocal.m4
2
--- heimdal-0.6.2-old/aclocal.m4 2004-05-11 10:11:33.000000000 +1000
3
+++ heimdal-0.6.2/aclocal.m4 2004-05-11 10:15:47.000000000 +1000
5
sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
8
+ # argument to support GNU version scripts
9
+ version_script_arg='${wl}--version-script=\${libname}.ver'
11
# We used to test for /lib/ld.so.1 and disable shared libraries on
12
# powerpc, because MkLinux only supported shared libraries with the
13
# GNU dynamic linker. Since this was broken with cross compilers,
15
# Check if GNU C++ uses GNU ld as the underlying linker, since the
16
# archiving commands below assume that GNU ld is being used.
17
if test "$with_gnu_ld" = yes; then
18
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
19
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
20
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname $version_script_arg -o $lib'
21
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols $version_script_arg -o $lib'
23
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
24
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
26
lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
27
lt_cv_sys_global_symbol_to_c_name_address \
28
sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
29
- old_postinstall_cmds old_postuninstall_cmds \
30
+ old_postinstall_cmds old_postuninstall_cmds version_script_arg \
31
_LT_AC_TAGVAR(compiler, $1) \
32
_LT_AC_TAGVAR(CC, $1) \
33
_LT_AC_TAGVAR(LD, $1) \
35
# Object file suffix (normally "o").
38
+# Linker argument to specify a version script (if supported)
39
+version_script_arg="$version_script_arg"
41
# Old archive suffix (normally "a").
47
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
48
- tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
49
+ tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname $version_script_arg -o $lib'
50
_LT_AC_TAGVAR(archive_cmds, $1)="$tmp_archive_cmds"
51
supports_anon_versioning=no
52
case `$LD -v 2>/dev/null` in
53
diff -ruN heimdal-0.6.2-old/configure heimdal-0.6.2/configure
54
--- heimdal-0.6.2-old/configure 2004-05-11 10:11:34.000000000 +1000
55
+++ heimdal-0.6.2/configure 2004-05-11 10:18:06.000000000 +1000
59
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
60
- tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
61
+ tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname $version_script_arg -o $lib'
62
archive_cmds="$tmp_archive_cmds"
63
supports_anon_versioning=no
64
case `$LD -v 2>/dev/null` in
66
sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
69
+ # argument to support GNU version scripts
70
+ version_script_arg='${wl}--version-script=\${libname}.ver'
72
# We used to test for /lib/ld.so.1 and disable shared libraries on
73
# powerpc, because MkLinux only supported shared libraries with the
74
# GNU dynamic linker. Since this was broken with cross compilers,
76
lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
77
lt_cv_sys_global_symbol_to_c_name_address \
78
sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
79
- old_postinstall_cmds old_postuninstall_cmds \
80
+ old_postinstall_cmds old_postuninstall_cmds version_script_arg \
84
@@ -10013,6 +10016,9 @@
85
# Object file suffix (normally "o").
88
+# Linker argument to specify a version script (if supported)
89
+version_script_arg="$version_script_arg"
91
# Old archive suffix (normally "a").
94
@@ -10530,8 +10536,8 @@
95
# Check if GNU C++ uses GNU ld as the underlying linker, since the
96
# archiving commands below assume that GNU ld is being used.
97
if test "$with_gnu_ld" = yes; then
98
- archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
99
- archive_expsym_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
100
+ archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname $version_script_arg -o $lib'
101
+ archive_expsym_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols $version_script_arg -o $lib'
103
hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
104
export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
105
@@ -12369,6 +12375,9 @@
106
sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
109
+ # argument to support GNU version scripts
110
+ version_script_arg='${wl}--version-script=\${libname}.ver'
112
# We used to test for /lib/ld.so.1 and disable shared libraries on
113
# powerpc, because MkLinux only supported shared libraries with the
114
# GNU dynamic linker. Since this was broken with cross compilers,
115
@@ -13433,7 +13442,7 @@
116
lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
117
lt_cv_sys_global_symbol_to_c_name_address \
118
sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
119
- old_postinstall_cmds old_postuninstall_cmds \
120
+ old_postinstall_cmds old_postuninstall_cmds version_script_arg \
124
@@ -13583,6 +13592,9 @@
125
# Object file suffix (normally "o").
128
+# Linker argument to specify a version script (if supported)
129
+version_script_arg="$version_script_arg"
131
# Old archive suffix (normally "a").
134
@@ -14412,7 +14424,7 @@
137
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
138
- tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
139
+ tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname $version_script_arg -o $lib'
140
archive_cmds_F77="$tmp_archive_cmds"
141
supports_anon_versioning=no
142
case `$LD -v 2>/dev/null` in
143
@@ -15510,6 +15522,9 @@
144
sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
147
+ # argument to support GNU version scripts
148
+ version_script_arg='${wl}--version-script=\${libname}.ver'
150
# We used to test for /lib/ld.so.1 and disable shared libraries on
151
# powerpc, because MkLinux only supported shared libraries with the
152
# GNU dynamic linker. Since this was broken with cross compilers,
153
@@ -15776,7 +15791,7 @@
154
lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
155
lt_cv_sys_global_symbol_to_c_name_address \
156
sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
157
- old_postinstall_cmds old_postuninstall_cmds \
158
+ old_postinstall_cmds old_postuninstall_cmds version_script_arg \
162
@@ -15926,6 +15941,9 @@
163
# Object file suffix (normally "o").
166
+# Linker argument to specify a version script (if supported)
167
+version_script_arg="$version_script_arg"
169
# Old archive suffix (normally "a").
172
@@ -16738,7 +16756,7 @@
175
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
176
- tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
177
+ tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname $version_script_arg -o $lib'
178
archive_cmds_GCJ="$tmp_archive_cmds"
179
supports_anon_versioning=no
180
case `$LD -v 2>/dev/null` in
181
@@ -17856,6 +17874,9 @@
182
sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
185
+ # argument to support GNU version scripts
186
+ version_script_arg='${wl}--version-script=\${libname}.ver'
188
# We used to test for /lib/ld.so.1 and disable shared libraries on
189
# powerpc, because MkLinux only supported shared libraries with the
190
# GNU dynamic linker. Since this was broken with cross compilers,
191
@@ -18920,7 +18941,7 @@
192
lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
193
lt_cv_sys_global_symbol_to_c_name_address \
194
sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
195
- old_postinstall_cmds old_postuninstall_cmds \
196
+ old_postinstall_cmds old_postuninstall_cmds version_script_arg \
200
@@ -19070,6 +19091,9 @@
201
# Object file suffix (normally "o").
204
+# Linker argument to specify a version script (if supported)
205
+version_script_arg="$version_script_arg"
207
# Old archive suffix (normally "a").
210
@@ -19365,7 +19389,7 @@
211
lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
212
lt_cv_sys_global_symbol_to_c_name_address \
213
sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
214
- old_postinstall_cmds old_postuninstall_cmds \
215
+ old_postinstall_cmds old_postuninstall_cmds version_script_arg \
219
@@ -19515,6 +19539,9 @@
220
# Object file suffix (normally "o").
223
+# Linker argument to specify a version script (if supported)
224
+version_script_arg="$version_script_arg"
226
# Old archive suffix (normally "a").
229
diff -ruN heimdal-0.6.2-old/lib/krb5/Makefile.am heimdal-0.6.2/lib/krb5/Makefile.am
230
--- heimdal-0.6.2-old/lib/krb5/Makefile.am 2004-05-11 10:11:32.000000000 +1000
231
+++ heimdal-0.6.2/lib/krb5/Makefile.am 2004-05-11 10:11:39.000000000 +1000
236
-libkrb5_la_LDFLAGS = -version-info 20:0:3
237
+libkrb5_la_LDFLAGS = -version-info 20:0:3 -symbol-version KRB5_17_HEIMDAL
239
$(libkrb5_la_OBJECTS): $(srcdir)/krb5-protos.h $(srcdir)/krb5-private.h
241
diff -ruN heimdal-0.6.2-old/lib/krb5/Makefile.in heimdal-0.6.2/lib/krb5/Makefile.in
242
--- heimdal-0.6.2-old/lib/krb5/Makefile.in 2004-05-11 10:11:34.000000000 +1000
243
+++ heimdal-0.6.2/lib/krb5/Makefile.in 2004-05-11 10:11:39.000000000 +1000
248
-libkrb5_la_LDFLAGS = -version-info 20:0:3
249
+libkrb5_la_LDFLAGS = -version-info 20:0:3 -symbol-version KRB5_17_HEIMDAL
252
#libkrb5_la_LIBADD = ../com_err/error.lo ../com_err/com_err.lo
253
diff -ruN heimdal-0.6.2-old/ltmain.sh heimdal-0.6.2/ltmain.sh
254
--- heimdal-0.6.2-old/ltmain.sh 2004-05-11 10:11:36.000000000 +1000
255
+++ heimdal-0.6.2/ltmain.sh 2004-05-11 10:11:39.000000000 +1000
262
func_infer_tag $base_compile
264
@@ -1496,6 +1497,11 @@
274
args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wc,//'`
276
@@ -3750,6 +3756,13 @@
277
$run eval '(cd $output_objdir && $rm ${realname}U && $mv $realname ${realname}U)' || exit $?
280
+ # Eval so we get the libname.
281
+ if test -n "$symbolversion"; then
282
+ eval version_script_arg=\"$version_script_arg\"
284
+ version_script_arg=
287
# Do each of the archive commands.
288
if test "$module" = yes && test -n "$module_cmds" ; then
289
if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
290
@@ -3768,6 +3781,21 @@
294
+ if test -n "$symbolversion"; then
295
+ cat > ${libname}.ver <<EOF
310
if test "X$skipped_export" != "X:" && len=`expr "X$test_cmds" : ".*"` &&
311
test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
added
removed
debian/patches/032_libtool_version_script
