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
cdabc886
Kaydet (Commit)
cdabc886
authored
May 24, 2013
tarafından
Fridrich Štrba
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
Revert "Rename Boost libraries when built internally to match conventions"
This reverts commit
3aeecc52
.
üst
3aeecc52
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
32 additions
and
182 deletions
+32
-182
Library_merged.mk
Library_merged.mk
+1
-1
RepositoryExternal.mk
RepositoryExternal.mk
+11
-11
Module_boost.mk
boost/Module_boost.mk
+2
-2
StaticLibrary_boostdatetime.mk
boost/StaticLibrary_boostdatetime.mk
+6
-6
StaticLibrary_boostsystem.mk
boost/StaticLibrary_boostsystem.mk
+6
-6
ExternalProject_liborcus.mk
liborcus/ExternalProject_liborcus.mk
+2
-2
README
m4/README
+2
-3
ax_boost_thread.m4
m4/ax_boost_thread.m4
+0
-149
Library_scfilt.mk
sc/Library_scfilt.mk
+1
-1
Library_ucpcmis1.mk
ucb/Library_ucpcmis1.mk
+1
-1
No files found.
Library_merged.mk
Dosyayı görüntüle @
cdabc886
...
@@ -31,7 +31,7 @@ $(eval $(call gb_Library_use_libraries,merged,\
...
@@ -31,7 +31,7 @@ $(eval $(call gb_Library_use_libraries,merged,\
))
))
$(eval
$(call
gb_Library_use_externals,merged,\
$(eval
$(call
gb_Library_use_externals,merged,\
boost
_date_
time
\
boost
date
time
\
$(call
gb_Helper_optional,DESKTOP,clucene)
\
$(call
gb_Helper_optional,DESKTOP,clucene)
\
cups
\
cups
\
curl
\
curl
\
...
...
RepositoryExternal.mk
Dosyayı görüntüle @
cdabc886
...
@@ -540,7 +540,7 @@ endif # SYSTEM_HUNSPELL
...
@@ -540,7 +540,7 @@ endif # SYSTEM_HUNSPELL
ifeq ($(SYSTEM_BOOST),YES)
ifeq ($(SYSTEM_BOOST),YES)
define gb_LinkTarget__use_boost
_date_
time
define gb_LinkTarget__use_boost
date
time
$(call gb_LinkTarget_set_include,$(1),\
$(call gb_LinkTarget_set_include,$(1),\
$$(INCLUDE) \
$$(INCLUDE) \
$(BOOST_CPPFLAGS) \
$(BOOST_CPPFLAGS) \
...
@@ -556,7 +556,7 @@ $(call gb_LinkTarget_add_libs,$(1),\
...
@@ -556,7 +556,7 @@ $(call gb_LinkTarget_add_libs,$(1),\
endef
endef
define gb_LinkTarget__use_boost
_
system
define gb_LinkTarget__use_boostsystem
$(call gb_LinkTarget_set_include,$(1),\
$(call gb_LinkTarget_set_include,$(1),\
$$(INCLUDE) \
$$(INCLUDE) \
$(BOOST_CPPFLAGS) \
$(BOOST_CPPFLAGS) \
...
@@ -572,7 +572,7 @@ $(call gb_LinkTarget_add_libs,$(1),\
...
@@ -572,7 +572,7 @@ $(call gb_LinkTarget_add_libs,$(1),\
endef
endef
gb_ExternalProject__use_boost
_
system :=
gb_ExternalProject__use_boostsystem :=
define gb_LinkTarget__use_boost_headers
define gb_LinkTarget__use_boost_headers
$(call gb_LinkTarget_set_include,$(1),\
$(call gb_LinkTarget_set_include,$(1),\
...
@@ -587,8 +587,8 @@ gb_ExternalProject__use_boost_headers:=
...
@@ -587,8 +587,8 @@ gb_ExternalProject__use_boost_headers:=
else # !SYSTEM_BOOST
else # !SYSTEM_BOOST
$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
boost
_date_
time \
boost
date
time \
boost
_
system \
boostsystem \
))
))
ifeq ($(OS),WNT)
ifeq ($(OS),WNT)
...
@@ -608,30 +608,30 @@ endef
...
@@ -608,30 +608,30 @@ endef
endif # WNT
endif # WNT
define gb_LinkTarget__use_boost
_date_
time
define gb_LinkTarget__use_boost
date
time
$(call gb_LinkTarget_add_defs,$(1),\
$(call gb_LinkTarget_add_defs,$(1),\
-DBOOST_ALL_NO_LIB \
-DBOOST_ALL_NO_LIB \
)
)
$(call gb_LinkTarget_use_static_libraries,$(1),\
$(call gb_LinkTarget_use_static_libraries,$(1),\
boost
_date_
time \
boost
date
time \
)
)
endef
endef
define gb_LinkTarget__use_boost
_
system
define gb_LinkTarget__use_boostsystem
$(call gb_LinkTarget_add_defs,$(1),\
$(call gb_LinkTarget_add_defs,$(1),\
-DBOOST_ALL_NO_LIB \
-DBOOST_ALL_NO_LIB \
)
)
$(call gb_LinkTarget_use_static_libraries,$(1),\
$(call gb_LinkTarget_use_static_libraries,$(1),\
boost
_
system \
boostsystem \
)
)
endef
endef
define gb_ExternalProject__use_boost
_
system
define gb_ExternalProject__use_boostsystem
$(call gb_LinkTarget_use_static_libraries,$(1),boost
_
system)
$(call gb_LinkTarget_use_static_libraries,$(1),boostsystem)
endef
endef
define gb_LinkTarget__use_boost_headers
define gb_LinkTarget__use_boost_headers
...
...
boost/Module_boost.mk
Dosyayı görüntüle @
cdabc886
...
@@ -12,8 +12,8 @@ $(eval $(call gb_Module_Module,boost))
...
@@ -12,8 +12,8 @@ $(eval $(call gb_Module_Module,boost))
ifeq ($(SYSTEM_BOOST),NO)
ifeq ($(SYSTEM_BOOST),NO)
$(eval $(call gb_Module_add_targets,boost,\
$(eval $(call gb_Module_add_targets,boost,\
StaticLibrary_boost
_date_
time \
StaticLibrary_boost
date
time \
StaticLibrary_boost
_
system \
StaticLibrary_boostsystem \
UnpackedTarball_boost \
UnpackedTarball_boost \
))
))
...
...
boost/StaticLibrary_boost
_date_
time.mk
→
boost/StaticLibrary_boost
date
time.mk
Dosyayı görüntüle @
cdabc886
...
@@ -7,20 +7,20 @@
...
@@ -7,20 +7,20 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
#
$(eval $(call gb_StaticLibrary_StaticLibrary,boost
_date_
time))
$(eval $(call gb_StaticLibrary_StaticLibrary,boost
date
time))
$(eval $(call gb_StaticLibrary_set_warnings_not_errors,boost
_date_
time))
$(eval $(call gb_StaticLibrary_set_warnings_not_errors,boost
date
time))
# disable "auto link" "feature" on MSVC
# disable "auto link" "feature" on MSVC
$(eval $(call gb_StaticLibrary_add_defs,boost
_date_
time,\
$(eval $(call gb_StaticLibrary_add_defs,boost
date
time,\
-DBOOST_ALL_NO_LIB \
-DBOOST_ALL_NO_LIB \
))
))
$(eval $(call gb_StaticLibrary_use_external,boost
_date_
time,boost_headers))
$(eval $(call gb_StaticLibrary_use_external,boost
date
time,boost_headers))
$(eval $(call gb_StaticLibrary_set_generated_cxx_suffix,boost
_date_
time,cpp))
$(eval $(call gb_StaticLibrary_set_generated_cxx_suffix,boost
date
time,cpp))
$(eval $(call gb_StaticLibrary_add_generated_exception_objects,boost
_date_
time,\
$(eval $(call gb_StaticLibrary_add_generated_exception_objects,boost
date
time,\
UnpackedTarball/boost/libs/date_time/src/gregorian/date_generators \
UnpackedTarball/boost/libs/date_time/src/gregorian/date_generators \
UnpackedTarball/boost/libs/date_time/src/gregorian/gregorian_types \
UnpackedTarball/boost/libs/date_time/src/gregorian/gregorian_types \
UnpackedTarball/boost/libs/date_time/src/gregorian/greg_month \
UnpackedTarball/boost/libs/date_time/src/gregorian/greg_month \
...
...
boost/StaticLibrary_boost
_
system.mk
→
boost/StaticLibrary_boostsystem.mk
Dosyayı görüntüle @
cdabc886
...
@@ -7,20 +7,20 @@
...
@@ -7,20 +7,20 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
#
$(eval $(call gb_StaticLibrary_StaticLibrary,boost
_
system))
$(eval $(call gb_StaticLibrary_StaticLibrary,boostsystem))
$(eval $(call gb_StaticLibrary_set_warnings_not_errors,boost
_
system))
$(eval $(call gb_StaticLibrary_set_warnings_not_errors,boostsystem))
# disable "auto link" "feature" on MSVC
# disable "auto link" "feature" on MSVC
$(eval $(call gb_StaticLibrary_add_defs,boost
_
system,\
$(eval $(call gb_StaticLibrary_add_defs,boostsystem,\
-DBOOST_ALL_NO_LIB \
-DBOOST_ALL_NO_LIB \
))
))
$(eval $(call gb_StaticLibrary_use_external,boost
_
system,boost_headers))
$(eval $(call gb_StaticLibrary_use_external,boostsystem,boost_headers))
$(eval $(call gb_StaticLibrary_set_generated_cxx_suffix,boost
_
system,cpp))
$(eval $(call gb_StaticLibrary_set_generated_cxx_suffix,boostsystem,cpp))
$(eval $(call gb_StaticLibrary_add_generated_exception_objects,boost
_
system,\
$(eval $(call gb_StaticLibrary_add_generated_exception_objects,boostsystem,\
UnpackedTarball/boost/libs/system/src/error_code \
UnpackedTarball/boost/libs/system/src/error_code \
))
))
...
...
liborcus/ExternalProject_liborcus.mk
Dosyayı görüntüle @
cdabc886
...
@@ -13,7 +13,7 @@ $(eval $(call gb_ExternalProject_use_autoconf,liborcus,build))
...
@@ -13,7 +13,7 @@ $(eval $(call gb_ExternalProject_use_autoconf,liborcus,build))
$(eval $(call gb_ExternalProject_use_externals,liborcus, \
$(eval $(call gb_ExternalProject_use_externals,liborcus, \
boost_headers \
boost_headers \
boost
_
system \
boostsystem \
zlib \
zlib \
))
))
...
@@ -38,7 +38,7 @@ endif
...
@@ -38,7 +38,7 @@ endif
ifeq ($(SYSTEM_BOOST),YES)
ifeq ($(SYSTEM_BOOST),YES)
liborcus_LIBS+=$(BOOST_SYSTEM_LIB)
liborcus_LIBS+=$(BOOST_SYSTEM_LIB)
else
else
liborcus_LIBS+=$(SOLARLIB) -lboost
_
system
liborcus_LIBS+=$(SOLARLIB) -lboostsystem
endif
endif
ifeq ($(OS),ANDROID)
ifeq ($(OS),ANDROID)
liborcus_LIBS+=-lgnustl_shared -lm
liborcus_LIBS+=-lgnustl_shared -lm
...
...
m4/README
Dosyayı görüntüle @
cdabc886
m4 - Macros to locate and utilise pkg-config.
m4 - Macros to locate and utilise pkg-config.
The ax_*.m4 files are from GNU autoconf-archive, http://www.gnu.org/software/autoconf-archive/
work around m4 bracket stripping in MINGWSTRIP construction
\ No newline at end of file
work around m4 bracket stripping in MINGWSTRIP construction
m4/ax_boost_thread.m4
deleted
100644 → 0
Dosyayı görüntüle @
3aeecc52
# ===========================================================================
# http://www.gnu.org/software/autoconf-archive/ax_boost_thread.html
# ===========================================================================
#
# SYNOPSIS
#
# AX_BOOST_THREAD
#
# DESCRIPTION
#
# Test for Thread library from the Boost C++ libraries. The macro requires
# a preceding call to AX_BOOST_BASE. Further documentation is available at
# <http://randspringer.de/boost/index.html>.
#
# This macro calls:
#
# AC_SUBST(BOOST_THREAD_LIB)
#
# And sets:
#
# HAVE_BOOST_THREAD
#
# LICENSE
#
# Copyright (c) 2009 Thomas Porschberg <thomas@randspringer.de>
# Copyright (c) 2009 Michael Tindal
#
# Copying and distribution of this file, with or without modification, are
# permitted in any medium without royalty provided the copyright notice
# and this notice are preserved. This file is offered as-is, without any
# warranty.
#serial 27
AC_DEFUN([AX_BOOST_THREAD],
[
AC_ARG_WITH([boost-thread],
AS_HELP_STRING([--with-boost-thread@<:@=special-lib@:>@],
[use the Thread library from boost - it is possible to specify a certain library for the linker
e.g. --with-boost-thread=boost_thread-gcc-mt ]),
[
if test "$withval" = "no"; then
want_boost="no"
elif test "$withval" = "yes"; then
want_boost="yes"
ax_boost_user_thread_lib=""
else
want_boost="yes"
ax_boost_user_thread_lib="$withval"
fi
],
[want_boost="yes"]
)
if test "x$want_boost" = "xyes"; then
AC_REQUIRE([AC_PROG_CC])
AC_REQUIRE([AC_CANONICAL_BUILD])
CPPFLAGS_SAVED="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
export CPPFLAGS
LDFLAGS_SAVED="$LDFLAGS"
LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
export LDFLAGS
AC_CACHE_CHECK(whether the Boost::Thread library is available,
ax_cv_boost_thread,
[AC_LANG_PUSH([C++])
CXXFLAGS_SAVE=$CXXFLAGS
if test "x$host_os" = "xsolaris" ; then
CXXFLAGS="-pthreads $CXXFLAGS"
elif test "x$host_os" = "xmingw32" ; then
CXXFLAGS="-mthreads $CXXFLAGS"
else
CXXFLAGS="-pthread $CXXFLAGS"
fi
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@include <boost/thread/thread.hpp>]],
[[boost::thread_group thrds;
return 0;]])],
ax_cv_boost_thread=yes, ax_cv_boost_thread=no)
CXXFLAGS=$CXXFLAGS_SAVE
AC_LANG_POP([C++])
])
if test "x$ax_cv_boost_thread" = "xyes"; then
if test "x$host_os" = "xsolaris" ; then
BOOST_CPPFLAGS="-pthreads $BOOST_CPPFLAGS"
elif test "x$host_os" = "xmingw32" ; then
BOOST_CPPFLAGS="-mthreads $BOOST_CPPFLAGS"
else
BOOST_CPPFLAGS="-pthread $BOOST_CPPFLAGS"
fi
AC_SUBST(BOOST_CPPFLAGS)
AC_DEFINE(HAVE_BOOST_THREAD,,[define if the Boost::Thread library is available])
BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'`
LDFLAGS_SAVE=$LDFLAGS
case "x$host_os" in
*bsd* )
LDFLAGS="-pthread $LDFLAGS"
break;
;;
esac
if test "x$ax_boost_user_thread_lib" = "x"; then
for libextension in `ls -r $BOOSTLIBDIR/libboost_thread* 2>/dev/null | sed 's,.*/lib,,' | sed 's,\..*,,'`; do
ax_lib=${libextension}
AC_CHECK_LIB($ax_lib, exit,
[BOOST_THREAD_LIB="-l$ax_lib"; AC_SUBST(BOOST_THREAD_LIB) link_thread="yes"; break],
[link_thread="no"])
done
if test "x$link_thread" != "xyes"; then
for libextension in `ls -r $BOOSTLIBDIR/boost_thread* 2>/dev/null | sed 's,.*/,,' | sed 's,\..*,,'`; do
ax_lib=${libextension}
AC_CHECK_LIB($ax_lib, exit,
[BOOST_THREAD_LIB="-l$ax_lib"; AC_SUBST(BOOST_THREAD_LIB) link_thread="yes"; break],
[link_thread="no"])
done
fi
else
for ax_lib in $ax_boost_user_thread_lib boost_thread-$ax_boost_user_thread_lib; do
AC_CHECK_LIB($ax_lib, exit,
[BOOST_THREAD_LIB="-l$ax_lib"; AC_SUBST(BOOST_THREAD_LIB) link_thread="yes"; break],
[link_thread="no"])
done
fi
if test "x$ax_lib" = "x"; then
AC_MSG_ERROR(Could not find a version of the library!)
fi
if test "x$link_thread" = "xno"; then
AC_MSG_ERROR(Could not link against $ax_lib !)
else
case "x$host_os" in
*bsd* )
BOOST_LDFLAGS="-pthread $BOOST_LDFLAGS"
break;
;;
esac
fi
fi
CPPFLAGS="$CPPFLAGS_SAVED"
LDFLAGS="$LDFLAGS_SAVED"
fi
])
sc/Library_scfilt.mk
Dosyayı görüntüle @
cdabc886
...
@@ -28,7 +28,7 @@ $(eval $(call gb_Library_use_custom_headers,scfilt,\
...
@@ -28,7 +28,7 @@ $(eval $(call gb_Library_use_custom_headers,scfilt,\
$(eval $(call gb_Library_use_externals,scfilt,\
$(eval $(call gb_Library_use_externals,scfilt,\
boost_headers \
boost_headers \
boost
_
system \
boostsystem \
mdds_headers \
mdds_headers \
))
))
...
...
ucb/Library_ucpcmis1.mk
Dosyayı görüntüle @
cdabc886
...
@@ -27,7 +27,7 @@ $(eval $(call gb_Library_use_libraries,ucpcmis1,\
...
@@ -27,7 +27,7 @@ $(eval $(call gb_Library_use_libraries,ucpcmis1,\
$(eval $(call gb_Library_use_externals,ucpcmis1,\
$(eval $(call gb_Library_use_externals,ucpcmis1,\
boost_headers \
boost_headers \
boost
_date_
time \
boost
date
time \
cmis \
cmis \
curl \
curl \
libxml2 \
libxml2 \
...
...
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