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
adddbbc4
Kaydet (Commit)
adddbbc4
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_BOOST
Change-Id: I2fce6545d7f279e0e2d6f3ff53eee1ab82314135
üst
5c0e6d86
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
21 additions
and
20 deletions
+21
-20
RepositoryExternal.mk
RepositoryExternal.mk
+2
-2
configure.ac
configure.ac
+3
-3
ExternalProject_firebird.mk
external/firebird/ExternalProject_firebird.mk
+2
-2
ExternalProject_libabw.mk
external/libabw/ExternalProject_libabw.mk
+2
-1
ExternalProject_libcdr.mk
external/libcdr/ExternalProject_libcdr.mk
+1
-1
ExternalProject_libebook.mk
external/libebook/ExternalProject_libebook.mk
+1
-1
ExternalProject_libetonyek.mk
external/libetonyek/ExternalProject_libetonyek.mk
+1
-1
ExternalProject_libmspub.mk
external/libmspub/ExternalProject_libmspub.mk
+1
-1
ExternalProject_libmwaw.mk
external/libmwaw/ExternalProject_libmwaw.mk
+1
-1
ExternalProject_libodfgen.mk
external/libodfgen/ExternalProject_libodfgen.mk
+1
-1
ExternalProject_liborcus.mk
external/liborcus/ExternalProject_liborcus.mk
+4
-4
ExternalProject_libvisio.mk
external/libvisio/ExternalProject_libvisio.mk
+1
-1
ExternalProject_libwps.mk
external/libwps/ExternalProject_libwps.mk
+1
-1
No files found.
RepositoryExternal.mk
Dosyayı görüntüle @
adddbbc4
...
...
@@ -584,7 +584,7 @@ endef
endif # SYSTEM_HUNSPELL
if
eq ($(SYSTEM_BOOST),YES
)
if
neq ($(SYSTEM_BOOST),
)
define gb_LinkTarget__use_boostdatetime
$(call gb_LinkTarget_set_include,$(1),\
...
...
@@ -2692,7 +2692,7 @@ $(call gb_LinkTarget_add_libs,$(1),\
$(call gb_UnpackedTarball_get_dir,liborcus)/src/liborcus/.libs/liborcus-0.6$(gb_StaticLibrary_PLAINEXT) \
)
$(if $(
filter YES,$(SYSTEM_BOOST)
), \
$(if $(
SYSTEM_BOOST
), \
$(call gb_LinkTarget_add_ldflags,$(1),$(BOOST_LDFLAGS)) \
$(call gb_LinkTarget_add_libs,$(1),$(BOOST_SYSTEM_LIB)) \
)
...
...
configure.ac
Dosyayı görüntüle @
adddbbc4
...
...
@@ -8738,7 +8738,7 @@ dnl ===================================================================
AC_MSG_CHECKING([which boost to use])
if test "$with_system_boost" = "yes"; then
AC_MSG_RESULT([external])
SYSTEM_BOOST=
YES
SYSTEM_BOOST=
TRUE
AX_BOOST_BASE(1.47)
AX_BOOST_DATE_TIME
mingw_boost_date_time_dll=`echo $BOOST_DATE_TIME_LIB | sed -e 's/^-l//' -e 's/\.dll$//'`
...
...
@@ -8770,7 +8770,7 @@ if test "$with_system_boost" = "yes"; then
else
AC_MSG_RESULT([internal])
BUILD_TYPE="$BUILD_TYPE BOOST"
SYSTEM_BOOST=
NO
SYSTEM_BOOST=
fi
AC_SUBST(SYSTEM_BOOST)
...
...
@@ -9169,7 +9169,7 @@ if test -z "$enable_orcus" -o "$enable_orcus" != no; then
libo_CHECK_SYSTEM_MODULE([orcus],[ORCUS],[liborcus-0.6 >= 0.5.0])
if test "$with_system_orcus" != "yes"; then
if test "$SYSTEM_BOOST" = "
YES
"; then
if test "$SYSTEM_BOOST" = "
TRUE
"; then
# ===========================================================
# Determine if we are going to need to link with Boost.System
# ===========================================================
...
...
external/firebird/ExternalProject_firebird.mk
Dosyayı görüntüle @
adddbbc4
...
...
@@ -35,10 +35,10 @@ $(call gb_ExternalProject_get_state_target,firebird,build):
) \
" \
&& export CXXFLAGS=" \
$(if $(
filter NO,$(SYSTEM_BOOST)
), \
$(if $(
SYSTEM_BOOST),$(BOOST_CPPFLAGS
), \
-I$(call gb_UnpackedTarball_get_dir,boost) \
-L$(call gb_UnpackedTarball_get_dir,boost)/source/lib \
,$(BOOST_CPPFLAGS)
) \
) \
$(if $(filter NO,$(SYSTEM_ICU)), \
-I$(call gb_UnpackedTarball_get_dir,icu)/source \
-I$(call gb_UnpackedTarball_get_dir,icu)/source/i18n \
...
...
external/libabw/ExternalProject_libabw.mk
Dosyayı görüntüle @
adddbbc4
...
...
@@ -33,7 +33,8 @@ $(call gb_ExternalProject_get_state_target,libabw,build) :
--disable-tools \
--disable-debug \
--disable-werror \
CXXFLAGS="$(if $(filter NO,$(SYSTEM_BOOST)),-I$(call gb_UnpackedTarball_get_dir,boost) -I$(BUILDDIR)/config_$(gb_Side),$(BOOST_CPPFLAGS)) \
CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),\
-I$(call gb_UnpackedTarball_get_dir,boost) -I$(BUILDDIR)/config_$(gb_Side)) \
$(if $(SYSTEM_LIBXML),,-I$(call gb_UnpackedTarball_get_dir,xml2)/include)" \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
&& (cd $(EXTERNAL_WORKDIR)/src/lib && \
...
...
external/libcdr/ExternalProject_libcdr.mk
Dosyayı görüntüle @
adddbbc4
...
...
@@ -35,7 +35,7 @@ $(call gb_ExternalProject_get_state_target,libcdr,build) :
--disable-debug \
--disable-werror \
--disable-weffc \
CXXFLAGS="$(if $(
filter NO,$(SYSTEM_BOOST)),-I$(call gb_UnpackedTarball_get_dir,boost) -I$(BUILDDIR)/config_$(gb_Side),$(BOOST_CPPFLAGS
))" \
CXXFLAGS="$(if $(
SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost) -I$(BUILDDIR)/config_$(gb_Side
))" \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
&& (cd $(EXTERNAL_WORKDIR)/src/lib && \
$(if $(VERBOSE)$(verbose),V=1) \
...
...
external/libebook/ExternalProject_libebook.mk
Dosyayı görüntüle @
adddbbc4
...
...
@@ -34,7 +34,7 @@ $(call gb_ExternalProject_get_state_target,libebook,build) :
$(if $(filter TRUE,$(ENABLE_DEBUG)),--enable-debug,--disable-debug) \
--disable-werror \
--disable-weffc \
CXXFLAGS="$(if $(
filter NO,$(SYSTEM_BOOST)),-I$(call gb_UnpackedTarball_get_dir,boost) -I$(BUILDDIR)/config_$(gb_Side),$(BOOST_CPPFLAGS
))" \
CXXFLAGS="$(if $(
SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost) -I$(BUILDDIR)/config_$(gb_Side
))" \
XML_CFLAGS="$(if $(SYSTEM_LIBXML),$(LIBXML_CFLAGS),-I$(call gb_UnpackedTarball_get_dir,xml2)/include)" \
XML_LIBS="$(LIBXML_LIBS)" \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
...
...
external/libetonyek/ExternalProject_libetonyek.mk
Dosyayı görüntüle @
adddbbc4
...
...
@@ -34,7 +34,7 @@ $(call gb_ExternalProject_get_state_target,libetonyek,build) :
--disable-werror \
--disable-weffc \
--without-tools \
BOOST_CFLAGS="$(if $(
filter NO,$(SYSTEM_BOOST)),-I$(call gb_UnpackedTarball_get_dir,boost) -I$(BUILDDIR)/config_$(gb_Side),$(BOOST_CPPFLAGS
))" \
BOOST_CFLAGS="$(if $(
SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost) -I$(BUILDDIR)/config_$(gb_Side
))" \
XML_CFLAGS="$(if $(SYSTEM_LIBXML),$(LIBXML_CFLAGS),-I$(call gb_UnpackedTarball_get_dir,xml2)/include)" \
XML_LIBS="$(LIBXML_LIBS)" \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
...
...
external/libmspub/ExternalProject_libmspub.mk
Dosyayı görüntüle @
adddbbc4
...
...
@@ -33,7 +33,7 @@ $(call gb_ExternalProject_get_state_target,libmspub,build) :
--disable-debug \
--disable-werror \
--disable-weffc \
CXXFLAGS="$(if $(
filter NO,$(SYSTEM_BOOST)),-I$(call gb_UnpackedTarball_get_dir,boost) -I$(BUILDDIR)/config_$(gb_Side),$(BOOST_CPPFLAGS
))" \
CXXFLAGS="$(if $(
SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost) -I$(BUILDDIR)/config_$(gb_Side
))" \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
&& (cd $(EXTERNAL_WORKDIR)/src/lib && \
$(if $(VERBOSE)$(verbose),V=1) \
...
...
external/libmwaw/ExternalProject_libmwaw.mk
Dosyayı görüntüle @
adddbbc4
...
...
@@ -31,7 +31,7 @@ $(call gb_ExternalProject_get_state_target,libmwaw,build) :
--without-docs \
--disable-debug \
--disable-werror \
CXXFLAGS="$(if $(
filter NO,$(SYSTEM_BOOST)),-I$(call gb_UnpackedTarball_get_dir,boost) -I$(BUILDDIR)/config_$(gb_Side),$(BOOST_CPPFLAGS
))" \
CXXFLAGS="$(if $(
SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost) -I$(BUILDDIR)/config_$(gb_Side
))" \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
&& (cd $(EXTERNAL_WORKDIR)/src/lib && \
$(if $(VERBOSE)$(verbose),V=1) \
...
...
external/libodfgen/ExternalProject_libodfgen.mk
Dosyayı görüntüle @
adddbbc4
...
...
@@ -32,7 +32,7 @@ $(call gb_ExternalProject_get_state_target,libodfgen,build) :
--disable-debug \
--disable-werror \
--disable-weffc \
CXXFLAGS="$(if $(
filter NO,$(SYSTEM_BOOST)),-I$(call gb_UnpackedTarball_get_dir,boost) -I$(BUILDDIR)/config_$(gb_Side),$(BOOST_CPPFLAGS
))" \
CXXFLAGS="$(if $(
SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost) -I$(BUILDDIR)/config_$(gb_Side
))" \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
&& (cd $(EXTERNAL_WORKDIR)/src && \
$(if $(VERBOSE)$(verbose),V=1) \
...
...
external/liborcus/ExternalProject_liborcus.mk
Dosyayı görüntüle @
adddbbc4
...
...
@@ -35,7 +35,7 @@ liborcus_LIBS=
ifneq ($(SYSTEM_ZLIB),)
liborcus_LIBS+=-lz
endif
if
eq ($(SYSTEM_BOOST),YES
)
if
neq ($(SYSTEM_BOOST),
)
liborcus_LIBS+=$(BOOST_SYSTEM_LIB)
else
liborcus_LIBS+=-L$(gb_StaticLibrary_WORKDIR) -lboostsystem
...
...
@@ -52,7 +52,7 @@ ifeq ($(SYSTEM_ZLIB),)
liborcus_CPPFLAGS+=$(ZLIB_CFLAGS)
endif
# patched boost needs to find config_global.h
ifeq ($(SYSTEM_BOOST),
NO
)
ifeq ($(SYSTEM_BOOST),)
liborcus_CPPFLAGS += -I$(BUILDDIR)/config_$(gb_Side)
endif
#
...
...
@@ -73,7 +73,7 @@ liborcus_LDFLAGS=$(LDFLAGS)
ifeq ($(COM),MSC)
liborcus_CXXFLAGS+=$(BOOST_CXXFLAGS)
endif
ifeq ($(SYSTEM_BOOST),
NO
)
ifeq ($(SYSTEM_BOOST),)
liborcus_CXXFLAGS+=-I$(WORKDIR)/UnpackedTarball/boost
else
liborcus_LDFLAGS+=$(BOOST_LDFLAGS)
...
...
@@ -96,7 +96,7 @@ $(call gb_ExternalProject_get_state_target,liborcus,build) :
--disable-spreadsheet-model \
--disable-werror \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
$(if $(
filter NO,$(SYSTEM_BOOST))
,--with-boost-system=boostsystem) \
$(if $(
SYSTEM_BOOST),
,--with-boost-system=boostsystem) \
&& $(if $(VERBOSE)$(verbose),V=1) \
$(MAKE) \
)
...
...
external/libvisio/ExternalProject_libvisio.mk
Dosyayı görüntüle @
adddbbc4
...
...
@@ -34,7 +34,7 @@ $(call gb_ExternalProject_get_state_target,libvisio,build) :
--without-docs \
--disable-debug \
--disable-werror \
CXXFLAGS="$(if $(
filter NO,$(SYSTEM_BOOST)),-I$(call gb_UnpackedTarball_get_dir,boost) -I$(BUILDDIR)/config_$(gb_Side),$(BOOST_CPPFLAGS
)) \
CXXFLAGS="$(if $(
SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost) -I$(BUILDDIR)/config_$(gb_Side
)) \
$(if $(SYSTEM_LIBXML),,-I$(call gb_UnpackedTarball_get_dir,xml2)/include)" \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
&& (cd $(EXTERNAL_WORKDIR)/src/lib && \
...
...
external/libwps/ExternalProject_libwps.mk
Dosyayı görüntüle @
adddbbc4
...
...
@@ -30,7 +30,7 @@ $(call gb_ExternalProject_get_state_target,libwps,build) :
--without-docs \
--disable-debug \
--disable-werror \
CXXFLAGS="$(if $(
filter NO,$(SYSTEM_BOOST)),-I$(call gb_UnpackedTarball_get_dir,boost) -I$(BUILDDIR)/config_$(gb_Side),$(BOOST_CPPFLAGS
))" \
CXXFLAGS="$(if $(
SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost) -I$(BUILDDIR)/config_$(gb_Side
))" \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
&& (cd $(EXTERNAL_WORKDIR)/src/lib && \
$(if $(VERBOSE)$(verbose),V=1) \
...
...
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