diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2020-01-21 15:18:37 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska-skaware@skarnet.org> | 2020-01-21 15:18:37 +0000 |
| commit | a2b4c7df0950f136e48465f5378f06299f0d2be8 (patch) | |
| tree | 9ad09617433ea5105a59b30259c4fbae8d9b51c1 | |
| parent | 4b26bb7f8a7501ab91e85099e90fb25285875562 (diff) | |
| download | lh-bootstrap-a2b4c7df0950f136e48465f5378f06299f0d2be8.tar.xz | |
Small incremental build fixes (17)
| -rw-r--r-- | sub/kmod/Makefile | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sub/kmod/Makefile b/sub/kmod/Makefile index 5726a2e..16550ca 100644 --- a/sub/kmod/Makefile +++ b/sub/kmod/Makefile @@ -5,11 +5,12 @@ KMOD_URLDIR := https://cdn.kernel.org/pub/linux/utils/kernel/$(KMOD_NAME) KMOD_TAREXT := tar.xz KMOD_TARLETTER := J -# Do not use --enable-static or --disable-shared: the kmod configure script is voluntarily broken. m( +# Do not use --enable-static or --disable-shared: the kmod configure script is voluntarily broken. # Use make variables instead to link kmod statically. 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_LDFLAGS := -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 exec setuidgid $(NORMALUSER) cd $(OUTPUT)/sources wget $(KMOD_URLDIR)/$(KMOD_NAME)-$(KMOD_VERSION).$(KMOD_TAREXT) @@ -26,7 +27,7 @@ $(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_skarnet_installed - exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-build/opt/$(KMOD_NAME)-$(KMOD_VERSION)/src export CC "$(BUILD_BUILD_CC)" export liblzma_CFLAGS "-I$(OUTPUT)/build-build/opt/xz/include -L$(OUTPUT)/build-build/opt/xz/lib" 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 CC "$(BUILD_BUILD_CC)" export liblzma_CFLAGS "-I$(OUTPUT)/build-build/opt/xz/include -L$(OUTPUT)/build-build/opt/xz/lib" export liblzma_LIBS "-llzma" 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_skarnet_installed |