Commit edf578d8 authored by Tudor Bosman's avatar Tudor Bosman Committed by Anton Likhtarov

More opensource build fixes

Summary:
- libtool version
- get rid of tiny libraries
- add folly/gen and a bunch of stuff from experimental

Test Plan: built, built a program against it in a ubuntu vm

Reviewed By: davejwatson@fb.com

Subscribers: folly@lists, fugalh

FB internal diff: D1339920
parent 253dd087
...@@ -100,10 +100,12 @@ ...@@ -100,10 +100,12 @@
#include "folly/Malloc.h" #include "folly/Malloc.h"
#include "folly/Hash.h" #include "folly/Hash.h"
#if FOLLY_HAVE_DEPRECATED_ASSOC
#ifdef _GLIBCXX_SYMVER #ifdef _GLIBCXX_SYMVER
#include <ext/hash_set> #include <ext/hash_set>
#include <ext/hash_map> #include <ext/hash_map>
#endif #endif
#endif
#endif #endif
...@@ -2488,6 +2490,7 @@ struct hash< ::folly::fbstring> { ...@@ -2488,6 +2490,7 @@ struct hash< ::folly::fbstring> {
} }
#if FOLLY_HAVE_DEPRECATED_ASSOC
#if defined(_GLIBCXX_SYMVER) && !defined(__BIONIC__) #if defined(_GLIBCXX_SYMVER) && !defined(__BIONIC__)
namespace __gnu_cxx { namespace __gnu_cxx {
...@@ -2507,6 +2510,8 @@ struct hash< ::folly::fbstring> { ...@@ -2507,6 +2510,8 @@ struct hash< ::folly::fbstring> {
} }
#endif // _GLIBCXX_SYMVER && !__BIONIC__ #endif // _GLIBCXX_SYMVER && !__BIONIC__
#endif // FOLLY_HAVE_DEPRECATED_ASSOC
#endif // _LIBSTDCXX_FBSTRING #endif // _LIBSTDCXX_FBSTRING
#pragma GCC diagnostic pop #pragma GCC diagnostic pop
......
...@@ -6,13 +6,14 @@ CLEANFILES = ...@@ -6,13 +6,14 @@ CLEANFILES =
noinst_PROGRAMS = generate_fingerprint_tables noinst_PROGRAMS = generate_fingerprint_tables
generate_fingerprint_tables_SOURCES = build/GenerateFingerprintTables.cpp generate_fingerprint_tables_SOURCES = build/GenerateFingerprintTables.cpp
generate_fingerprint_tables_LDADD = libfolly.la generate_fingerprint_tables_LDADD = libfollybase.la
noinst_LTLIBRARIES = \
libfollybase.la
lib_LTLIBRARIES = \ lib_LTLIBRARIES = \
libfolly.la \ libfolly.la \
libfollybenchmark.la \ libfollybenchmark.la
libfollytimeout_queue.la \
libfollyfingerprint.la
follyincludedir = $(includedir)/folly follyincludedir = $(includedir)/folly
...@@ -62,18 +63,35 @@ nobase_follyinclude_HEADERS = \ ...@@ -62,18 +63,35 @@ nobase_follyinclude_HEADERS = \
dynamic.h \ dynamic.h \
dynamic-inl.h \ dynamic-inl.h \
Exception.h \ Exception.h \
ExceptionWrapper.h \
experimental/Bits.h \
experimental/EliasFanoCoding.h \
experimental/EventCount.h \
experimental/io/FsUtil.h \
FBString.h \ FBString.h \
FBVector.h \ FBVector.h \
File.h \ File.h \
FileUtil.h \ FileUtil.h \
Fingerprint.h \ Fingerprint.h \
folly-config.h \ folly-config.h \
Exception.h \
ExceptionWrapper.h \
Foreach.h \ Foreach.h \
FormatArg.h \ FormatArg.h \
Format.h \ Format.h \
Format-inl.h \ Format-inl.h \
gen/Base.h \
gen/Base-inl.h \
gen/Combine.h \
gen/Combine-inl.h \
gen/Core.h \
gen/Core-inl.h \
gen/File.h \
gen/File-inl.h \
gen/Parallel.h \
gen/Parallel-inl.h \
gen/ParallelMap.h \
gen/ParallelMap-inl.h \
gen/String.h \
gen/String-inl.h \
GroupVarint.h \ GroupVarint.h \
Hash.h \ Hash.h \
IPAddress.h \ IPAddress.h \
...@@ -177,17 +195,24 @@ GroupVarintTables.cpp: build/generate_varint_tables.py ...@@ -177,17 +195,24 @@ GroupVarintTables.cpp: build/generate_varint_tables.py
build/generate_varint_tables.py build/generate_varint_tables.py
CLEANFILES += GroupVarintTables.cpp CLEANFILES += GroupVarintTables.cpp
libfolly_la_SOURCES = \ libfollybase_la_SOURCES = \
Bits.cpp \
Conv.cpp \ Conv.cpp \
Demangle.cpp \ Demangle.cpp \
EscapeTables.cpp \
Format.cpp \
FormatTables.cpp \
Malloc.cpp \
Range.cpp \
String.cpp \
Unicode.cpp
libfolly_la_SOURCES = \
Bits.cpp \
detail/CacheLocality.cpp \ detail/CacheLocality.cpp \
dynamic.cpp \ dynamic.cpp \
EscapeTables.cpp \
File.cpp \ File.cpp \
FileUtil.cpp \ FileUtil.cpp \
Format.cpp \ FingerprintTables.cpp \
FormatTables.cpp \
detail/Futex.cpp \ detail/Futex.cpp \
GroupVarint.cpp \ GroupVarint.cpp \
GroupVarintTables.cpp \ GroupVarintTables.cpp \
...@@ -202,58 +227,53 @@ libfolly_la_SOURCES = \ ...@@ -202,58 +227,53 @@ libfolly_la_SOURCES = \
io/async/EventBase.cpp \ io/async/EventBase.cpp \
io/async/EventHandler.cpp \ io/async/EventHandler.cpp \
io/async/Request.cpp \ io/async/Request.cpp \
experimental/io/HugePages.cpp \
json.cpp \ json.cpp \
detail/MallocImpl.cpp \
detail/MemoryIdler.cpp \ detail/MemoryIdler.cpp \
MacAddress.cpp \ MacAddress.cpp \
Malloc.cpp \
MemoryMapping.cpp \ MemoryMapping.cpp \
Random.cpp \ Random.cpp \
Range.cpp \
SafeAssert.cpp \ SafeAssert.cpp \
SpookyHashV1.cpp \ SpookyHashV1.cpp \
SpookyHashV2.cpp \ SpookyHashV2.cpp \
stats/Instantiations.cpp \ stats/Instantiations.cpp \
String.cpp \
Subprocess.cpp \ Subprocess.cpp \
ThreadCachedArena.cpp \ ThreadCachedArena.cpp \
TimeoutQueue.cpp \ TimeoutQueue.cpp \
Unicode.cpp \
Uri.cpp \ Uri.cpp \
wangle/InlineExecutor.cpp \ wangle/InlineExecutor.cpp \
wangle/ManualExecutor.cpp \ wangle/ManualExecutor.cpp \
wangle/ThreadGate.cpp wangle/ThreadGate.cpp \
experimental/io/FsUtil.cpp
if HAVE_LINUX
nobase_follyinclude_HEADERS += \
experimental/io/HugePages.h
libfolly_la_SOURCES += \
experimental/io/HugePages.cpp
endif
if !HAVE_LINUX if !HAVE_LINUX
nobase_follyinclude_HEADERS += detail/Clock.h nobase_follyinclude_HEADERS += detail/Clock.h
libfolly_la_SOURCES += detail/Clock.cpp libfollybase_la_SOURCES += detail/Clock.cpp
endif endif
if !HAVE_WEAK_SYMBOLS if !HAVE_WEAK_SYMBOLS
libfolly_la_SOURCES += detail/MallocImpl.cpp libfollybase_la_SOURCES += detail/MallocImpl.cpp
endif endif
if !HAVE_BITS_FUNCTEXCEPT if !HAVE_BITS_FUNCTEXCEPT
libfolly_la_SOURCES += detail/FunctionalExcept.cpp libfollybase_la_SOURCES += detail/FunctionalExcept.cpp
endif endif
libfollybase_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(LT_VERSION)
libfolly_la_LIBADD = libfollybase.la
libfolly_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(LT_VERSION) libfolly_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(LT_VERSION)
FingerprintTables.cpp: generate_fingerprint_tables FingerprintTables.cpp: generate_fingerprint_tables
./generate_fingerprint_tables ./generate_fingerprint_tables
CLEANFILES += FingerprintTables.cpp CLEANFILES += FingerprintTables.cpp
libfollyfingerprint_la_SOURCES = \
FingerprintTables.cpp
libfollyfingerprint_la_LIBADD = libfolly.la
libfollyfingerprint_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(LT_VERSION)
libfollybenchmark_la_SOURCES = Benchmark.cpp libfollybenchmark_la_SOURCES = Benchmark.cpp
libfollybenchmark_la_LIBADD = libfolly.la libfollybenchmark_la_LIBADD = libfolly.la
libfollybenchmark_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(LT_VERSION) libfollybenchmark_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(LT_VERSION)
libfollytimeout_queue_la_SOURCES = TimeoutQueue.cpp
libfollytimeout_queue_la_LIBADD = libfolly.la
libfollytimeout_queue_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(LT_VERSION)
...@@ -21,10 +21,12 @@ ...@@ -21,10 +21,12 @@
#include <string> #include <string>
#include <boost/type_traits.hpp> #include <boost/type_traits.hpp>
#ifdef FOLLY_HAVE_DEPRECATED_ASSOC
#ifdef _GLIBCXX_SYMVER #ifdef _GLIBCXX_SYMVER
#include <ext/hash_set> #include <ext/hash_set>
#include <ext/hash_map> #include <ext/hash_map>
#endif #endif
#endif
#include <unordered_set> #include <unordered_set>
#include <unordered_map> #include <unordered_map>
...@@ -518,6 +520,7 @@ struct hash<std::basic_string<C> > : private hash<const C*> { ...@@ -518,6 +520,7 @@ struct hash<std::basic_string<C> > : private hash<const C*> {
} }
#if FOLLY_HAVE_DEPRECATED_ASSOC
#if defined(_GLIBCXX_SYMVER) && !defined(__BIONIC__) #if defined(_GLIBCXX_SYMVER) && !defined(__BIONIC__)
namespace __gnu_cxx { namespace __gnu_cxx {
...@@ -530,6 +533,7 @@ struct hash<std::basic_string<C> > : private hash<const C*> { ...@@ -530,6 +533,7 @@ struct hash<std::basic_string<C> > : private hash<const C*> {
} }
#endif #endif
#endif
// Hook into boost's type traits // Hook into boost's type traits
namespace boost { namespace boost {
......
...@@ -20,6 +20,13 @@ AM_INIT_AUTOMAKE([foreign dist-bzip2 nostdinc subdir-objects]) ...@@ -20,6 +20,13 @@ AM_INIT_AUTOMAKE([foreign dist-bzip2 nostdinc subdir-objects])
AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_MACRO_DIR([m4])
AX_CONFIG_FEATURE_DEFAULT_DISABLED
AX_CONFIG_FEATURE(
[deprecated-assoc],
[supports deprecated associative containers (hash_map/hash_set)],
[HAVE_DEPRECATED_ASSOC],
[Define if you want to support deprecated associative containers])
AC_PROG_INSTALL AC_PROG_INSTALL
AM_PROG_LIBTOOL AM_PROG_LIBTOOL
......
# ===========================================================================
# http://www.gnu.org/software/autoconf-archive/ax_config_feature.html
# ===========================================================================
#
# SYNOPSIS
#
# AX_CONFIG_FEATURE(FEATURE-NAME, FEATURE-DESCRIPTION, DEFINE, DEFINE-DESCRIPTION, [ACTION-IF-ENABLED [, ACTION-IF-NOT-ENABLED]])
#
# DESCRIPTION
#
# AX_CONFIG_FEATURE is a simple wrapper for AC_ARG_ENABLE, it enables the
# feature FEATURE-NAME and AC_DEFINEs the passed DEFINE, depending on the
# user choice. DESCRIPTION will be used for AC_DEFINEs. ACTION-IF-ENABLED
# and ACTION-IF-NOT-ENABLED are the actions that will be run. A feature is
# enabled by default, in order to change this behaviour use the
# AX_CONFIG_FEATURE_DEFAULT_ENABLED and AX_CONFIG_FEATURE_DEFAULT_DISABLED
# macros.
#
# A simple example:
#
# AX_CONFIG_FEATURE_DEFAULT_ENABLED
# AX_CONFIG_FEATURE(feature_xxxxx, [turns on/off XXXXX support],
# HAVE_XXXXX, [Define if you want XXXXX support])
#
# ...
#
# AX_CONFIG_FEATURE_DEFAULT_DISABLED
# AX_CONFIG_FEATURE(feature_yyyyy, [turns on/off YYYYY support],
# HAVE_YYYYY, [Define if you want YYYYY support],
# [enable_yyyyy="yes"], [enable_yyyyy="no"])
# AM_CONDITIONAL(YYYYY, [test "$enable_yyyyy" = "yes"])
#
# AX_CONFIG_FEATURE_DEFAULT_ENABLED
# AX_CONFIG_FEATURE(...)
#
# ...
#
# If you have lot of features and you want a verbose dumping of each user
# selection use AX_CONFIG_FEATURE_VERBOSE. Use AX_CONFIG_FEATURE_SILENT in
# order to remove a previously AX_CONFIG_FEATURE_VERBOSE. By default
# features are silent.
#
# Use AX_CONFIG_FEATURE_ENABLE or AX_CONFIG_FEATURE_DISABLE in order to
# enable or disable a specific feature.
#
# Another simple example:
#
# AS_IF([some_test_here],[AX_CONFIG_FEATURE_ENABLE(feature_xxxxx)],[])
#
# AX_CONFIG_FEATURE(feature_xxxxx, [turns on/off XXXXX support],
# HAVE_XXXXX, [Define if you want XXXXX support])
# AX_CONFIG_FEATURE(feature_yyyyy, [turns on/off YYYYY support],
# HAVE_YYYYY, [Define if you want YYYYY support],
# [enable_yyyyy="yes"], [enable_yyyyy="no"])
#
# ...
#
# NOTE: AX_CONFIG_FEATURE_ENABLE() must be placed first of the relative
# AX_CONFIG_FEATURE() macro ...
#
# LICENSE
#
# Copyright (c) 2008 Francesco Salvestrini <salvestrini@users.sourceforge.net>
#
# This program is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by the
# Free Software Foundation; either version 2 of the License, or (at your
# option) any later version.
#
# This program is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
# Public License for more details.
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see <http://www.gnu.org/licenses/>.
#
# As a special exception, the respective Autoconf Macro's copyright owner
# gives unlimited permission to copy, distribute and modify the configure
# scripts that are the output of Autoconf when processing the Macro. You
# need not follow the terms of the GNU General Public License when using
# or distributing such scripts, even though portions of the text of the
# Macro appear in them. The GNU General Public License (GPL) does govern
# all other use of the material that constitutes the Autoconf Macro.
#
# This special exception to the GPL applies to versions of the Autoconf
# Macro released by the Autoconf Archive. When you make and distribute a
# modified version of the Autoconf Macro, you may extend this special
# exception to the GPL to apply to your modified version as well.
#serial 10
AC_DEFUN([AX_CONFIG_FEATURE],[ dnl
m4_pushdef([FEATURE], patsubst([$1], -, _))dnl
AC_ARG_ENABLE([$1],AS_HELP_STRING([--enable-$1],[$2]),[
case "${enableval}" in
yes)
ax_config_feature_[]FEATURE[]="yes"
;;
no)
ax_config_feature_[]FEATURE[]="no"
;;
*)
AC_MSG_ERROR([bad value ${enableval} for feature --$1])
;;
esac
])
AS_IF([test "$ax_config_feature_[]FEATURE[]" = yes],[ dnl
AC_DEFINE([$3])
$5
AS_IF([test "$ax_config_feature_verbose" = yes],[ dnl
AC_MSG_NOTICE([Feature $1 is enabled])
])
],[ dnl
$6
AS_IF([test "$ax_config_feature_verbose" = yes],[ dnl
AC_MSG_NOTICE([Feature $1 is disabled])
])
])
AH_TEMPLATE([$3],[$4])
m4_popdef([FEATURE])dnl
])
dnl Feature global
AC_DEFUN([AX_CONFIG_FEATURE_VERBOSE],[ dnl
ax_config_feature_verbose=yes
])
dnl Feature global
AC_DEFUN([AX_CONFIG_FEATURE_SILENT],[ dnl
ax_config_feature_verbose=no
])
dnl Feature specific
AC_DEFUN([AX_CONFIG_FEATURE_DEFAULT_ENABLED], [
ax_config_feature_[]FEATURE[]_default=yes
])
dnl Feature specific
AC_DEFUN([AX_CONFIG_FEATURE_DEFAULT_DISABLED], [
ax_config_feature_[]FEATURE[]_default=no
])
dnl Feature specific
AC_DEFUN([AX_CONFIG_FEATURE_ENABLE],[ dnl
ax_config_feature_[]patsubst([$1], -, _)[]=yes
])
dnl Feature specific
AC_DEFUN([AX_CONFIG_FEATURE_DISABLE],[ dnl
ax_config_feature_[]patsubst([$1], -, _)[]=no
])
...@@ -14,7 +14,7 @@ TESTS= \ ...@@ -14,7 +14,7 @@ TESTS= \
bits_test \ bits_test \
bit_iterator_test bit_iterator_test
lib_LTLIBRARIES = libgtestmain.la libgtest.la noinst_LTLIBRARIES = libgtestmain.la libgtest.la
libgtestmain_la_CPPFLAGS = -Igtest-1.6.0 -Igtest-1.6.0/src libgtestmain_la_CPPFLAGS = -Igtest-1.6.0 -Igtest-1.6.0/src
libgtestmain_la_SOURCES = gtest-1.6.0/src/gtest-all.cc gtest-1.6.0/src/gtest_main.cc libgtestmain_la_SOURCES = gtest-1.6.0/src/gtest-all.cc gtest-1.6.0/src/gtest_main.cc
...@@ -92,7 +92,7 @@ scope_guard_test_LDADD = libgtestmain.la $(top_builddir)/libfolly.la ...@@ -92,7 +92,7 @@ scope_guard_test_LDADD = libgtestmain.la $(top_builddir)/libfolly.la
TESTS += scope_guard_test TESTS += scope_guard_test
timeout_queue_test_SOURCES = TimeoutQueueTest.cpp timeout_queue_test_SOURCES = TimeoutQueueTest.cpp
timeout_queue_test_LDADD = libgtestmain.la $(top_builddir)/libfollytimeout_queue.la timeout_queue_test_LDADD = libgtestmain.la $(top_builddir)/libfolly.la
conv_test_SOURCES = ConvTest.cpp conv_test_SOURCES = ConvTest.cpp
conv_test_LDADD = libgtestmain.la $(top_builddir)/libfollybenchmark.la $(top_builddir)/libfolly.la conv_test_LDADD = libgtestmain.la $(top_builddir)/libfollybenchmark.la $(top_builddir)/libfolly.la
...@@ -159,7 +159,7 @@ format_test_LDADD = libgtest.la $(top_builddir)/libfolly.la $(top_builddir)/libf ...@@ -159,7 +159,7 @@ format_test_LDADD = libgtest.la $(top_builddir)/libfolly.la $(top_builddir)/libf
TESTS += format_test TESTS += format_test
fingerprint_test_SOURCES = FingerprintTest.cpp fingerprint_test_SOURCES = FingerprintTest.cpp
fingerprint_test_LDADD = libgtest.la $(top_builddir)/libfolly.la $(top_builddir)/libfollyfingerprint.la $(top_builddir)/libfollybenchmark.la fingerprint_test_LDADD = libgtest.la $(top_builddir)/libfolly.la $(top_builddir)/libfollybenchmark.la
TESTS += fingerprint_test TESTS += fingerprint_test
portability_test_SOURCES = PortabilityTest.cpp portability_test_SOURCES = PortabilityTest.cpp
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment