diff --git a/kiwixbuild/dependencies/base.py b/kiwixbuild/dependencies/base.py index c8ee4ed..e6d0f94 100644 --- a/kiwixbuild/dependencies/base.py +++ b/kiwixbuild/dependencies/base.py @@ -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 diff --git a/kiwixbuild/dependencies/kiwix_desktop.py b/kiwixbuild/dependencies/kiwix_desktop.py index 08ac4b4..1b62763 100644 --- a/kiwixbuild/dependencies/kiwix_desktop.py +++ b/kiwixbuild/dependencies/kiwix_desktop.py @@ -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): diff --git a/kiwixbuild/dependencies/uuid.py b/kiwixbuild/dependencies/uuid.py index df3c330..5034126 100644 --- a/kiwixbuild/dependencies/uuid.py +++ b/kiwixbuild/dependencies/uuid.py @@ -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' diff --git a/kiwixbuild/dependencies/xapian.py b/kiwixbuild/dependencies/xapian.py index a9ec63f..b101899 100644 --- a/kiwixbuild/dependencies/xapian.py +++ b/kiwixbuild/dependencies/xapian.py @@ -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 diff --git a/kiwixbuild/versions.py b/kiwixbuild/versions.py index 0f5ce77..0a0dbff 100644 --- a/kiwixbuild/versions.py +++ b/kiwixbuild/versions.py @@ -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',