- $(MAKETUNING) variable added to ninja build
Signed-off-by: Adolf Belka adolf.belka@ipfire.org --- lfs/glib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lfs/glib b/lfs/glib index cbf666f70..58c45415a 100644 --- a/lfs/glib +++ b/lfs/glib @@ -75,7 +75,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) --sysconfdir=/etc \ -D internal_pcre=false \ builddir/ - cd $(DIR_APP) && ninja -C builddir/ + cd $(DIR_APP) && ninja -C builddir/ $(MAKETUNING) cd $(DIR_APP) && ninja -C builddir/ install @rm -rf $(DIR_APP) @$(POSTBUILD)
- $(MAKETUNING) variable added to ninja build
Signed-off-by: Adolf Belka adolf.belka@ipfire.org --- lfs/libinih | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lfs/libinih b/lfs/libinih index bfecc35de..3c25bdbfa 100644 --- a/lfs/libinih +++ b/lfs/libinih @@ -77,7 +77,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) $(UPDATE_AUTOMAKE) cd $(DIR_APP) && meson --prefix=/usr builddir/ - cd $(DIR_APP) && ninja -C builddir/ + cd $(DIR_APP) && ninja -C builddir/ $(MAKETUNING) cd $(DIR_APP) && ninja -C builddir/ install @rm -rf $(DIR_APP) @$(POSTBUILD)
- $(MAKETUNING) variable added to ninja build
Signed-off-by: Adolf Belka adolf.belka@ipfire.org --- lfs/libmpdclient | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lfs/libmpdclient b/lfs/libmpdclient index 24f516d01..ee18a37a6 100644 --- a/lfs/libmpdclient +++ b/lfs/libmpdclient @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = libmpdclient -PAK_VER = 4 +PAK_VER = 5
DEPS =
@@ -79,7 +79,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) $(UPDATE_AUTOMAKE) cd $(DIR_APP) && meson --prefix=/usr builddir/ - cd $(DIR_APP) && ninja -C builddir/ + cd $(DIR_APP) && ninja -C builddir/ $(MAKETUNING) cd $(DIR_APP) && ninja -C builddir/ install @rm -rf $(DIR_APP) @$(POSTBUILD)
- $(MAKETUNING) variable added to ninja build
Signed-off-by: Adolf Belka adolf.belka@ipfire.org --- lfs/mpc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lfs/mpc b/lfs/mpc index 2060685cc..47b069401 100644 --- a/lfs/mpc +++ b/lfs/mpc @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = mpc -PAK_VER = 7 +PAK_VER = 8
DEPS = mpd libmpdclient
@@ -78,7 +78,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && meson --prefix=/usr builddir/ - cd $(DIR_APP) && ninja -C builddir/ + cd $(DIR_APP) && ninja -C builddir/ $(MAKETUNING) cd $(DIR_APP) && ninja -C builddir/ install @rm -rf $(DIR_APP) @$(POSTBUILD)
- $(MAKETUNING) variable added to ninja build
Signed-off-by: Adolf Belka adolf.belka@ipfire.org --- lfs/mpd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lfs/mpd b/lfs/mpd index 012100b0e..c1871d8b5 100644 --- a/lfs/mpd +++ b/lfs/mpd @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/${THISAPP} TARGET = $(DIR_INFO)/$(THISAPP) PROG = mpd -PAK_VER = 23 +PAK_VER = 24 SUP_ARCH = aarch64 armv6l x86_64 i586
DEPS = alsa avahi faad2 ffmpeg flac lame libmad libshout libogg libid3tag libvorbis opus soxr @@ -94,7 +94,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) -D upnp=disabled \ -D icu=disabled \ builddir/ - cd $(DIR_APP) && ninja -C builddir/ + cd $(DIR_APP) && ninja -C builddir/ $(MAKETUNING) cd $(DIR_APP) && ninja -C builddir/ install
#install initscripts
- $(MAKETUNING) variable added to ninja build
Signed-off-by: Adolf Belka adolf.belka@ipfire.org --- lfs/sshfs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/lfs/sshfs b/lfs/sshfs index 1e7706194..23b68c541 100644 --- a/lfs/sshfs +++ b/lfs/sshfs @@ -73,6 +73,8 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && meson --prefix=/usr builddir && cd builddir && ninja && ninja install + cd $(DIR_APP) && meson --prefix=/usr builddir/ + cd $(DIR_APP) && ninja -C builddir/ $(MAKETUNING) + cd $(DIR_APP) && ninja -C builddir/ install @rm -rf $(DIR_APP) @$(POSTBUILD)
Hello,
I am not going to put a Reviewed-by tag on all of those, but nevertheless thank you for all of them :)
-Michael
On 2 Sep 2021, at 15:13, Adolf Belka adolf.belka@ipfire.org wrote:
- $(MAKETUNING) variable added to ninja build
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
lfs/glib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lfs/glib b/lfs/glib index cbf666f70..58c45415a 100644 --- a/lfs/glib +++ b/lfs/glib @@ -75,7 +75,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) --sysconfdir=/etc \ -D internal_pcre=false \ builddir/
- cd $(DIR_APP) && ninja -C builddir/
- cd $(DIR_APP) && ninja -C builddir/ $(MAKETUNING) cd $(DIR_APP) && ninja -C builddir/ install @rm -rf $(DIR_APP) @$(POSTBUILD)
-- 2.33.0
-
Adolf Belka -
Michael Tremer