diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2021-01-31 14:30:38 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska-skaware@skarnet.org> | 2021-01-31 14:30:38 +0000 |
| commit | 396794f00cbdddc1fad143a327f0cdf45d2e0ce7 (patch) | |
| tree | ac4a27989ec07ce2fb3fa9636c7202e725df7297 | |
| parent | 246806ab8a8af82361a996c979959729b1fe88a1 (diff) | |
| download | lh-bootstrap-396794f00cbdddc1fad143a327f0cdf45d2e0ce7.tar.xz | |
Add make to the dev image
| -rw-r--r-- | Makefile | 5 | ||||
| -rw-r--r-- | sub/dev/Makefile.make | 32 | ||||
| -rw-r--r-- | sub/dev/Makefile.strace (renamed from sub/strace/Makefile) | 0 |
3 files changed, 35 insertions, 2 deletions
@@ -31,8 +31,9 @@ userfs: $(OUTPUT)/tmp/.lh_userfs_installed images: $(OUTPUT)/tmp/.lh_diskimages_done ifeq ($(LH_DEV),true) -include sub/strace/Makefile -LH_DEV_TARGETS := $(OUTPUT)/build-host/.lh_strace_installed +include sub/dev/Makefile.strace +include sub/dev/Makefile.make +LH_DEV_TARGETS := $(OUTPUT)/build-host/.lh_strace_installed $(OUTPUT)/build-host/.lh_make_installed else LH_DEV_TARGETS := endif diff --git a/sub/dev/Makefile.make b/sub/dev/Makefile.make new file mode 100644 index 0000000..3c33744 --- /dev/null +++ b/sub/dev/Makefile.make @@ -0,0 +1,32 @@ + +MAKE_VERSION ?= 4.3 +MAKE_MAKE_STATIC := $(if $(filter true,$(BUILD_HOST_STATIC)),LDFLAGS=-static,) + +clean-make: + rm -f $(OUTPUT)/build-host/.lh_make_* + + +$(OUTPUT)/sources/make-$(MAKE_VERSION).tar.xz: | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed + exec setuidgid $(NORMALUSER) cd $(OUTPUT)/sources wget https://ftp.gnu.org//gnu/make/make-$(MAKE_VERSION).tar.gz + +$(OUTPUT)/build-host/.lh_make_dled: $(OUTPUT)/sources/make-$(MAKE_VERSION).tar.gz | $(OUTPUT)/build-build/.lh_skarnet_installed + exec setuidgid $(NORMALUSER) s6-touch $@ + +$(OUTPUT)/build-host/.lh_make_copied: $(OUTPUT)/build-host/.lh_make_dled | $(OUTPUT)/build-build/.lh_skarnet_installed + exec setuidgid $(NORMALUSER) s6-rmrf $(OUTPUT)/build-host/make-$(MAKE_VERSION) + exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host tar -zxpvf $(OUTPUT)/sources/make-$(MAKE_VERSION).tar.gz + exec setuidgid $(NORMALUSER) s6-touch $@ + +$(OUTPUT)/build-host/.lh_make_configured: $(OUTPUT)/build-host/.lh_make_copied | $(OUTPUT)/build-build/.lh_skarnet_installed + exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/make-$(MAKE_VERSION) export CC "$(BUILD_HOST_CC)" ./configure --host=$(TRIPLE) --prefix=/opt/make-$(MAKE_VERSION) --disable-nls --disable-rpath + exec setuidgid $(NORMALUSER) s6-touch $@ + +$(OUTPUT)/build-host/.lh_make_built: $(OUTPUT)/build-host/.lh_make_configured | $(OUTPUT)/build-build/.lh_skarnet_installed + exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/make-$(MAKE_VERSION) $(MAKE) $(MAKE_MAKE_STATIC) + exec setuidgid $(NORMALUSER) s6-touch $@ + +$(OUTPUT)/build-host/.lh_make_installed: $(OUTPUT)/build-host/.lh_make_built | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed + exec cd $(OUTPUT)/build-host/make-$(MAKE_VERSION) $(MAKE) install DESTDIR=$(OUTPUT)/rootfs + exec makenamelink $(OUTPUT)/rootfs/opt make make-$(MAKE_VERSION) $(OUTPUT)/tmp + exec makelinks $(OUTPUT)/rootfs /bin /opt/make/bin + exec setuidgid $(NORMALUSER) s6-touch $@ diff --git a/sub/strace/Makefile b/sub/dev/Makefile.strace index a4fa04f..a4fa04f 100644 --- a/sub/strace/Makefile +++ b/sub/dev/Makefile.strace |