util-linux: backport patch to skip build of unused objects

util-linux-uuid does not need libtcolors.a and libcommon.a but
they get build regardless. Backport a patch from upstream to
skip them and save some compilation time.

c65953d72b

(From OE-Core rev: 9353c4338acd51e1bc4172554fca018c4044829f)

Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Luca Boccassi
2021-03-16 11:38:36 +00:00
committed by Richard Purdie
parent 3cda6c0bd1
commit a31f87a1ff
2 changed files with 50 additions and 0 deletions

View File

@@ -37,5 +37,6 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/v${MAJOR_VERSION}/${BP}.tar.xz
file://run-ptest \
file://display_testname_for_subtest.patch \
file://avoid_parallel_tests.patch \
file://Automake-use-EXTRA_LTLIBRARIES-instead-of-noinst_LTL.patch \
"
SRC_URI[sha256sum] = "f7516ba9d8689343594356f0e5e1a5f0da34adfbc89023437735872bb5024c5f"

View File

@@ -0,0 +1,49 @@
Author: Luca Boccassi <luca.boccassi@microsoft.com>
Description: Automake: use EXTRA_LTLIBRARIES instead of noinst_LTLIBRARIES
noinst_LTLIBRARIES causes the libraries to be always built
unconditionally. EXTRA_LTLIBRARIES causes them to be built
only if other build target needs them.
In other words, avoid building libcommon.a and libtcolors.a
unless they are needed by another library/executable and
save some build time.
Upstream-Status: backport, commit:c65953d72bbc7412f32e566d9fa6e780d84f0696
--- a/Makefile.am
+++ b/Makefile.am
@@ -39,7 +39,7 @@ bashcompletiondir = @bashcompletiondir@
dist_noinst_HEADERS =
noinst_PROGRAMS =
-noinst_LTLIBRARIES =
+EXTRA_LTLIBRARIES =
usrbin_exec_PROGRAMS =
usrsbin_exec_PROGRAMS =
dist_man_MANS =
@@ -169,7 +169,7 @@ else
edit_cmd += -e 's|@vendordir[@]||g'
endif
-CLEANFILES += $(PATHFILES)
+CLEANFILES += $(PATHFILES) $(EXTRA_LTLIBRARIES)
EXTRA_DIST += $(PATHFILES:=.in)
$(PATHFILES): Makefile
--- a/lib/Makemodule.am
+++ b/lib/Makemodule.am
@@ -9,7 +9,7 @@
# Note that you need "make install-strip" (or proper rpm / Debian build)
# to generate binaries with only relevant stuff.
#
-noinst_LTLIBRARIES += libcommon.la
+EXTRA_LTLIBRARIES += libcommon.la
libcommon_la_CFLAGS = $(AM_CFLAGS)
libcommon_la_SOURCES = \
lib/blkdev.c \
@@ -59,7 +59,7 @@ libcommon_la_SOURCES += lib/sysfs.c
endif
endif
-noinst_LTLIBRARIES += libtcolors.la
+EXTRA_LTLIBRARIES += libtcolors.la
libtcolors_la_CFLAGS = $(AM_CFLAGS)
libtcolors_la_SOURCES = lib/colors.c lib/color-names.c include/colors.h include/color-names.h
libtcolors_la_LIBADD =