Skip to content
Snippets Groups Projects
Commit f788b34a authored by Adrien Béraud's avatar Adrien Béraud
Browse files

contrib: download openbsd libressl dependency in tarballs

Change-Id: I6bb81df5958402b26699fd4c1bebab61a3799419
parent 5121a8d0
Branches
No related tags found
No related merge requests found
From 2fb64a2af2e3519feee18959e260ec90bcbd1f56 Mon Sep 17 00:00:00 2001
From: Adrien Beraud <adrien.beraud@savoirfairelinux.com>
Date: Fri, 6 Apr 2018 22:39:08 -0400
Subject: [PATCH] build: don't fetch git tag if openbsd directory exists
---
update.sh | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/update.sh b/update.sh
index 9e9ace6..b064154 100755
--- a/update.sh
+++ b/update.sh
@@ -11,11 +11,11 @@ if [ ! -d openbsd ]; then
else
git clone $LIBRESSL_GIT/openbsd
fi
+ (cd openbsd
+ git fetch
+ git checkout $openbsd_branch
+ git pull --rebase)
fi
-(cd openbsd
- git fetch
- git checkout $openbsd_branch
- git pull --rebase)
# setup source paths
CWD=`pwd`
--
2.14.1
......@@ -20,7 +20,9 @@
#
LIBRESSL_VERSION := 190bd346e75575b9436a2e9e14b28618f0234e1b
OPENBSD_VERSION := OPENBSD_6_2
LIBRESSL_URL := https://github.com/libressl-portable/portable/archive/$(LIBRESSL_VERSION).tar.gz
OPENBSD_URL := https://github.com/libressl-portable/openbsd/archive/$(OPENBSD_VERSION).tar.gz
# Check if openssl or libressl is already present on the system
ifeq ($(call need_pkg,"openssl >= 1.0.0" || call need_pkg,"libressl >= 1.0.0"),)
......@@ -32,9 +34,14 @@ endif
$(TARBALLS)/portable-$(LIBRESSL_VERSION).tar.gz:
$(call download,$(LIBRESSL_URL))
libressl: portable-$(LIBRESSL_VERSION).tar.gz
$(TARBALLS)/openbsd-$(OPENBSD_VERSION).tar.gz:
$(call download,$(OPENBSD_URL))
libressl: portable-$(LIBRESSL_VERSION).tar.gz openbsd-$(OPENBSD_VERSION).tar.gz
$(UNPACK)
$(APPLY) $(SRC)/libressl/getpagesize.patch
$(APPLY) $(SRC)/libressl/0001-build-don-t-fetch-git-tag-if-openbsd-directory-exist.patch
mv openbsd-$(OPENBSD_VERSION) $(UNPACK_DIR)/openbsd
$(MOVE)
.libressl: libressl .sum-libressl
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment