Merge pull request #420 from kiwix/O3_compilation

Build all make based dependency using -O3 option.
This commit is contained in:
Matthieu Gautier 2020-03-24 17:21:11 +01:00 committed by GitHub
commit 20394d341f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 4 deletions

View File

@ -303,7 +303,10 @@ class MakeBuilder(Builder):
make_option = ""
install_option = ""
configure_script = "configure"
configure_env = None
configure_env = {
'_format_CFLAGS' : '{env[CFLAGS]} -O3',
'_format_CXXFLAGS': '{env[CXXFLAGS]} -O3'
}
make_target = ""
flatpak_buildsystem = None

View File

@ -13,6 +13,7 @@ class KiwixDesktop(Dependency):
class Builder(QMakeBuilder):
dependencies = ["qt", "qtwebengine", "kiwix-lib", "aria2", "kiwix-tools"]
make_install_target = 'install'
configure_env = None
@property
def configure_option(self):

View File

@ -19,7 +19,7 @@ class UUID(Dependency):
class Builder(MakeBuilder):
configure_option = ("--enable-libuuid --disable-debugfs --disable-imager --disable-resizer --disable-defrag --enable-fsck"
" --disable-uuidd")
configure_env = {'_format_CFLAGS': "{env.CFLAGS} -fPIC"}
configure_env = {'_format_CFLAGS': "{env.CFLAGS} -O3 -fPIC"}
static_configure_option = dynamic_configure_option = ""
make_target = 'libs'
make_install_target = 'install-libs'

View File

@ -23,7 +23,7 @@ class Xapian(Dependency):
class Builder(MakeBuilder):
configure_option = "--disable-sse --disable-backend-chert --disable-backend-remote --disable-backend-inmemory --disable-documentation"
configure_env = {'_format_LDFLAGS': "{env.LDFLAGS} -L{buildEnv.install_dir}/{buildEnv.libprefix}",
'_format_CXXFLAGS': "{env.CXXFLAGS} -I{buildEnv.install_dir}/include"}
'_format_CXXFLAGS': "{env.CXXFLAGS} -O3 -I{buildEnv.install_dir}/include"}
@classmethod

View File

@ -42,7 +42,7 @@ release_versions = {
# This is the "version" of the whole base_deps_versions dict.
# Change this when you change base_deps_versions.
base_deps_meta_version = '63'
base_deps_meta_version = '64'
base_deps_versions = {
'zlib' : '1.2.8',