Attachment #2304 for bug #13337

View | Details | Raw Unified | Return to bug 13337
Collapse All | Expand All

Line Link Here

(-)file_not_specified_in_diff (-1 / +15 lines)
0	-- pango/Makefile.am	0	++ pango/Makefile.am.fixed
Lines 55-60 Link Here
55	if OS_WIN32	55	if OS_WIN32
56	libpango_1_0_la_LDFLAGS += -export-symbols $(srcdir)/pango.def -Wl,pango-win32-res.o	56	libpango_1_0_la_LDFLAGS += -export-symbols $(srcdir)/pango.def -Wl,pango-win32-res.o
57	libpango_1_0_la_DEPENDENCIES += pango-win32-res.o pango.def	57	libpango_1_0_la_DEPENDENCIES += pango-win32-res.o pango.def
		58	else
		59	libpango_1_0_la_LDFLAGS += -Wl,--version-script=libpango-1.0.ver
58	endif	60	endif
59	pango-win32-res.o: pango.rc	61	pango-win32-res.o: pango.rc
60	$(WINDRES) $< $@	62	$(WINDRES) $< $@
Lines 180-185 Link Here
180	pangox-fontcache.c \	182	pangox-fontcache.c \
181	pangox-fontmap.c	183	pangox-fontmap.c
182		184
		185	if OS_WIN32
		186	else
		187	libpangox_1_0_la_LDFLAGS += -Wl,--version-script=libpangox-1.0.ver
		188	endif
183		189
184	# ------------------- libpangoft2 -------------------	190	# ------------------- libpangoft2 -------------------
185		191
Lines 222-227 Link Here
222	if OS_WIN32	228	if OS_WIN32
223	libpangoft2_1_0_la_LDFLAGS += -export-symbols $(srcdir)/pangoft2.def -Wl,pangoft2-win32-res.o	229	libpangoft2_1_0_la_LDFLAGS += -export-symbols $(srcdir)/pangoft2.def -Wl,pangoft2-win32-res.o
224	libpangoft2_1_0_la_DEPENDENCIES += pangoft2-win32-res.o pangoft2.def	230	libpangoft2_1_0_la_DEPENDENCIES += pangoft2-win32-res.o pangoft2.def
		231	else
		232	libpangoft2_1_0_la_LDFLAGS += -Wl,--version-script=libpangoft2-1.0.ver
225	endif	233	endif
226	pangoft2-win32-res.o: pangoft2.rc	234	pangoft2-win32-res.o: pangoft2.rc
227	$(WINDRES) $< $@	235	$(WINDRES) $< $@
Lines 251-256 Link Here
251	pangoxft-private.h \	259	pangoxft-private.h \
252	pangoxft-render.c	260	pangoxft-render.c
253		261
		262	if OS_WIN32
		263	else
		264	libpangoxft_1_0_la_LDFLAGS += -Wl,--version-script=libpangoxft-1.0.ver
		265	endif
254		266
255	# ------------------- libpangocairo -------------------	267	# ------------------- libpangocairo -------------------
256		268
Lines 277-282 Link Here
277	if OS_WIN32	289	if OS_WIN32
278	libpangocairo_1_0_la_LDFLAGS += -export-symbols $(srcdir)/pangocairo.def	290	libpangocairo_1_0_la_LDFLAGS += -export-symbols $(srcdir)/pangocairo.def
279	libpangocairo_1_0_la_DEPENDENCIES += pangocairo.def	291	libpangocairo_1_0_la_DEPENDENCIES += pangocairo.def
		292	else
		293	libpangocairo_1_0_la_LDFLAGS += -Wl,--version-script=libpangocairo-1.0.ver
280	endif	294	endif
281		295
282	libpangocairo_1_0_la_LIBADD += libpangowin32-$(PANGO_API_VERSION).la $(WIN32_LIBS)	296	libpangocairo_1_0_la_LIBADD += libpangowin32-$(PANGO_API_VERSION).la $(WIN32_LIBS)

Lines 5620-5628 Link Here

(-)aclocal.m4 (-1 / +5 lines)
5620	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'	5620	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
5621		5621
5622	if test $supports_anon_versioning = yes; then	5622	if test $supports_anon_versioning = yes; then
5623	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~	5623	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='if [ ! -r $libname.ver ]; then
		5624	cp $libname.ver $output_objdir/$libname.ver~
		5625	else
		5626	$echo "{ global:" > $output_objdir/$libname.ver~
5624	cat $export_symbols \| sed -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~	5627	cat $export_symbols \| sed -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~
5625	$echo "local: *; };" >> $output_objdir/$libname.ver~	5628	$echo "local: *; };" >> $output_objdir/$libname.ver~
		5629	fi
5626	$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'	5630	$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
5627	fi	5631	fi
5628	else	5632	else

Return to bug 13337