summaryrefslogtreecommitdiff
path: root/sub/bearssl
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2023-02-09 22:03:20 +0000
committerLaurent Bercot <ska@appnovation.com>2023-02-09 22:03:20 +0000
commitb796ef65d0e07ae86c34567d3913bfd81d506210 (patch)
tree95d254854b86166cd652140c275da084c06a8d0a /sub/bearssl
parent337f33185360c93e74eab974a3c8b8e31629231e (diff)
downloadlh-bootstrap-b796ef65d0e07ae86c34567d3913bfd81d506210.tar.xz
Update to latest versions (yet untested)
Signed-off-by: Laurent Bercot <ska@appnovation.com>
Diffstat (limited to 'sub/bearssl')
-rw-r--r--sub/bearssl/Makefile22
1 files changed, 11 insertions, 11 deletions
diff --git a/sub/bearssl/Makefile b/sub/bearssl/Makefile
index 8226bbe..84048ca 100644
--- a/sub/bearssl/Makefile
+++ b/sub/bearssl/Makefile
@@ -1,7 +1,7 @@
BEARSSL_NAME := bearssl
-# latest version from 2021-01-28
-BEARSSL_VERSION := 79b1a9996c094ff593ae50bc4edc1f349f39dd6d
+# latest version from 2022-06-22
+BEARSSL_VERSION := 46f7dddce75227f2e40ab94d66ceb9f19ee6b1b0
BEARSSL_URLDIR := https://www.bearssl.org/git
$(OUTPUT)/sources/.lh_$(BEARSSL_NAME)_dled: | $(OUTPUT)/build-build/.lh_skarnet_installed
@@ -10,20 +10,20 @@ $(OUTPUT)/sources/.lh_$(BEARSSL_NAME)_dled: | $(OUTPUT)/build-build/.lh_skarnet_
exec setuidgid $(NORMALUSER) s6-rename $(OUTPUT)/sources/BearSSL $(OUTPUT)/sources/$(BEARSSL_NAME)-$(BEARSSL_VERSION)
exec setuidgid $(NORMALUSER) s6-touch $@
-$(OUTPUT)/build-host/.lh_$(BEARSSL_NAME)_copied: $(OUTPUT)/sources/.lh_$(BEARSSL_NAME)_dled | $(OUTPUT)/build-build/.lh_skarnet_installed
- exec setuidgid $(NORMALUSER) s6-rmrf $(OUTPUT)/build-host/$(BEARSSL_NAME)-$(BEARSSL_VERSION)
- exec setuidgid $(NORMALUSER) s6-hiercopy $(OUTPUT)/sources/$(BEARSSL_NAME)-$(BEARSSL_VERSION) $(OUTPUT)/build-host/$(BEARSSL_NAME)-$(BEARSSL_VERSION)
- exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/$(BEARSSL_NAME)-$(BEARSSL_VERSION) git checkout $(BEARSSL_VERSION)
+$(OUTPUT)/build-$(TRIPLE)/.lh_$(BEARSSL_NAME)_copied: $(OUTPUT)/sources/.lh_$(BEARSSL_NAME)_dled | $(OUTPUT)/build-build/.lh_skarnet_installed
+ exec setuidgid $(NORMALUSER) s6-rmrf $(OUTPUT)/build-$(TRIPLE)/$(BEARSSL_NAME)-$(BEARSSL_VERSION)
+ exec setuidgid $(NORMALUSER) s6-hiercopy $(OUTPUT)/sources/$(BEARSSL_NAME)-$(BEARSSL_VERSION) $(OUTPUT)/build-$(TRIPLE)/$(BEARSSL_NAME)-$(BEARSSL_VERSION)
+ exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-$(TRIPLE)/$(BEARSSL_NAME)-$(BEARSSL_VERSION) git checkout $(BEARSSL_VERSION)
exec setuidgid $(NORMALUSER) s6-touch $@
-$(OUTPUT)/build-host/.lh_$(BEARSSL_NAME)_built: $(OUTPUT)/build-host/.lh_$(BEARSSL_NAME)_copied | $(OUTPUT)/build-build/.lh_skarnet_installed
- exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/$(BEARSSL_NAME)-$(BEARSSL_VERSION) $(MAKE) lib CC="$(BUILD_HOST_CC)" LD="$(BUILD_HOST_CC)" LDDLL="$(BUILD_HOST_CC)"
+$(OUTPUT)/build-$(TRIPLE)/.lh_$(BEARSSL_NAME)_built: $(OUTPUT)/build-$(TRIPLE)/.lh_$(BEARSSL_NAME)_copied | $(OUTPUT)/build-build/.lh_skarnet_installed
+ exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-$(TRIPLE)/$(BEARSSL_NAME)-$(BEARSSL_VERSION) $(MAKE) lib CC="$(TARGET_CC)" LD="$(TARGET_CC)" LDDLL="$(TARGET_CC)"
exec setuidgid $(NORMALUSER) s6-touch $@
-$(OUTPUT)/build-host/.lh_$(BEARSSL_NAME)_installed: $(OUTPUT)/build-host/.lh_$(BEARSSL_NAME)_built | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed
+$(OUTPUT)/build-$(TRIPLE)/.lh_$(BEARSSL_NAME)_installed: $(OUTPUT)/build-$(TRIPLE)/.lh_$(BEARSSL_NAME)_built | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed
exec s6-mkdir -p $(OUTPUT)/rootfs/opt/$(BEARSSL_NAME)-$(BEARSSL_VERSION)/lib
- exec cp $(OUTPUT)/build-host/$(BEARSSL_NAME)-$(BEARSSL_VERSION)/build/libbearssl.a $(OUTPUT)/rootfs/opt/$(BEARSSL_NAME)-$(BEARSSL_VERSION)/lib/
- exec s6-hiercopy $(OUTPUT)/build-host/$(BEARSSL_NAME)-$(BEARSSL_VERSION)/inc $(OUTPUT)/rootfs/opt/$(BEARSSL_NAME)-$(BEARSSL_VERSION)/include
+ exec cp $(OUTPUT)/build-$(TRIPLE)/$(BEARSSL_NAME)-$(BEARSSL_VERSION)/build/libbearssl.a $(OUTPUT)/rootfs/opt/$(BEARSSL_NAME)-$(BEARSSL_VERSION)/lib/
+ exec s6-hiercopy $(OUTPUT)/build-$(TRIPLE)/$(BEARSSL_NAME)-$(BEARSSL_VERSION)/inc $(OUTPUT)/rootfs/opt/$(BEARSSL_NAME)-$(BEARSSL_VERSION)/include
exec chown -R root:root $(OUTPUT)/rootfs/opt/$(BEARSSL_NAME)-$(BEARSSL_VERSION)/include
exec makenamelink $(OUTPUT)/rootfs/opt $(BEARSSL_NAME) $(BEARSSL_NAME)-$(BEARSSL_VERSION) $(OUTPUT)/tmp
exec setuidgid $(NORMALUSER) s6-touch $@