diff options
Diffstat (limited to 'sub/util-linux')
| -rw-r--r-- | sub/util-linux/Makefile | 9 | ||||
| -rw-r--r-- | sub/util-linux/nowall.patch | 21 |
2 files changed, 4 insertions, 26 deletions
diff --git a/sub/util-linux/Makefile b/sub/util-linux/Makefile index 858c533..221781d 100644 --- a/sub/util-linux/Makefile +++ b/sub/util-linux/Makefile @@ -108,25 +108,24 @@ $(OUTPUT)/sources/$(UTLX_NAME)-$(UTLX_VERSION).$(UTLX_TAREXT): | $(OUTPUT)/tmp/. $(OUTPUT)/sources/.lh_$(UTLX_NAME)_dled: $(OUTPUT)/sources/$(UTLX_NAME)-$(UTLX_VERSION).$(UTLX_TAREXT) exec setuidgid $(NORMALUSER) s6-touch $@ -$(OUTPUT)/build-build/.lh_$(UTLX_NAME)_copied: $(OUTPUT)/sources/.lh_$(UTLX_NAME)_dled sub/util-linux/nowall.patch | $(OUTPUT)/build-build/.lh_skarnet_installed +$(OUTPUT)/build-build/.lh_$(UTLX_NAME)_copied: $(OUTPUT)/sources/.lh_$(UTLX_NAME)_dled | $(OUTPUT)/build-build/.lh_skarnet_installed exec setuidgid $(NORMALUSER) s6-rmrf $(OUTPUT)/build-build/opt/$(UTLX_NAME)-$(UTLX_VERSION)/src exec setuidgid $(NORMALUSER) s6-mkdir -p $(OUTPUT)/build-build/opt/$(UTLX_NAME)-$(UTLX_VERSION) exec setuidgid $(NORMALUSER) makenamelink $(OUTPUT)/build-build/opt $(UTLX_NAME) $(UTLX_NAME)-$(UTLX_VERSION) $(OUTPUT)/tmp exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-build/opt/$(UTLX_NAME)-$(UTLX_VERSION) tar $(UTLX_TARLETTER)xpvf $(OUTPUT)/sources/$(UTLX_NAME)-$(UTLX_VERSION).$(UTLX_TAREXT) exec setuidgid $(NORMALUSER) s6-rename $(OUTPUT)/build-build/opt/$(UTLX_NAME)-$(UTLX_VERSION)/$(UTLX_NAME)-$(UTLX_VERSION) $(OUTPUT)/build-build/opt/$(UTLX_NAME)-$(UTLX_VERSION)/src -# exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-build/opt/$(UTLX_NAME)-$(UTLX_VERSION) redirfd -r 0 $(WD)/sub/util-linux/nowall.patch patch -p1 exec setuidgid $(NORMALUSER) s6-touch $@ $(OUTPUT)/build-build/.lh_$(UTLX_NAME)_configured: $(OUTPUT)/build-build/.lh_$(UTLX_NAME)_copied $(OUTPUT)/build-build/.lh_kernel_headers_installed | $(OUTPUT)/build-build/.lh_skarnet_installed - exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-build/opt/$(UTLX_NAME)-$(UTLX_VERSION)/src export CFLAGS $(UTLX_CFLAGS) export LDFLAGS $(UTLX_CONFLDFLAGS) ./configure --prefix=$(OUTPUT)/build-build/opt/$(UTLX_NAME)-$(UTLX_VERSION) $(UTLX_CONFIGURE_OPTIONS) + exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-build/opt/$(UTLX_NAME)-$(UTLX_VERSION)/src export CC $(BUILD_BUILD_CC) export CFLAGS $(UTLX_CFLAGS) export LDFLAGS $(UTLX_CONFLDFLAGS) ./configure --prefix=$(OUTPUT)/build-build/opt/$(UTLX_NAME)-$(UTLX_VERSION) $(UTLX_CONFIGURE_OPTIONS) exec setuidgid $(NORMALUSER) s6-touch $@ $(OUTPUT)/build-build/.lh_$(UTLX_NAME)_built: $(OUTPUT)/build-build/.lh_$(UTLX_NAME)_configured | $(OUTPUT)/build-build/.lh_skarnet_installed - exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-build/opt/$(UTLX_NAME)-$(UTLX_VERSION)/src $(MAKE) LDFLAGS=$(UTLX_MAKELDFLAGS) + exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-build/opt/$(UTLX_NAME)-$(UTLX_VERSION)/src $(MAKE) CC=$(BUILD_BUILD_CC) LDFLAGS=$(UTLX_MAKELDFLAGS) exec setuidgid $(NORMALUSER) s6-touch $@ $(OUTPUT)/build-build/.lh_$(UTLX_NAME)_installed: $(OUTPUT)/build-build/.lh_$(UTLX_NAME)_built | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed - exec cd $(OUTPUT)/build-build/opt/$(UTLX_NAME)-$(UTLX_VERSION)/src $(MAKE) install + exec cd $(OUTPUT)/build-build/opt/$(UTLX_NAME)-$(UTLX_VERSION)/src $(MAKE) install CC=$(BUILD_BUILD_CC) exec setuidgid $(NORMALUSER) makelinks $(OUTPUT)/build-build /bin /opt/$(UTLX_NAME)/bin exec setuidgid $(NORMALUSER) makelinks $(OUTPUT)/build-build /bin /opt/$(UTLX_NAME)/sbin exec setuidgid $(NORMALUSER) s6-touch $@ diff --git a/sub/util-linux/nowall.patch b/sub/util-linux/nowall.patch deleted file mode 100644 index 6de7a56..0000000 --- a/sub/util-linux/nowall.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- util-linux-2.32.old/src/Makefile.in -+++ util-linux-2.32/src/Makefile.in -@@ -372,12 +372,12 @@ - @BUILD_SETTERM_TRUE@@HAVE_TINFO_FALSE@am__append_125 = $(NCURSES_CFLAGS) - @BUILD_MESG_TRUE@am__append_126 = mesg - @BUILD_MESG_TRUE@am__append_127 = term-utils/mesg.1 --@BUILD_WALL_TRUE@am__append_128 = wall --@BUILD_WALL_TRUE@am__append_129 = term-utils/wall.1 --@BUILD_WALL_TRUE@@MAKEINSTALL_DO_CHOWN_TRUE@@USE_TTY_GROUP_TRUE@am__append_130 = install-exec-hook-wall --@BUILD_WRITE_TRUE@am__append_131 = write --@BUILD_WRITE_TRUE@am__append_132 = term-utils/write.1 --@BUILD_WRITE_TRUE@@MAKEINSTALL_DO_CHOWN_TRUE@@USE_TTY_GROUP_TRUE@am__append_133 = install-exec-hook-write -+# @BUILD_WALL_TRUE@am__append_128 = wall -+# @BUILD_WALL_TRUE@am__append_129 = term-utils/wall.1 -+# @BUILD_WALL_TRUE@@MAKEINSTALL_DO_CHOWN_TRUE@@USE_TTY_GROUP_TRUE@am__append_130 = install-exec-hook-wall -+# @BUILD_WRITE_TRUE@am__append_131 = write -+# @BUILD_WRITE_TRUE@am__append_132 = term-utils/write.1 -+# @BUILD_WRITE_TRUE@@MAKEINSTALL_DO_CHOWN_TRUE@@USE_TTY_GROUP_TRUE@am__append_133 = install-exec-hook-write - @BUILD_LAST_TRUE@am__append_134 = last - @BUILD_LAST_TRUE@am__append_135 = \ - @BUILD_LAST_TRUE@ login-utils/last.1 \ |