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

zlib

This commit is contained in:
Matthieu Gautier 2020-09-28 19:01:15 +02:00
parent 3129904f35
commit d97b4767a2
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
kiwixbuild/dependencies/zlib.py
View File

@ -6,7 +6,7 @@ from .base import (
MakeBuilder) MakeBuilder)
from kiwixbuild.utils import Remotefile, pj, SkipCommand from kiwixbuild.utils import Remotefile, pj, SkipCommand
from kiwixbuild._global import neutralEnv
class zlib(Dependency): class zlib(Dependency):
@ -29,13 +29,13 @@ class zlib(Dependency):
def _configure(self, context): def _configure(self, context):
if self.buildEnv.platformInfo.build == 'win32': if self.buildEnv.platformInfo.build == 'win32' or neutralEnv('distname') == 'Windows':
raise SkipCommand() raise SkipCommand()
return super()._configure(context) return super()._configure(context)
@property @property
def make_option(self): def make_option(self):
if self.buildEnv.platformInfo.build == 'win32': if self.buildEnv.platformInfo.build == 'win32' or neutralEnv('distname') == 'Windows':
return "--makefile win32/Makefile.gcc PREFIX={host}- SHARED_MODE={static} INCLUDE_PATH={include_path} LIBRARY_PATH={library_path} BINARY_PATH={binary_path}".format( return "--makefile win32/Makefile.gcc PREFIX={host}- SHARED_MODE={static} INCLUDE_PATH={include_path} LIBRARY_PATH={library_path} BINARY_PATH={binary_path}".format(
host='i686-w64-mingw32', host='i686-w64-mingw32',
static="0" if self.buildEnv.platformInfo.static else "1", static="0" if self.buildEnv.platformInfo.static else "1",