aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2018-03-23 01:18:28 +0000
committerLaurent Bercot <ska-skaware@skarnet.org>2018-03-23 01:18:28 +0000
commit46988725a588f90ee69c9c78459be62b1dcc2fca (patch)
tree0a5b6e0c6dfdd8f359a23c164c8265ec458c5bbc
parent7f2118a0ee9ba7db7d8f253ebfcd501ce075d7b6 (diff)
downloadlh-bootstrap-46988725a588f90ee69c9c78459be62b1dcc2fca.tar.xz
More workarounds for kmod
-rw-r--r--sub/kmod/Makefile7
1 files changed, 3 insertions, 4 deletions
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