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 #407 from kiwix/rgaudin/libmicrohttp 

switch to older version of libmicrohttpd
This commit is contained in:
Matthieu Gautier 2020-02-12 14:44:14 +01:00 committed by GitHub
parent 29956ee6be b790c00187
commit a88706e78e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/base.yml vendored
View File

@ -103,7 +103,7 @@ jobs:
shell: bash shell: bash
run: | run: |
cd $HOME cd $HOME
git clone https://github.com/${REP} --depth=1 --branch ${GITHUB_REF##*/} git clone https://github.com/${REP} --depth=1 --branch ${GITHUB_REF##*heads/}
pip3 install --user --no-deps ./${REP##*/} pip3 install --user --no-deps ./${REP##*/}
env: env:
REP: ${{github.repository}} REP: ${{github.repository}}

2
kiwixbuild/dependencies/base.py
View File

@ -324,7 +324,7 @@ class MakeBuilder(Builder):
env['CFLAGS'] = env['CFLAGS'] + ' -fPIC' env['CFLAGS'] = env['CFLAGS'] + ' -fPIC'
env['CXXFLAGS'] = env['CXXFLAGS'] + ' -fPIC' env['CXXFLAGS'] = env['CXXFLAGS'] + ' -fPIC'
if self.configure_env: if self.configure_env:
for k in self.configure_env: for k in list(self.configure_env):
if k.startswith('_format_'): if k.startswith('_format_'):
v = self.configure_env.pop(k) v = self.configure_env.pop(k)
v = v.format(buildEnv=self.buildEnv, env=env) v = v.format(buildEnv=self.buildEnv, env=env)

6
kiwixbuild/dependencies/libmicrohttpd.py
View File

@ -9,9 +9,9 @@ class MicroHttpd(Dependency):
name = "libmicrohttpd" name = "libmicrohttpd"
class Source(ReleaseDownload): class Source(ReleaseDownload):
archive = Remotefile('libmicrohttpd-0.9.69.tar.gz', archive = Remotefile('libmicrohttpd-0.9.63.tar.gz',
'fb9b6b148b787493e637d3083588711e65cbcb726fa02cee2cd543c5de27e37e', '37c36f1be177f0e37ef181a645cd3baac1000bd322a01c2eff70f3cc8c91749c',
'https://ftp.gnu.org/gnu/libmicrohttpd/libmicrohttpd-0.9.69.tar.gz') 'https://ftp.gnu.org/gnu/libmicrohttpd/libmicrohttpd-0.9.63.tar.gz')
class Builder(MakeBuilder): class Builder(MakeBuilder):
configure_option = "--disable-https --without-libgcrypt --without-libcurl --disable-doc --disable-examples" configure_option = "--disable-https --without-libgcrypt --without-libcurl --disable-doc --disable-examples"

4
kiwixbuild/versions.py
View File

@ -42,7 +42,7 @@ release_versions = {
# This is the "version" of the whole base_deps_versions dict. # This is the "version" of the whole base_deps_versions dict.
# Change this when you change base_deps_versions. # Change this when you change base_deps_versions.
base_deps_meta_version = '59' base_deps_meta_version = '60'
base_deps_versions = { base_deps_versions = {
'zlib' : '1.2.8', 'zlib' : '1.2.8',
@ -51,7 +51,7 @@ base_deps_versions = {
'xapian-core' : '1.4.14', 'xapian-core' : '1.4.14',
'mustache' : '3.2', 'mustache' : '3.2',
'pugixml' : '1.2', 'pugixml' : '1.2',
'libmicrohttpd' : '0.9.69', 'libmicrohttpd' : '0.9.63',
'gumbo' : '0.10.1', 'gumbo' : '0.10.1',
'icu4c' : '58.2', 'icu4c' : '58.2',
'libaria2' : '1.33.1', 'libaria2' : '1.33.1',