From 46988725a588f90ee69c9c78459be62b1dcc2fca Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Fri, 23 Mar 2018 01:18:28 +0000 Subject: More workarounds for kmod --- sub/kmod/Makefile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'sub/kmod') diff --git a/sub/kmod/Makefile b/sub/kmod/Makefile index 289ea30..eaf3fef 100644 --- a/sub/kmod/Makefile +++ b/sub/kmod/Makefile @@ -15,8 +15,7 @@ KMOD_TARLETTER := J KMOD_CONFIGURE_OPTIONS := --with-gnu-ld --disable-gtk-doc-html --with-xz --disable-manpages --with-bashcompletiondir=$(OUTPUT)/build-build/opt/$(KMOD_NAME)-$(KMOD_VERSION)/bash-completions KMOD_CFLAGS := "-I $(OUTPUT)/build-build/opt/xz/include" -KMOD_CONFLDFLAGS := "-s -L$(OUTPUT)/build-build/opt/xz/lib" -KMOD_MAKELDFLAGS := "-s -L$(OUTPUT)/build-build/opt/xz/lib" +KMOD_LDFLAGS := "-s -L$(OUTPUT)/build-build/opt/xz/lib" $(OUTPUT)/sources/$(KMOD_NAME)-$(KMOD_VERSION).$(KMOD_TAREXT): | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed @@ -34,11 +33,11 @@ $(OUTPUT)/build-build/.lh_$(KMOD_NAME)_copied: $(OUTPUT)/sources/.lh_$(KMOD_NAME exec setuidgid $(NORMALUSER) s6-touch $@ $(OUTPUT)/build-build/.lh_$(KMOD_NAME)_configured: $(OUTPUT)/build-build/.lh_$(KMOD_NAME)_copied $(OUTPUT)/build-build/.lh_xz_installed $(OUTPUT)/build-build/.lh_gcc | $(OUTPUT)/build-build/.lh_skarnet_installed - exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-build/opt/$(KMOD_NAME)-$(KMOD_VERSION)/src export CFLAGS $(KMOD_CFLAGS) export LDFLAGS $(KMOD_CONFLDFLAGS) export liblzma_CFLAGS "-I $(OUTPUT)/build-build/opt/xz/include" export liblzma_LIBS "-llzma" ./configure --prefix=$(OUTPUT)/build-build/opt/$(KMOD_NAME)-$(KMOD_VERSION) $(KMOD_CONFIGURE_OPTIONS) + exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-build/opt/$(KMOD_NAME)-$(KMOD_VERSION)/src export CFLAGS $(KMOD_CFLAGS) export LDFLAGS $(KMOD_LDFLAGS) ./configure --prefix=$(OUTPUT)/build-build/opt/$(KMOD_NAME)-$(KMOD_VERSION) $(KMOD_CONFIGURE_OPTIONS) exec setuidgid $(NORMALUSER) s6-touch $@ $(OUTPUT)/build-build/.lh_$(KMOD_NAME)_built: $(OUTPUT)/build-build/.lh_$(KMOD_NAME)_configured $(OUTPUT)/build-build/.lh_gcc | $(OUTPUT)/build-build/.lh_skarnet_installed - exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-build/opt/$(KMOD_NAME)-$(KMOD_VERSION)/src $(MAKE) CFLAGS="-I $(OUTPUT)/build-build/opt/xz/include" LDFLAGS=$(KMOD_MAKELDFLAGS) + exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-build/opt/$(KMOD_NAME)-$(KMOD_VERSION)/src $(MAKE) CFLAGS="-I $(OUTPUT)/build-build/opt/xz/include" LDFLAGS=$(KMOD_LDFLAGS) LIBS="-llzma" exec setuidgid $(NORMALUSER) s6-touch $@ $(OUTPUT)/build-build/.lh_$(KMOD_NAME)_installed: $(OUTPUT)/build-build/.lh_$(KMOD_NAME)_built $(OUTPUT)/build-build/.lh_gcc | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed -- cgit v1.2.3