Skip to content

Commit aa34b14

Browse files
kulikjakvlmarek
authored andcommitted
35621947 Update GNU make to 4.4.1
35899707 Improve and fix Userland build infrastructure
1 parent a29a4f7 commit aa34b14

File tree

11 files changed

+148
-169
lines changed

11 files changed

+148
-169
lines changed

Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#
1919
# CDDL HEADER END
2020
#
21-
# Copyright (c) 2010, 2020, Oracle and/or its affiliates.
21+
# Copyright (c) 2010, 2023, Oracle and/or its affiliates.
2222
#
2323

2424
SUBDIRS = components
@@ -30,6 +30,7 @@ TARGETS = \
3030
prep \
3131
build \
3232
install \
33+
mangle \
3334
publish \
3435
validate \
3536
clean \

components/Makefile

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ patch: TARGET = patch
7575
prep: TARGET = prep
7676
build: TARGET = build
7777
install: TARGET = install
78+
mangle: TARGET = mangle
7879
publish: TARGET = publish
7980
clean: TARGET = clean
8081
clobber: TARGET = clobber
@@ -85,7 +86,7 @@ check_rtime: TARGET = check_rtime
8586
zone-build: TARGET = component-zone-build
8687
component-hook: TARGET = component-hook
8788
regen-patches: TARGET = regen-patches
88-
download zone-build prep build install publish test system-test check_rtime regen-patches: \
89+
download zone-build prep build install mangle publish test system-test check_rtime regen-patches: \
8990
LOG = >$(WS_LOGS)/$(subst /,.,$@).$(TARGET).log 2>&1 ; \
9091
RET=$$? ; \
9192
if [ -d $(WS_COMPONENTS)/$@/build ]; then \
@@ -111,11 +112,11 @@ system-test: MAKEFLAGS += TOP_LEVEL_TEST=yes
111112

112113
# We need to distinguish between the full and one component build
113114
# in order to tune the number of parallel build jobs.
114-
build install publish: MAKEFLAGS += TOP_LEVEL_RUN=yes
115+
build install mangle publish: MAKEFLAGS += TOP_LEVEL_RUN=yes
115116

116117
.DEFAULT_GOAL := publish
117118

118-
zone-build build install publish test system-test: $(COMPONENT_DIRS)
119+
zone-build build install mangle publish test system-test: $(COMPONENT_DIRS)
119120

120121
COMPONENT_DIRS.nosetup = $(COMPONENT_DIRS:%=%.nosetup)
121122

@@ -183,7 +184,7 @@ $(call read-config,JOBS_PER_COMPONENT,1)
183184
$(COMPONENT_DIRS): $(WS_LOGS) setup FORCE
184185
@cd $@ && echo "$(TARGET) $@" && \
185186
( env MAKELEVEL= COMPONENT_MAKE_JOBS=$(JOBS_PER_COMPONENT) \
186-
time $(COMPONENT_MAKE_WRAPPER) $(GMAKE) --no-keep-going $(TARGET); \
187+
time $(COMPONENT_MAKE_WRAPPER) $(GMAKE) --jobs=1 --no-keep-going $(TARGET); \
187188
RET=$$?; \
188189
echo TARGET_EXIT_CODE $$RET; \
189190
exit $$RET \

components/make/Makefile

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,20 +20,19 @@
2020
#
2121

2222
#
23-
# Copyright (c) 2011, 2022, Oracle and/or its affiliates.
23+
# Copyright (c) 2011, 2023, Oracle and/or its affiliates.
2424
#
2525
BUILD_BITS= 64
2626
include ../../make-rules/shared-macros.mk
2727

2828
COMPONENT_NAME= make
29-
COMPONENT_VERSION= 4.3
29+
COMPONENT_VERSION= 4.4.1
3030
COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz
3131
COMPONENT_ARCHIVE_HASH= \
32-
sha256:e05fdde47c5f7ca45cb697e973894ff4f5d79e13b750ed57d7b66d8defc78e19
32+
sha256:dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3
3333
COMPONENT_BUGDB= utility/gnu-make
3434
COMPONENT_ANITYA_ID= 1877
35-
36-
COMPONENT_BAID= 116561
35+
COMPONENT_BAID= 147242
3736

3837
# the test suite needs to be configured first
3938
SYSTEM_TEST_TARGET= configure $(SYSTEM_TEST_64)

components/make/make.p5m

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#
2121

2222
#
23-
# Copyright (c) 2011, 2022, Oracle and/or its affiliates.
23+
# Copyright (c) 2011, 2023, Oracle and/or its affiliates.
2424
#
2525

2626
<transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
@@ -46,6 +46,7 @@ link path=usr/sfw/share/man/man1/gmake.1 \
4646
file path=usr/share/info/make.info
4747
file path=usr/share/info/make.info-1
4848
file path=usr/share/info/make.info-2
49+
file path=usr/share/info/make.info-3
4950
file path=usr/share/locale/be/LC_MESSAGES/make.mo
5051
file path=usr/share/locale/bg/LC_MESSAGES/make.mo
5152
file path=usr/share/locale/cs/LC_MESSAGES/make.mo
@@ -67,6 +68,7 @@ file path=usr/share/locale/nl/LC_MESSAGES/make.mo
6768
file path=usr/share/locale/pl/LC_MESSAGES/make.mo
6869
file path=usr/share/locale/pt/LC_MESSAGES/make.mo
6970
file path=usr/share/locale/pt_BR/LC_MESSAGES/make.mo
71+
file path=usr/share/locale/ro/LC_MESSAGES/make.mo
7072
file path=usr/share/locale/ru/LC_MESSAGES/make.mo
7173
file path=usr/share/locale/sr/LC_MESSAGES/make.mo
7274
file path=usr/share/locale/sv/LC_MESSAGES/make.mo

components/make/patches/d79fe162c009788888faaf0317253b6f0cac7092.patch

Lines changed: 0 additions & 45 deletions
This file was deleted.

0 commit comments

Comments
 (0)