22 # |
22 # |
23 |
23 |
24 include ../../make-rules/shared-macros.mk |
24 include ../../make-rules/shared-macros.mk |
25 |
25 |
26 COMPONENT_NAME= text-utilities |
26 COMPONENT_NAME= text-utilities |
27 COMPONENT_VERSION= 2.24.2 |
27 COMPONENT_VERSION= 2.25.2 |
28 COMPONENT_PROJECT_URL= https://www.kernel.org/pub/linux/utils/util-linux |
28 COMPONENT_PROJECT_URL= https://www.kernel.org/pub/linux/utils/util-linux |
29 COMPONENT_SRC= util-linux-$(COMPONENT_VERSION) |
29 COMPONENT_SRC= util-linux-$(COMPONENT_VERSION) |
30 COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.xz |
30 COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.xz |
31 COMPONENT_ARCHIVE_HASH= \ |
31 COMPONENT_ARCHIVE_HASH= \ |
32 sha256:1243d6c07f1c5b38aa4c3814c81a71c24cba7dafe08942916bf216a90a460ff0 |
32 sha256:e0457f715b73f4a349e1acb08cb410bf0edc9a74a3f75c357070f31f70e33cd6 |
33 COMPONENT_ARCHIVE_URL= $(COMPONENT_PROJECT_URL)/v2.24/$(COMPONENT_ARCHIVE) |
33 COMPONENT_ARCHIVE_URL= $(COMPONENT_PROJECT_URL)/v2.25/$(COMPONENT_ARCHIVE) |
34 COMPONENT_BUGDB= utility/text-utilities |
34 COMPONENT_BUGDB= utility/text-utilities |
35 |
35 |
36 TPNO= 17825 |
36 TPNO= 21750 |
37 |
37 |
38 include $(WS_MAKE_RULES)/prep.mk |
38 include $(WS_MAKE_RULES)/prep.mk |
39 include $(WS_MAKE_RULES)/configure.mk |
39 include $(WS_MAKE_RULES)/configure.mk |
40 include $(WS_MAKE_RULES)/ips.mk |
40 include $(WS_MAKE_RULES)/ips.mk |
41 |
41 |
42 # We currently only want some of the text-utils text utilities from this |
42 # We currently only want some of the text-utils text utilities from this |
43 # component, so enumerate it in a macro that we can use for build and install. |
43 # component, so enumerate it in a macro that we can use for build and install. |
44 # Anything else that we want should be added to this macro in the future. |
44 # Anything else that we want should be added to this macro in the future. |
45 PROGRAMS = colcrt colrm column hexdump rev tailf |
45 PROGRAMS = colcrt colrm column hexdump rev tailf |
46 |
46 |
|
47 # Build a utility program used by one of the hexdump tests. |
|
48 PROGRAMS += test_sysinfo |
|
49 |
47 # Limit translations to the text utilities (and lib/* and include/* ) only. |
50 # Limit translations to the text utilities (and lib/* and include/* ) only. |
48 COMPONENT_PRE_INSTALL_ACTION = \ |
51 COMPONENT_PRE_INSTALL_ACTION = \ |
49 (cd $(@D)/po ; $(GMAKE) text-utilities.pot-update) |
52 (cd $(@D)/po ; $(GMAKE) text-utilities.pot-update) |
50 |
53 |
51 CONFIGURE_OPTIONS += CFLAGS="$(CFLAGS)" |
54 CONFIGURE_OPTIONS += CFLAGS="$(CFLAGS)" |
52 CONFIGURE_OPTIONS += --bindir=$(CONFIGURE_BINDIR.32) |
55 CONFIGURE_OPTIONS += --bindir=$(CONFIGURE_BINDIR.32) |
|
56 |
|
57 # We don't need the Python bindings built. |
|
58 CONFIGURE_OPTIONS += --without-python |
53 |
59 |
54 # Makefile incorrectly includes gcc(1) '-fsigned-char' in AM_CFLAGS, so we |
60 # Makefile incorrectly includes gcc(1) '-fsigned-char' in AM_CFLAGS, so we |
55 # override it. |
61 # override it. |
56 COMPONENT_BUILD_ARGS += AM_CFLAGS="" |
62 COMPONENT_BUILD_ARGS += AM_CFLAGS="" |
57 |
63 |
77 COMPONENT_TEST_ENV += TS_CMD_HEXDUMP=$(PROTO_DIR)/usr/bin/hexdump |
83 COMPONENT_TEST_ENV += TS_CMD_HEXDUMP=$(PROTO_DIR)/usr/bin/hexdump |
78 COMPONENT_TEST_ENV += TS_CMD_TAILF=$(PROTO_DIR)/usr/bin/tailf |
84 COMPONENT_TEST_ENV += TS_CMD_TAILF=$(PROTO_DIR)/usr/bin/tailf |
79 COMPONENT_TEST_ENV += PATH="$(GNUBIN):$(PATH)" |
85 COMPONENT_TEST_ENV += PATH="$(GNUBIN):$(PATH)" |
80 COMPONENT_TEST_DIR = $(COMPONENT_SRC)/tests |
86 COMPONENT_TEST_DIR = $(COMPONENT_SRC)/tests |
81 |
87 |
82 # The given hexdump tests are little-endian specific, so the test script |
88 # The hexdump tests expect the test_sysinfo program in a different location |
83 # has been adjusted to do some endian-neutral ones. Copy the input and |
89 # than where it's built. |
84 # the expected results to where they are needed. |
90 COMPONENT_PRE_TEST_ACTION = $(CP) $(@D)/test_sysinfo $(COMPONENT_SRC)/ |
85 COMPONENT_PRE_TEST_ACTION = ( \ |
|
86 $(CP) $(COMPONENT_DIR)/files/hexdump-input \ |
|
87 $(COMPONENT_SRC)/tests/ts/hexdump/; \ |
|
88 $(CP) $(COMPONENT_DIR)/files/hexdump-expected \ |
|
89 $(COMPONENT_SRC)/tests/expected/hexdump/empty-format; ) |
|
90 |
91 |
91 COMPONENT_TEST_CMD = ./run.sh |
92 COMPONENT_TEST_CMD = ./run.sh |
92 COMPONENT_TEST_ARGS = --verbose |
93 COMPONENT_TEST_ARGS = --verbose |
93 COMPONENT_TEST_TARGETS = colrm column hexdump tailf |
94 COMPONENT_TEST_TARGETS = colrm column hexdump tailf |
94 |
95 |
95 # common targets |
96 COMPONENT_TEST_MASTER = $(COMPONENT_TEST_RESULTS_DIR)/results-$(MACH)-64.master |
|
97 |
96 configure: $(CONFIGURE_64) |
98 configure: $(CONFIGURE_64) |
97 |
99 |
98 build: $(BUILD_64) |
100 build: $(BUILD_64) |
99 |
101 |
100 install: $(INSTALL_64) |
102 install: $(INSTALL_64) |