Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade depends - OpenSSL to 1.1.1d #1581

Merged
merged 4 commits into from
Oct 29, 2019
Merged

Upgrade depends - OpenSSL to 1.1.1d #1581

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
002c068
Add bzip2.mk and libzip.mk depends recipes
jamescowens Oct 29, 2019
f4858c7
Corrections to depends and .travis.yml
jamescowens Oct 28, 2019
081b23e
Upgrade OpenSSL to 1.1.1d for depends and remove openssl
jamescowens Oct 29, 2019
fae070c
Also disable OpenSSL in default Qt (5.7.1)
jamescowens Oct 29, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Add bzip2.mk and libzip.mk depends recipes
  • Loading branch information
@jamescowens
jamescowens committed Oct 29, 2019
commit 002c0681d1d9e2553bd14a11a65fb717ab53e75c
35 changes: 35 additions & 0 deletions depends/packages/bzip2.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
package=bzip2
$(package)_version=1.0.8
$(package)_download_path=https://sourceware.org/pub/bzip2/
$(package)_file_name=$(package)-$($(package)_version).tar.gz
$(package)_sha256_hash=ab5a03176ee106d3f0fa90e381da478ddae405918153cca248e682cd0c4a2269
$(package)_patches=Makefile.patch

define $(package)_set_vars
$(package)_build_opts= CC="$($(package)_cc)"
$(package)_build_opts+=CFLAGS="$($(package)_cflags) $($(package)_cppflags) -fPIC"
$(package)_build_opts+=RANLIB="$($(package)_ranlib)"
$(package)_build_opts+=AR="$($(package)_ar)"
$(package)_build_opts_darwin+=AR="$($(package)_libtool)"
$(package)_build_opts_darwin+=ARFLAGS="-o"
$(package)_cxxflags_aarch64_linux = $(GCCFLAGS)
$(package)_cflags_aarch64_linux = $(GCCFLAGS)
$(package)_cxxflags_arm_linux = $(GCCFLAGS)
$(package)_cflags_arm_linux = $(GCCFLAGS)
endef

define $(package)_preprocess_cmds
patch -p0 < $($(package)_patch_dir)/Makefile.patch
endef

define $(package)_config_cmds
endef

define $(package)_build_cmds
$($(package)_build_opts) $(MAKE) install PREFIX=local_build
endef

define $(package)_stage_cmds
cp -a local_build/. $($(package)_staging_dir)/$(host_prefix)
endef

46 changes: 46 additions & 0 deletions depends/packages/libzip.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
package=libzip
$(package)_version=1.3.2
$(package)_download_path=https://libzip.org/download/
$(package)_file_name=$(package)-$($(package)_version).tar.gz
$(package)_sha256_hash=ab4c34eb6c3a08b678cd0f2450a6c57a13e9618b1ba34ee45d00eb5327316457
$(package)_dependencies=zlib bzip2
$(package)_patches=nonrandomopentest.c.patch


define $(package)_set_vars
$(package)_build_opts= CC="$($(package)_cc)"
$(package)_build_opts+=CFLAGS="$($(package)_cflags) $($(package)_cppflags) -fPIC"
$(package)_build_opts+=RANLIB="$($(package)_ranlib)"
$(package)_build_opts+=AR="$($(package)_ar)"
$(package)_build_opts_darwin+=AR="$($(package)_libtool)"
$(package)_build_opts_darwin+=ARFLAGS="-o"
$(package)_cxxflags_aarch64_linux = $(GCCFLAGS)
$(package)_cflags_aarch64_linux = $(GCCFLAGS)
$(package)_cxxflags_arm_linux = $(GCCFLAGS)
$(package)_cflags_arm_linux = $(GCCFLAGS)
endef

ifeq ($(host),i686-pc-linux-gnu)
i686_cflag="$($(package)_cflags) $($(package)_cppflags) -fPIC -m32"
else
i686_cflag="$($(package)_cflags) $($(package)_cppflags) -fPIC"
endif


define $(package)_preprocess_cmds
sed -i.old 's/\# ifdef _WIN32/\# if defined _WIN32 \&\& defined ZIP_DLL/' lib/zip.h && \
patch -p1 < $($(package)_patch_dir)/nonrandomopentest.c.patch
endef

define $(package)_config_cmds
CFLAGS=$(i686_cflag) ./configure --host=$(host) --prefix=$(host_prefix) --with-zlib=$(host_prefix) --with-bzip2=$(host_prefix) --with-pic --enable-static --enable-shared=no
endef

define $(package)_build_cmds
$(MAKE)
endef

define $(package)_stage_cmds
$(MAKE) DESTDIR=$($(package)_staging_dir) install
endef