diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2020-01-21 14:33:41 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska-skaware@skarnet.org> | 2020-01-21 14:33:41 +0000 |
| commit | 4b26bb7f8a7501ab91e85099e90fb25285875562 (patch) | |
| tree | 61aeea78bf39b0932ebe19b59b99ba0cc87fe091 | |
| parent | 464c6afdb9a0826705fd33daf64755b8108c4e3e (diff) | |
| download | lh-bootstrap-4b26bb7f8a7501ab91e85099e90fb25285875562.tar.xz | |
Small incremental build fixes (16)
| -rw-r--r-- | sub/kmod/Makefile | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sub/kmod/Makefile b/sub/kmod/Makefile index b90dd58..5726a2e 100644 --- a/sub/kmod/Makefile +++ b/sub/kmod/Makefile @@ -7,9 +7,6 @@ KMOD_TARLETTER := J # Do not use --enable-static or --disable-shared: the kmod configure script is voluntarily broken. m( # Use make variables instead to link kmod statically. -# The -L directories need to be specified again, and the -I directory for liblzma -# also needs to appear in the CFLAGS make variable, because the kmod configure script -# is REALLY broken. 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 @@ -33,7 +30,7 @@ $(OUTPUT)/build-build/.lh_$(KMOD_NAME)_configured: $(OUTPUT)/build-build/.lh_$(K 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 - exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-build/opt/$(KMOD_NAME)-$(KMOD_VERSION)/src $(MAKE) CC="$(BUILD_BUILD_CC)" CFLAGS="-I $(OUTPUT)/build-build/opt/xz/include" LDFLAGS=$(KMOD_LDFLAGS) LIBS="-llzma" + exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-build/opt/$(KMOD_NAME)-$(KMOD_VERSION)/src $(MAKE) exec setuidgid $(NORMALUSER) s6-touch $@ $(OUTPUT)/build-build/.lh_$(KMOD_NAME)_installed: $(OUTPUT)/build-build/.lh_$(KMOD_NAME)_built | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed |