From 16d240c819d777c5a7ab629b4da979b7ea9e0cbb Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Wed, 3 Feb 2021 13:17:24 +0000
Subject:  fix 5/n

---
 sub/dev/Makefile.git      | 38 ++++++++------------------------------
 sub/dev/Makefile.libressl |  2 +-
 2 files changed, 9 insertions(+), 31 deletions(-)

(limited to 'sub/dev')

diff --git a/sub/dev/Makefile.git b/sub/dev/Makefile.git
index 4eca8ab..da14585 100644
--- a/sub/dev/Makefile.git
+++ b/sub/dev/Makefile.git
@@ -2,34 +2,8 @@
 GIT_VERSION ?= 2.30.0
 GIT_STATIC := $(if $(filter true,$(BUILD_HOST_STATIC)),-static,)
 
-GIT_MAKE_ARGS := \
-  prefix=/opt/git \
-  V=1 \
-  CC="$(BUILD_HOST_CC)" \
-  CFLAGS="-O2 -Wall -Wextra -I$(OUTPUT)/rootfs/opt/zlib/include -I$(OUTPUT)/rootfs/opt/libressl/include" \
-  LDFLAGS="-L$(OUTPUT)/rootfs/opt/zlib/lib -L$(OUTPUT)/rootfs/opt/libressl/lib $(GIT_STATIC)" \
-  NO_PERL=YesPlease \
-  CURLDIR=$(OUTPUT)/rootfs/opt/curl \
-  CURL_LDFLAGS="-L$(OUTPUT)/rootfs/opt/curl/lib -lcurl -lssl -lcrypto -lz" \
-  NO_R_TO_GCC_LINKER=YesPlease \
-  NO_REGEX=NeedsStartEnd \
-  NO_EXPAT=YesPlease \
-  NO_TCLTK=YesPlease \
-  NO_GETTEXT=YesPlease \
-  NO_SVN_TESTS=YesPlease \
-  BLK_SHA1=YesPlease \
-  NO_ICONV=YesPlease \
-  NO_PYTHON=YesPlease \
-  NO_INSTALL_HARDLINKS=YesPlease \
-  NO_SYS_POLL_H=YesPlease \
-  HAVE_DEV_TTY=YesPlease \
-  USE_NSEC=1 \
-  LIBC_CONTAINS_LIBINTL=1 \
-  HAVE_ALLOCA_H=1 \
-  HAVE_CLOCK_GETTIME=1 \
-  HAVE_CLOCK_MONOTONIC=1 \
-  NEEDS_SSL_WITH_CURL=YesPlease \
-  NEEDS_CRYPTO_WITH_SSL=YesPlease
+GIT_CONF_ARGS := --enable-pthreads --without-expat --with-shell=/bin/sh --with-perl=/bin/perl --without-python --with-zlib=$(OUTPUT)/rootfs/opt/zlib --without-tcltk --with-openssl=$(OUTPUT)/rootfs/opt/libressl
+GIT_MAKE_ARGS := LDFLAGS="-s $(GIT_STATIC)" NO_GETTEXT=YesPlease NO_PERL=YesPlease DEFAULT_HELP_FORMAT=html INSTALL_SYMLINKS=YesPlease
 
 
 clean-git:
@@ -47,12 +21,16 @@ $(OUTPUT)/build-host/.lh_git_copied: $(OUTPUT)/build-host/.lh_git_dled | $(OUTPU
 	exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host tar -zxpvf $(OUTPUT)/sources/git-$(GIT_VERSION).tar.gz
 	exec setuidgid $(NORMALUSER) s6-touch $@
 
-$(OUTPUT)/build-host/.lh_git_built: $(OUTPUT)/build-host/.lh_git_copied $(OUTPUT)/build-host/.lh_libressl_installed $(OUTPUT)/build-host/.lh_curl_installed $(OUTPUT)/build-host/.lh_zlib_installed | $(OUTPUT)/build-build/.lh_skarnet_installed
+$(OUTPUT)/build-host/.lh_git_configured: $(OUTPUT)/build-host/.lh_git_copied $(OUTPUT)/build-host/.lh_libressl_installed $(OUTPUT)/build-host/.lh_curl_installed $(OUTPUT)/build-host/.lh_zlib_installed | $(OUTPUT)/build-build/.lh_skarnet_installed
+	exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/git-$(GIT_VERSION) export CC "$(BUILD_HOST_CC)" ./configure --host=$(TRIPLE) --prefix=/opt/git-$(GIT_VERSION) $(GIT_CONF_ARGS)
+	exec setuidgid $(NORMALUSER) s6-touch $@
+
+$(OUTPUT)/build-host/.lh_git_built: $(OUTPUT)/build-host/.lh_git_configured $(OUTPUT)/build-host/.lh_libressl_installed $(OUTPUT)/build-host/.lh_curl_installed $(OUTPUT)/build-host/.lh_zlib_installed | $(OUTPUT)/build-build/.lh_skarnet_installed
 	exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/git-$(GIT_VERSION) $(MAKE) $(GIT_MAKE_ARGS)
 	exec setuidgid $(NORMALUSER) s6-touch $@
 	
 $(OUTPUT)/build-host/.lh_git_installed: $(OUTPUT)/build-host/.lh_git_built | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed
-	exec cd $(OUTPUT)/build-host/git-$(GIT_VERSION) $(MAKE) install DESTDIR=$(OUTPUT)/rootfs prefix=/opt/git-$(GIT_VERSION)
+	exec cd $(OUTPUT)/build-host/git-$(GIT_VERSION) $(MAKE) install DESTDIR=$(OUTPUT)/rootfs $(GIT_MAKE_ARGS)
 	exec makenamelink $(OUTPUT)/rootfs/opt git git-$(GIT_VERSION) $(OUTPUT)/tmp
 	exec makelinks $(OUTPUT)/rootfs /bin /opt/git/bin
 	exec setuidgid $(NORMALUSER) s6-touch $@
diff --git a/sub/dev/Makefile.libressl b/sub/dev/Makefile.libressl
index afdc671..c7f6254 100644
--- a/sub/dev/Makefile.libressl
+++ b/sub/dev/Makefile.libressl
@@ -1,6 +1,6 @@
 
 LIBRESSL_VERSION ?= 3.2.3
-LIBRESSL_MAKE_STATIC := $(if $(filter true,$(BUILD_HOST_STATIC)),LDFLAGS="-s -static",LDFLAGS=-s)
+LIBRESSL_MAKE_STATIC := $(if $(filter true,$(BUILD_HOST_STATIC)),LDFLAGS="-s -all-static",LDFLAGS=-s)
 
 clean-libressl:
 	rm -f $(OUTPUT)/build-host/.lh_libressl_*
-- 
cgit v1.2.3