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
1413b6a4
Kaydet (Commit)
1413b6a4
authored
Kas 10, 2014
tarafından
Michael Stahl
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
external: fortunately boost no longer requires config_host.mk
Change-Id: I8f2176500bf620cd5e4cdf434e6122b6163b3e0f
üst
8b172f7e
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
11 additions
and
17 deletions
+11
-17
ExternalProject_libabw.mk
external/libabw/ExternalProject_libabw.mk
+1
-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_libgltf.mk
external/libgltf/ExternalProject_libgltf.mk
+1
-2
ExternalProject_libmspub.mk
external/libmspub/ExternalProject_libmspub.mk
+1
-1
ExternalProject_libmwaw.mk
external/libmwaw/ExternalProject_libmwaw.mk
+0
-1
ExternalProject_libodfgen.mk
external/libodfgen/ExternalProject_libodfgen.mk
+1
-1
ExternalProject_liborcus.mk
external/liborcus/ExternalProject_liborcus.mk
+0
-4
ExternalProject_libpagemaker.mk
external/libpagemaker/ExternalProject_libpagemaker.mk
+1
-1
ExternalProject_librevenge.mk
external/librevenge/ExternalProject_librevenge.mk
+1
-1
ExternalProject_libvisio.mk
external/libvisio/ExternalProject_libvisio.mk
+1
-1
ExternalProject_libwps.mk
external/libwps/ExternalProject_libwps.mk
+1
-1
No files found.
external/libabw/ExternalProject_libabw.mk
Dosyayı görüntüle @
1413b6a4
...
...
@@ -35,7 +35,7 @@ $(call gb_ExternalProject_get_state_target,libabw,build) :
--disable-werror \
$(if $(VERBOSE)$(verbose),--disable-silent-rules,--enable-silent-rules) \
CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),\
-I$(call gb_UnpackedTarball_get_dir,boost)
-I$(BUILDDIR)/config_$(gb_Side)
)" \
-I$(call gb_UnpackedTarball_get_dir,boost))" \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
&& $(MAKE) \
)
...
...
external/libcdr/ExternalProject_libcdr.mk
Dosyayı görüntüle @
1413b6a4
...
...
@@ -36,7 +36,7 @@ $(call gb_ExternalProject_get_state_target,libcdr,build) :
--disable-werror \
--disable-weffc \
$(if $(VERBOSE)$(verbose),--disable-silent-rules,--enable-silent-rules) \
CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost)
-I$(BUILDDIR)/config_$(gb_Side)
)" \
CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost))" \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
&& $(MAKE) \
)
...
...
external/libebook/ExternalProject_libebook.mk
Dosyayı görüntüle @
1413b6a4
...
...
@@ -38,7 +38,7 @@ $(call gb_ExternalProject_get_state_target,libebook,build) :
$(if $(VERBOSE)$(verbose),--disable-silent-rules,--enable-silent-rules) \
--disable-werror \
--disable-weffc \
CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost)
-I$(BUILDDIR)/config_$(gb_Side)
)" \
CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost))" \
XML_CFLAGS="$(LIBXML_CFLAGS)" \
XML_LIBS="$(LIBXML_LIBS)" \
REVENGE_GENERATORS_CFLAGS=' ' REVENGE_GENERATORS_LIBS=' ' REVENGE_STREAM_CFLAGS=' ' REVENGE_STREAM_LIBS=' ' \
...
...
external/libetonyek/ExternalProject_libetonyek.mk
Dosyayı görüntüle @
1413b6a4
...
...
@@ -35,7 +35,7 @@ $(call gb_ExternalProject_get_state_target,libetonyek,build) :
--disable-weffc \
--without-tools \
$(if $(VERBOSE)$(verbose),--disable-silent-rules,--enable-silent-rules) \
BOOST_CFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost)
-I$(BUILDDIR)/config_$(gb_Side)
)" \
BOOST_CFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost))" \
XML_CFLAGS="$(LIBXML_CFLAGS)" \
XML_LIBS="$(LIBXML_LIBS)" \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
...
...
external/libgltf/ExternalProject_libgltf.mk
Dosyayı görüntüle @
1413b6a4
...
...
@@ -28,7 +28,6 @@ libgltf_AdditionalIncludes :=
ifeq ($(SYSTEM_BOOST),)
libgltf_AdditionalIncludes += "$(call gb_UnpackedTarball_get_dir,boost)"
libgltf_AdditionalIncludes += "$(BUILDDIR)/config_$(gb_Side)"
endif
ifeq ($(SYSTEM_GLEW),)
...
...
@@ -68,7 +67,7 @@ $(call gb_ExternalProject_get_state_target,libgltf,build) :
--with-pic \
$(if $(ENABLE_DEBUG),--enable-debug,--disable-debug) \
--disable-werror \
BOOST_CFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost))
-I$(BUILDDIR)/config_$(gb_Side)
" \
BOOST_CFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost))" \
GLEW_CFLAGS="$(if $(SYSTEM_GLEW),$(GLEW_CFLAGS),-I$(call gb_UnpackedTarball_get_dir,glew)/include)" \
GLM_CFLAGS="$(if $(SYSTEM_GLM),$(GLM_CFLAGS),-I$(call gb_UnpackedTarball_get_dir,glm))" \
$(if $(libgltf_CPPFLAGS),CPPFLAGS='$(libgltf_CPPFLAGS)') \
...
...
external/libmspub/ExternalProject_libmspub.mk
Dosyayı görüntüle @
1413b6a4
...
...
@@ -34,7 +34,7 @@ $(call gb_ExternalProject_get_state_target,libmspub,build) :
--disable-werror \
--disable-weffc \
$(if $(VERBOSE)$(verbose),--disable-silent-rules,--enable-silent-rules) \
CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost)
-I$(BUILDDIR)/config_$(gb_Side)
)" \
CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost))" \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
&& $(MAKE) \
)
...
...
external/libmwaw/ExternalProject_libmwaw.mk
Dosyayı görüntüle @
1413b6a4
...
...
@@ -38,7 +38,6 @@ $(call gb_ExternalProject_get_state_target,libmwaw,build) :
--disable-werror \
CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),\
$(if $(COM_GCC_IS_CLANG),-Qunused-arguments) \
-I$(BUILDDIR)/config_$(gb_Side) \
-I$(call gb_UnpackedTarball_get_dir,boost))" \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \
...
...
external/libodfgen/ExternalProject_libodfgen.mk
Dosyayı görüntüle @
1413b6a4
...
...
@@ -35,7 +35,7 @@ $(call gb_ExternalProject_get_state_target,libodfgen,build) :
--disable-weffc \
--without-docs \
$(if $(VERBOSE)$(verbose),--disable-silent-rules,--enable-silent-rules) \
CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost)
-I$(BUILDDIR)/config_$(gb_Side)
)" \
CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost))" \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \
&& $(MAKE) \
...
...
external/liborcus/ExternalProject_liborcus.mk
Dosyayı görüntüle @
1413b6a4
...
...
@@ -53,10 +53,6 @@ endif
ifeq ($(SYSTEM_ZLIB),)
liborcus_CPPFLAGS+=$(ZLIB_CFLAGS)
endif
# patched boost needs to find config_global.h
ifeq ($(SYSTEM_BOOST),)
liborcus_CPPFLAGS += -I$(BUILDDIR)/config_$(gb_Side)
endif
#
# OSes that use the GNU C++ library need to use -D_GLIBCXX_DEBUG in
# sync with the rest of LibreOffice, i.e. depending on
...
...
external/libpagemaker/ExternalProject_libpagemaker.mk
Dosyayı görüntüle @
1413b6a4
...
...
@@ -33,7 +33,7 @@ $(call gb_ExternalProject_get_state_target,libpagemaker,build) :
--disable-werror \
--disable-weffc \
$(if $(VERBOSE)$(verbose),--disable-silent-rules,--enable-silent-rules) \
CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost)
-I$(BUILDDIR)/config_$(gb_Side)
)" \
CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost))" \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
&& $(MAKE) \
)
...
...
external/librevenge/ExternalProject_librevenge.mk
Dosyayı görüntüle @
1413b6a4
...
...
@@ -35,7 +35,7 @@ $(call gb_ExternalProject_get_state_target,librevenge,build) :
--disable-generators \
--without-docs \
$(if $(VERBOSE)$(verbose),--disable-silent-rules,--enable-silent-rules) \
CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost)
-I$(BUILDDIR)/config_$(gb_Side)
)" \
CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost))" \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \
&& $(MAKE) \
...
...
external/libvisio/ExternalProject_libvisio.mk
Dosyayı görüntüle @
1413b6a4
...
...
@@ -35,7 +35,7 @@ $(call gb_ExternalProject_get_state_target,libvisio,build) :
$(if $(ENABLE_DEBUG),--enable-debug,--disable-debug) \
--disable-werror \
$(if $(VERBOSE)$(verbose),--disable-silent-rules,--enable-silent-rules) \
CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost)
-I$(BUILDDIR)/config_$(gb_Side)
)" \
CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost))" \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
&& $(MAKE) \
)
...
...
external/libwps/ExternalProject_libwps.mk
Dosyayı görüntüle @
1413b6a4
...
...
@@ -35,7 +35,7 @@ $(call gb_ExternalProject_get_state_target,libwps,build) :
--disable-debug \
--disable-werror \
$(if $(VERBOSE)$(verbose),--disable-silent-rules,--enable-silent-rules) \
CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost)
-I$(BUILDDIR)/config_$(gb_Side)
)" \
CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost))" \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \
&& $(MAKE) \
...
...
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