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
187194b8
Kaydet (Commit)
187194b8
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_NPAPI_HEADERS, SYSTEM_ICU
Change-Id: I7f1153e4a07a4116417a7734d867f2d0feda1ee4
üst
5378deae
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
10 deletions
+10
-10
RepositoryExternal.mk
RepositoryExternal.mk
+3
-3
configure.ac
configure.ac
+4
-4
Pagein_common.mk
desktop/Pagein_common.mk
+1
-1
ExternalProject_firebird.mk
external/firebird/ExternalProject_firebird.mk
+2
-2
No files found.
RepositoryExternal.mk
Dosyayı görüntüle @
187194b8
...
...
@@ -45,7 +45,7 @@ endef
endif
if
eq ($(SYSTEM_NPAPI_HEADERS),YES
)
if
neq ($(SYSTEM_NPAPI_HEADERS),
)
# yes this uses internal headers too...
# they are split across 2 dirs for this reason
...
...
@@ -1200,7 +1200,7 @@ endef
endif # SYSTEM_GRAPHITE
if
eq ($(SYSTEM_ICU),YES
)
if
neq ($(SYSTEM_ICU),
)
gb_LinkTarget__use_icu_headers:=
gb_ExternalProject__use_icu:=
...
...
@@ -3202,7 +3202,7 @@ $(call gb_Executable_add_runtime_dependencies,gengal,\
)
endef
if
neq ($(SYSTEM_ICU),YES
)
if
eq ($(SYSTEM_ICU),
)
define gb_Executable__register_gendict
$(call gb_Executable_add_runtime_dependencies,gendict,\
...
...
configure.ac
Dosyayı görüntüle @
187194b8
...
...
@@ -8961,7 +8961,7 @@ AC_MSG_CHECKING([which NPAPI headers to use])
if test "$with_system_npapi_headers" = "yes"; then
AC_MSG_RESULT([external])
SYSTEM_NPAPI_HEADERS=
YES
SYSTEM_NPAPI_HEADERS=
TRUE
# First try npapi-sdk:
PKG_CHECK_MODULES(NPAPI_HEADERS, npapi-sdk, [LOCATED=yes], [LOCATED=no])
# Then go with libxul:
...
...
@@ -8998,7 +8998,7 @@ else
AC_MSG_RESULT([internal])
dnl ...but will not be built/used unless ENABLE_NPAPI_FROM_BROWSER or
dnl ENABLE_NPAPI_INTO_BROWSER is TRUE
SYSTEM_NPAPI_HEADERS=
NO
SYSTEM_NPAPI_HEADERS=
fi
AC_SUBST(NPAPI_HEADERS_CFLAGS)
AC_SUBST(SYSTEM_NPAPI_HEADERS)
...
...
@@ -9033,7 +9033,7 @@ ICU_RECLASSIFIED_HEBREW_LETTER="YES"
AC_MSG_CHECKING([which icu to use])
if test "$with_system_icu" = "yes"; then
AC_MSG_RESULT([external])
SYSTEM_ICU=
YES
SYSTEM_ICU=
TRUE
AC_LANG_PUSH([C++])
AC_MSG_CHECKING([for unicode/rbbi.h])
AC_PREPROC_IFELSE([AC_LANG_SOURCE([[unicode/rbbi.h]])],[AC_MSG_RESULT(checked.)],[AC_MSG_ERROR(icu headers not found.)])
...
...
@@ -9118,7 +9118,7 @@ You can use --with-system-icu-for-build=force to use it anyway.])
libo_MINGW_CHECK_DLL([icuuc][$ICU_MAJOR][$ICU_MINOR])
else
AC_MSG_RESULT([internal])
SYSTEM_ICU=
"NO"
SYSTEM_ICU=
BUILD_TYPE="$BUILD_TYPE ICU"
# surprisingly set these only for "internal" (to be used by various other
# external libs): the system icu-config is quite unhelpful and spits out
...
...
desktop/Pagein_common.mk
Dosyayı görüntüle @
187194b8
...
...
@@ -14,7 +14,7 @@ $(eval $(call gb_Pagein_add_objects,common,\
$(if $(MERGELIBS),merged) \
$(if $(URELIBS),urelibs) \
i18nlangtag \
$(if $(
findstring YES,$(SYSTEM_ICU)
),,\
$(if $(
SYSTEM_ICU
),,\
icui18n \
icuuc \
) \
...
...
external/firebird/ExternalProject_firebird.mk
Dosyayı görüntüle @
187194b8
...
...
@@ -39,12 +39,12 @@ $(call gb_ExternalProject_get_state_target,firebird,build):
-I$(call gb_UnpackedTarball_get_dir,boost) \
-L$(call gb_UnpackedTarball_get_dir,boost)/source/lib \
) \
$(if $(
filter NO,$(SYSTEM_ICU)
), \
$(if $(
SYSTEM_ICU),$(ICU_CPPFLAGS
), \
-I$(call gb_UnpackedTarball_get_dir,icu)/source \
-I$(call gb_UnpackedTarball_get_dir,icu)/source/i18n \
-I$(call gb_UnpackedTarball_get_dir,icu)/source/common \
-L$(call gb_UnpackedTarball_get_dir,icu)/source/lib \
,$(ICU_CPPFLAGS)
) \
) \
" \
&& ./configure \
--without-editline \
...
...
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