Skip to content
Projeler
Gruplar
Parçacıklar
Yardım
Yükleniyor...
Oturum aç / Kaydol
Gezinmeyi değiştir
C
core
Proje
Proje
Ayrıntılar
Etkinlik
Cycle Analytics
Depo (repository)
Depo (repository)
Dosyalar
Kayıtlar (commit)
Dallar (branch)
Etiketler
Katkıda bulunanlar
Grafik
Karşılaştır
Grafikler
Konular (issue)
0
Konular (issue)
0
Liste
Pano
Etiketler
Kilometre Taşları
Birleştirme (merge) Talepleri
0
Birleştirme (merge) Talepleri
0
CI / CD
CI / CD
İş akışları (pipeline)
İşler
Zamanlamalar
Grafikler
Paketler
Paketler
Wiki
Wiki
Parçacıklar
Parçacıklar
Üyeler
Üyeler
Collapse sidebar
Close sidebar
Etkinlik
Grafik
Grafikler
Yeni bir konu (issue) oluştur
İşler
Kayıtlar (commit)
Konu (issue) Panoları
Kenar çubuğunu aç
LibreOffice
core
Commits
ab03e877
Kaydet (Commit)
ab03e877
authored
Agu 15, 2012
tarafından
David Tardon
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
add build support for libexslt
Change-Id: I539acd19fa8a0dc1a89a7a172ecad2a03ebc5d7b
üst
dfe544c8
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
33 additions
and
0 deletions
+33
-0
RepositoryExternal.mk
RepositoryExternal.mk
+18
-0
config_host.mk.in
config_host.mk.in
+3
-0
configure.in
configure.in
+7
-0
makefile.mk
external/mingw-dlls/makefile.mk
+1
-0
InstallModule_ooo.mk
scp2/InstallModule_ooo.mk
+1
-0
mingw_dlls.scp
scp2/source/ooo/mingw_dlls.scp
+3
-0
No files found.
RepositoryExternal.mk
Dosyayı görüntüle @
ab03e877
...
...
@@ -411,9 +411,20 @@ $(call gb_LinkTarget_add_libs,$(1),$(LIBXSLT_LIBS))
endef
define gb_LinkTarget__use_libexslt
$(call gb_LinkTarget_set_include,$(1),\
$$(INCLUDE) \
$(LIBEXSLT_CFLAGS) \
)
$(call gb_LinkTarget_add_libs,$(1),$(LIBEXSLT_LIBS))
endef
else # !SYSTEM_LIBXSLT
$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
exslt \
xslt \
))
...
...
@@ -424,6 +435,13 @@ $(call gb_LinkTarget_use_libraries,$(1),\
endef
define gb_LinkTarget__use_libexslt
$(call gb_LinkTarget_use_libraries,$(1),\
exslt \
)
endef
endif # SYSTEM_LIBXSLT
...
...
config_host.mk.in
Dosyayı görüntüle @
ab03e877
...
...
@@ -275,6 +275,8 @@ export LIBBASE_JAR=@LIBBASE_JAR@
export LIBCMIS_CFLAGS=@LIBCMIS_CFLAGS@
export LIBCMIS_LIBS=@LIBCMIS_LIBS@
export LIBDIR=@LIBDIR@
export LIBEXSLT_CFLAGS=@LIBEXSLT_CFLAGS@
export LIBEXSLT_LIBS=@LIBEXSLT_LIBS@
export LIBEXTTEXTCAT_CFLAGS=@LIBEXTTEXTCAT_CFLAGS@
export LIBEXTTEXTCAT_LIBS=@LIBEXTTEXTCAT_LIBS@
export LIBFONTS_JAR=@LIBFONTS_JAR@
...
...
@@ -333,6 +335,7 @@ export MINGW_IDN_DLL=@MINGW_IDN_DLL@
export MINGW_INTL_DLL=@MINGW_INTL_DLL@
export MINGW_JPEG_DLL=@MINGW_JPEG_DLL@
export MINGW_LCMS2_DLL=@MINGW_LCMS2_DLL@
export MINGW_LIBEXSLT_DLL=@MINGW_LIBEXSLT_DLL@
export MINGW_LIBXML_DLL=@MINGW_LIBXML_DLL@
export MINGW_LIBXSLT_DLL=@MINGW_LIBXSLT_DLL@
export MINGW_LPSOLVE_DLL=@MINGW_LPSOLVE_DLL@
...
...
configure.in
Dosyayı görüntüle @
ab03e877
...
...
@@ -6721,10 +6721,13 @@ if test "$with_system_libxml" = "yes"; then
if test "$_os" = "Darwin"; then
dnl make sure to use SDK path
LIBXSLT_CFLAGS="-I$MACOSX_SDK_PATH/usr/include/libxml2"
LIBEXSLT_CFLAGS="$LIBXSLT_CFLAGS"
dnl omit -L/usr/lib
LIBXSLT_LIBS="-lxslt -lxml2 -lz -lpthread -liconv -lm"
LIBEXSLT_LIBS="-lexslt $LIBXSLT_LIBS"
else
PKG_CHECK_MODULES(LIBXSLT, libxslt)
PKG_CHECK_MODULES(LIBEXSLT, libexslt)
fi
dnl Check for xsltproc
...
...
@@ -6734,6 +6737,7 @@ if test "$with_system_libxml" = "yes"; then
fi
libo_MINGW_CHECK_DLL([LIBXSLT], [libxslt])
libo_MINGW_CHECK_DLL([LIBEXSLT], [libexslt])
libo_MINGW_TRY_DLL([ICONV], [iconv])
else
AC_MSG_RESULT([internal])
...
...
@@ -6753,9 +6757,12 @@ if test -z "$SYSTEM_LIBXSLT_FOR_BUILD"; then
fi
AC_SUBST(SYSTEM_LIBXSLT_FOR_BUILD)
AC_SUBST(LIBEXSLT_CFLAGS)
AC_SUBST(LIBEXSLT_LIBS)
AC_SUBST(LIBXSLT_CFLAGS)
AC_SUBST(LIBXSLT_LIBS)
AC_SUBST(XSLTPROC)
AC_SUBST([MINGW_LIBEXSLT_DLL])
AC_SUBST([MINGW_LIBXSLT_DLL])
AC_SUBST([MINGW_ICONV_DLL])
...
...
external/mingw-dlls/makefile.mk
Dosyayı görüntüle @
ab03e877
...
...
@@ -64,6 +64,7 @@ MINGW_DLLS:= \
$(MINGW_INTL_DLL)
\
$(MINGW_JPEG_DLL)
\
$(MINGW_LCMS2_DLL)
\
$(MINGW_LIBEXSLT_DLL)
\
$(MINGW_LIBXML_DLL)
\
$(MINGW_LIBXSLT_DLL)
\
$(MINGW_LPSOLVE_DLL)
\
...
...
scp2/InstallModule_ooo.mk
Dosyayı görüntüle @
ab03e877
...
...
@@ -115,6 +115,7 @@ $(eval $(call gb_InstallModule_define_mingw_dll_if_set,scp2/ooo,\
MINGW_INTL_DLL \
MINGW_JPEG_DLL \
MINGW_LCMS2_DLL \
MINGW_LIBEXSLT_DLL \
MINGW_LIBXML_DLL \
MINGW_LIBXSLT_DLL \
MINGW_LPSOLVE_DLL \
...
...
scp2/source/ooo/mingw_dlls.scp
Dosyayı görüntüle @
ab03e877
...
...
@@ -47,6 +47,9 @@ MINGW_DLL( gid_Brand_File_Lib_Mingw_Libexpat, MINGW_EXPAT_DLL )
#endif
#ifdef SYSTEM_LIBXSLT
#ifdef NEEDS_MINGW_LIBEXSLT_DLL
MINGW_DLL( gid_Brand_File_Lib_Mingw_Libexslt, MINGW_LIBEXSLT_DLL )
#endif
#ifdef NEEDS_MINGW_LIBXSLT_DLL
MINGW_DLL( gid_Brand_File_Lib_Mingw_Libxslt, MINGW_LIBXSLT_DLL )
#endif
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment