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
04ff535f
Kaydet (Commit)
04ff535f
authored
Şub 11, 2014
tarafından
Michael Stahl
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
normalize values of SYSTEM_ZLIB, SYSTEM_DICTS, SYSTEM_FONTCONFIG
Change-Id: I7530cb9d0797df5fc86695b0379cc44c159d2ab5
üst
23647595
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
16 additions
and
16 deletions
+16
-16
RepositoryExternal.mk
RepositoryExternal.mk
+2
-2
configure.ac
configure.ac
+5
-5
ExternalProject_cairo.mk
external/cairo/ExternalProject_cairo.mk
+2
-2
ExternalProject_liborcus.mk
external/liborcus/ExternalProject_liborcus.mk
+2
-2
nss.patch
external/nss/nss.patch
+1
-1
Module_zlib.mk
external/zlib/Module_zlib.mk
+1
-1
StaticLibrary_ulingu.mk
lingucomponent/StaticLibrary_ulingu.mk
+1
-1
Library_package2.mk
package/Library_package2.mk
+1
-1
Library_scfilt.mk
sc/Library_scfilt.mk
+1
-1
No files found.
RepositoryExternal.mk
Dosyayı görüntüle @
04ff535f
...
...
@@ -353,7 +353,7 @@ endef
endif
if
eq ($(SYSTEM_ZLIB),YES
)
if
neq ($(SYSTEM_ZLIB),
)
define gb_LinkTarget__use_zlib
$(call gb_LinkTarget_add_defs,$(1),\
...
...
@@ -1148,7 +1148,7 @@ endef
endif # SYSTEM_FREETYPE
if
eq ($(SYSTEM_FONTCONFIG),YES
)
if
neq ($(SYSTEM_FONTCONFIG),
)
define gb_LinkTarget__use_fontconfig
$(call gb_LinkTarget_set_include,$(1),\
...
...
configure.ac
Dosyayı görüntüle @
04ff535f
...
...
@@ -4720,7 +4720,7 @@ AC_SUBST(ENABLE_CUPS)
# fontconfig checks
if test "$test_fontconfig" = "yes"; then
PKG_CHECK_MODULES([FONTCONFIG], [fontconfig >= 2.4.1])
SYSTEM_FONTCONFIG=
YES
SYSTEM_FONTCONFIG=
TRUE
fi
AC_SUBST(FONTCONFIG_CFLAGS)
AC_SUBST(FONTCONFIG_LIBS)
...
...
@@ -4794,7 +4794,7 @@ fi
AC_MSG_CHECKING([whether to use dicts from external paths])
if test -z "$with_system_dicts" -o "$with_system_dicts" != "no"; then
AC_MSG_RESULT([yes])
SYSTEM_DICTS=
YES
SYSTEM_DICTS=
TRUE
AC_MSG_CHECKING([for spelling dictionary directory])
if test -n "$with_external_dict_dir"; then
DICT_SYSTEM_DIR=file://$with_external_dict_dir
...
...
@@ -4821,7 +4821,7 @@ if test -z "$with_system_dicts" -o "$with_system_dicts" != "no"; then
AC_MSG_RESULT([$THES_SYSTEM_DIR])
else
AC_MSG_RESULT([no])
SYSTEM_DICTS=
NO
SYSTEM_DICTS=
fi
AC_SUBST(SYSTEM_DICTS)
AC_SUBST(DICT_SYSTEM_DIR)
...
...
@@ -7667,14 +7667,14 @@ dnl libo_CHECK_SYSTEM_MODULE([zlib],[ZLIB],[zlib])
AC_MSG_CHECKING([which zlib to use])
if test "$with_system_zlib" = "yes"; then
AC_MSG_RESULT([external])
SYSTEM_ZLIB=
YES
SYSTEM_ZLIB=
TRUE
AC_CHECK_HEADER(zlib.h, [],
[AC_MSG_ERROR(zlib.h not found. install zlib)], [])
AC_CHECK_LIB(z, deflate, [ ZLIB=-lz ],
[AC_MSG_ERROR(zlib not found or functional)], [])
else
AC_MSG_RESULT([internal])
SYSTEM_ZLIB=
NO
SYSTEM_ZLIB=
BUILD_TYPE="$BUILD_TYPE ZLIB"
ZLIB_CFLAGS="-I${WORKDIR}/UnpackedTarball/zlib"
ZLIB_LIBS="-lzlib"
...
...
external/cairo/ExternalProject_cairo.mk
Dosyayı görüntüle @
04ff535f
...
...
@@ -36,8 +36,8 @@ $(call gb_ExternalProject_get_state_target,cairo,build) :
$(if $(filter ANDROID IOS,$(OS)),PKG_CONFIG=./dummy_pkg_config) \
pixman_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,pixman)/pixman" \
pixman_LIBS="-L$(call gb_UnpackedTarball_get_dir,pixman)/pixman/.libs -lpixman-1" \
COMPRESS=$(if $(
filter YES,$(SYSTEM_ZLIB)
),compress,z_compress) \
ZLIB3RDLIB="$(if $(
filter YES,$(SYSTEM_ZLIB)
),,-L$(WORKDIR)/LinkTarget/StaticLibrary) -lz" \
COMPRESS=$(if $(
SYSTEM_ZLIB
),compress,z_compress) \
ZLIB3RDLIB="$(if $(
SYSTEM_ZLIB
),,-L$(WORKDIR)/LinkTarget/StaticLibrary) -lz" \
png_REQUIRES="trick_configure_into_using_png_CFLAGS_and_LIBS" \
png_CFLAGS="$(LIBPNG_CFLAGS)" png_LIBS="$(LIBPNG_LIBS)" \
$(if $(filter IOS,$(OS)),--disable-shared,--disable-static) \
...
...
external/liborcus/ExternalProject_liborcus.mk
Dosyayı görüntüle @
04ff535f
...
...
@@ -32,7 +32,7 @@ $(eval $(call gb_ExternalProject_register_targets,liborcus,\
#$(if $(filter MSC,$(COM)),CPPFLAGS+="-DBOOST_ALL_NO_LIB") CXXFLAGS+="$(BOOST_CXXFLAGS))
liborcus_LIBS=
if
eq ($(SYSTEM_ZLIB),YES
)
if
neq ($(SYSTEM_ZLIB),
)
liborcus_LIBS+=-lz
endif
ifeq ($(SYSTEM_BOOST),YES)
...
...
@@ -48,7 +48,7 @@ liborcus_CPPCLAGS=$(CPPFLAGS)
ifeq ($(COM),MSC)
liborcus_CPPFLAGS+=-DBOOST_ALL_NO_LIB
endif
ifeq ($(SYSTEM_ZLIB),
NO
)
ifeq ($(SYSTEM_ZLIB),)
liborcus_CPPFLAGS+=$(ZLIB_CFLAGS)
endif
# patched boost needs to find config_global.h
...
...
external/nss/nss.patch
Dosyayı görüntüle @
04ff535f
...
...
@@ -48,7 +48,7 @@
endif
endif
+if
eq ($(SYSTEM_ZLIB),YES)
+if
neq ($(SYSTEM_ZLIB),)
+# Currently (3.12.4) only the tools modutil and signtool are linked with libz
+# If USE_SYSTEM_ZLIB is not set then the tools link statically libzlib.a which
+# is also build in nss.
...
...
external/zlib/Module_zlib.mk
Dosyayı görüntüle @
04ff535f
...
...
@@ -9,7 +9,7 @@
$(eval $(call gb_Module_Module,zlib))
ifeq ($(SYSTEM_ZLIB),
NO
)
ifeq ($(SYSTEM_ZLIB),)
$(eval $(call gb_Module_add_targets,zlib,\
StaticLibrary_zlib \
...
...
lingucomponent/StaticLibrary_ulingu.mk
Dosyayı görüntüle @
04ff535f
...
...
@@ -15,7 +15,7 @@ $(eval $(call gb_StaticLibrary_use_api,ulingu,\
offapi
\
))
if
eq
($(SYSTEM_DICTS),YES
)
if
neq
($(SYSTEM_DICTS),
)
$(eval
$(call
gb_StaticLibrary_add_defs,ulingu,\
-DSYSTEM_DICTS
-DDICT_SYSTEM_DIR
=
\"
$(DICT_SYSTEM_DIR)
\"
-DHYPH_SYSTEM_DIR
=
\"
$(HYPH_SYSTEM_DIR)
\"
-DTHES_SYSTEM_DIR
=
\"
$(THES_SYSTEM_DIR)
\"
\
))
...
...
package/Library_package2.mk
Dosyayı görüntüle @
04ff535f
...
...
@@ -65,7 +65,7 @@ $(eval $(call gb_Library_add_exception_objects,package2,\
package/source/zippackage/ZipPackageStream
\
))
if
eq
($(SYSTEM_ZLIB),YES
)
if
neq
($(SYSTEM_ZLIB),
)
$(eval
$(call
gb_Library_add_defs,package2,\
-DSYSTEM_ZLIB
\
))
...
...
sc/Library_scfilt.mk
Dosyayı görüntüle @
04ff535f
...
...
@@ -231,7 +231,7 @@ $(eval $(call gb_Library_use_externals,scfilt,\
zlib \
))
if
eq ($(SYSTEM_ZLIB),YES
)
if
neq ($(SYSTEM_ZLIB),
)
$(eval $(call gb_Library_add_defs,scfilt,\
-DSYSTEM_ZLIB \
))
...
...
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