smallsolar
/
kiwix-build
mirror of https://github.com/kiwix/kiwix-build.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #554 from kiwix/fix_kiwixbuild_linux_packaging

This commit is contained in:
Matthieu Gautier 2022-11-30 15:26:15 +01:00 committed by GitHub
parent 67a20fd576 ab2458c1c4
commit c99ad0b081
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.github/scripts/build_projects.py vendored
View File

@ -20,16 +20,16 @@ if (PLATFORM_TARGET.startswith("android_")
elif PLATFORM_TARGET.startswith("native_"): elif PLATFORM_TARGET.startswith("native_"):
if OS_NAME == "osx": if OS_NAME == "osx":
if PLATFORM_TARGET == "native_mixed": if PLATFORM_TARGET == "native_mixed":
TARGETS = ("libzim", ) TARGETS = ("libzim", "libkiwix")
else: else:
TARGETS = ("libzim", "zim-tools", "libkiwix") TARGETS = ("zim-tools", )
else: else:
if DESKTOP: if DESKTOP:
TARGETS = ("kiwix-desktop",) TARGETS = ("kiwix-desktop",)
elif PLATFORM_TARGET == "native_mixed": elif PLATFORM_TARGET == "native_mixed":
TARGETS = ("libzim",) TARGETS = ("libzim", "libkiwix")
else: else:
TARGETS = ("zim-tools", "libkiwix", "kiwix-tools") TARGETS = ("zim-tools", "kiwix-tools")
elif PLATFORM_TARGET in ("win32_static", "armhf_static", "armhf_dyn", "i586_static"): elif PLATFORM_TARGET in ("win32_static", "armhf_static", "armhf_dyn", "i586_static"):
TARGETS = ("kiwix-tools",) TARGETS = ("kiwix-tools",)
elif PLATFORM_TARGET == "flatpak": elif PLATFORM_TARGET == "flatpak":

9
.github/scripts/build_release_nightly.py vendored
View File

@ -26,14 +26,17 @@ if PLATFORM_TARGET.startswith("android_") or PLATFORM_TARGET.startswith("iOS"):
TARGETS = ("libzim", "libkiwix") TARGETS = ("libzim", "libkiwix")
elif PLATFORM_TARGET.startswith("native_"): elif PLATFORM_TARGET.startswith("native_"):
if OS_NAME == "osx": if OS_NAME == "osx":
TARGETS = ("libzim", ) if PLATFORM_TARGET == "native_mixed" else ("libzim", "zim-tools", "libkiwix") if PLATFORM_TARGET == "native_mixed":
TARGETS = ("libzim", "libkiwix")
else:
TARGETS = ("zim-tools", )
else: else:
if DESKTOP: if DESKTOP:
TARGETS = ("kiwix-desktop",) TARGETS = ("kiwix-desktop",)
elif PLATFORM_TARGET == "native_mixed": elif PLATFORM_TARGET == "native_mixed":
TARGETS = ("libzim",) TARGETS = ("libzim", "libkiwix")
else: else:
TARGETS = ("zim-tools", "libkiwix", "kiwix-tools") TARGETS = ("zim-tools", "kiwix-tools")
elif PLATFORM_TARGET in ("win32_static", "armhf_static", "i586_static"): elif PLATFORM_TARGET in ("win32_static", "armhf_static", "i586_static"):
TARGETS = ("kiwix-tools",) TARGETS = ("kiwix-tools",)
elif PLATFORM_TARGET == "flatpak": elif PLATFORM_TARGET == "flatpak":

2
kiwixbuild/dependencies/libkiwix.py
View File

@ -28,6 +28,8 @@ class Libkiwix(Dependency):
return '-Db_bitcode=true' return '-Db_bitcode=true'
if platformInfo.name == 'flatpak': if platformInfo.name == 'flatpak':
return '--wrap-mode=nodownload' return '--wrap-mode=nodownload'
if platformInfo.name == 'native_mixed' and option('target') == 'libkiwix':
return "-Dstatic-linkage=true"
return '' return ''
@property @property

7
kiwixbuild/platforms/native.py
View File

@ -52,10 +52,5 @@ class NativeMixed(NativePlatformInfo):
env['PATH'] = ':'.join([pj(static_install_dir, 'bin')] + [env['PATH']]) env['PATH'] = ':'.join([pj(static_install_dir, 'bin')] + [env['PATH']])
pkgconfig_path = pj(static_install_dir, static_buildEnv.libprefix, 'pkgconfig') pkgconfig_path = pj(static_install_dir, static_buildEnv.libprefix, 'pkgconfig')
env['PKG_CONFIG_PATH'] = ':'.join([env['PKG_CONFIG_PATH'], pkgconfig_path]) env['PKG_CONFIG_PATH'] = ':'.join([env['PKG_CONFIG_PATH'], pkgconfig_path])
return env
def set_comp_flags(self, env):
super().set_comp_flags(env)
static_platform = self.get_platform('native_static')
static_install_dir = static_platform.buildEnv.install_dir
env['CPPFLAGS'] = " ".join(['-I'+pj(static_install_dir, 'include'), env['CPPFLAGS']]) env['CPPFLAGS'] = " ".join(['-I'+pj(static_install_dir, 'include'), env['CPPFLAGS']])
return env