Makefile: libfdt: build only the strict necessary
v4 cover Makefile: libfdt: build only the strict necessary
v3 -> v4: NB! only useful when updating to latest dtc (not in QEMU yet)
* changed the approach to leverage new upstream dtc Makefile, needs dtc submodule update to include upstream dtc commit 85e5d839847af54efab170f2b1331b2a6421e647.
* LIBFDT_srcdir does not exist anymore in upstream dtc: it is also not used anymore.
* LIBFDT_lib: need to avoid building libfdt.so at least for now, so pass as empty to avoid building the .so. This is to avoid breaking existing trees with objects already compiled without -fPIC.
* clean: no need to make dtc clean target, every artifact is captured by global clean rule
v2 -> v3:
* changed into a 2 patch series; in the second patch we remove the old compatibility gunks that were meant for removal some time after 4.1.
* renamed the libfdt PHONY rule to dtc/all, with the intent to make existing working trees forward and backward compatible across the change.
v1 -> v2:
* fix error generated when running UNCHECKED_GOALS without prior configure, for example during make docker-image-fedora. Without configure, DSOSUF is empty, and the module pattern rule in rules.mak that uses this variable can match too much; provide a default in the Makefile to avoid it.
* only attempt to build the archive when there is a non-empty list of objects. This could be done in general for the %.a: pattern in rules.mak, but maybe there are valid reasons to build an empty .a?
* removed some intermediate variables that did not add much value (LIBFDT_srcdir, LIBFDT_archive)
Tested locally with 3 VPATH configurations (no-, VPATH, VPATH in src subdir), and with docker-image-fedora, docker-test-debug@fedora that failed before.
Claudio Fontana (2):
Makefile: libfdt: build only the strict necessary
Makefile: remove old compatibility gunks
Makefile | 32 ++++++++++++++++---------------- configure | 6 +----- rules.mak | 2 ++ 3 files changed, 19 insertions(+), 21 deletions(-)
Signature · 1 line
2.16.4
PATCH v4 1/2 Makefile: dtc: build the libfdt target
call the libfdt target from the dtc Makefile, which has been changed to not require bison, flex, etc.
scripts/ symlink and tests directory creation are not necessary, and neither is calling the clean rule explicitly.
--- Makefile | 10 +++++----- configure | 1 - 2 files changed, 5 insertions(+), 6 deletions(-)
Makefile +5 -5
@@ -526,13 +526,14 @@ $(SOFTMMU_FUZZ_RULES): $(edk2-decompressed) $(TARGET_DIRS_RULES): $(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C $(dir $@) V="$(V)" TARGET_DIR="$(dir $@)" $(notdir $@),) -DTC_MAKE_ARGS=-I$(SRC_PATH)/dtc VPATH=$(SRC_PATH)/dtc -C dtc V="$(V)" LIBFDT_srcdir=$(SRC_PATH)/dtc/libfdt +# LIBFDT_lib="": avoid breaking existing trees with objects requiring -fPIC +DTC_MAKE_ARGS=-I$(SRC_PATH)/dtc VPATH=$(SRC_PATH)/dtc -C dtc V="$(V)" LIBFDT_lib="" DTC_CFLAGS=$(CFLAGS) $(QEMU_CFLAGS) -DTC_CPPFLAGS=-I$(BUILD_DIR)/dtc -I$(SRC_PATH)/dtc -I$(SRC_PATH)/dtc/libfdt +DTC_CPPFLAGS=-I$(SRC_PATH)/dtc/libfdt .PHONY: dtc/all -dtc/all: .git-submodule-status dtc/libfdt dtc/tests - $(call quiet-command,$(MAKE) $(DTC_MAKE_ARGS) CPPFLAGS="$(DTC_CPPFLAGS)" CFLAGS="$(DTC_CFLAGS)" LDFLAGS="$(QEMU_LDFLAGS)" ARFLAGS="$(ARFLAGS)" CC="$(CC)" AR="$(AR)" LD="$(LD)" $(SUBDIR_MAKEFLAGS) libfdt/libfdt.a,) +dtc/all: .git-submodule-status dtc/libfdt + $(call quiet-command,$(MAKE) $(DTC_MAKE_ARGS) CPPFLAGS="$(DTC_CPPFLAGS)" CFLAGS="$(DTC_CFLAGS)" LDFLAGS="$(QEMU_LDFLAGS)" ARFLAGS="$(ARFLAGS)" CC="$(CC)" AR="$(AR)" LD="$(LD)" $(SUBDIR_MAKEFLAGS) libfdt,) dtc/%: .git-submodule-status @mkdir -p $@
@@ -820,7 +821,6 @@ distclean: clean rm -rf $$d || exit 1 ; \ done rm -Rf .sdk - if test -f dtc/version_gen.h; then $(MAKE) $(DTC_MAKE_ARGS) clean; fi KEYMAPS=da en-gb et fr fr-ch is lt no pt-br sv \ ar de en-us fi fr-be hr it lv nl pl ru th \
configure +0 -1
@@ -4281,7 +4281,6 @@ EOF mkdir -p dtc if [ "$pwd_is_source_path" != "y" ] ; then symlink "$source_path/dtc/Makefile" "dtc/Makefile" - symlink "$source_path/dtc/scripts" "dtc/scripts" fi fdt_cflags="-I\$(SRC_PATH)/dtc/libfdt" fdt_ldflags="-L\$(BUILD_DIR)/dtc/libfdt"
Signature · 1 line
2.16.4
PATCH v4 2/2 Makefile: remove old compatibility gunks
In reply to Claudio Fontana--- Makefile | 6 ------ 1 file changed, 6 deletions(-)
Makefile +0 -6
@@ -562,12 +562,6 @@ slirp/all: .git-submodule-status CC="$(CC)" AR="$(AR)" LD="$(LD)" RANLIB="$(RANLIB)" \ CFLAGS="$(QEMU_CFLAGS) $(CFLAGS)" LDFLAGS="$(QEMU_LDFLAGS)") -# Compatibility gunk to keep make working across the rename of targets -# for recursion, to be removed some time after 4.1. -subdir-dtc: dtc/all -subdir-capstone: capstone/all -subdir-slirp: slirp/all - $(filter %/all, $(TARGET_DIRS_RULES)): libqemuutil.a $(common-obj-y) \ $(qom-obj-y)
Signature · 1 line
2.16.4
Hi Claudio,
Quoted 5 lines · Claudio Fontana
v3 -> v4: NB! only useful when updating to latest dtc (not in QEMU yet)
* changed the approach to leverage new upstream dtc
Makefile, needs dtc submodule update to include upstream dtc commit85e5d839847af54efab170f2b1331b2a6421e647.
I don't have this commit locally:
fatal: bad object 85e5d839847af54efab170f2b1331b2a6421e647
My remote is https://git.qemu.org/git/dtc.git, might it be de-synchronized?
Quoted 3 lines
*
LIBFDT_srcdirdoes not exist anymore in upstream dtc: it is also not used anymore.
Why not include the submodule update in the first patch?
Quoted 42 lines
*
LIBFDT_lib: need to avoid building libfdt.so at least for now, so pass as empty to avoid building the .so. This is to avoid breaking existing trees with objects already compiled without -fPIC.* clean: no need to make dtc clean target, every artifact is captured by global clean rule
v2 -> v3:
* changed into a 2 patch series; in the second patch we remove the old compatibility gunks that were meant for removal some time after 4.1.
* renamed the libfdt PHONY rule to dtc/all, with the intent to make existing working trees forward and backward compatible across the change.
v1 -> v2:
* fix error generated when running
UNCHECKED_GOALSwithout prior configure, for example during make docker-image-fedora. Without configure, DSOSUF is empty, and the module pattern rule in rules.mak that uses this variable can match too much; provide a default in theMakefileto avoid it.* only attempt to build the archive when there is a non-empty list of objects. This could be done in general for the %.a: pattern in rules.mak, but maybe there are valid reasons to build an empty .a?
* removed some intermediate variables that did not add much value (
LIBFDT_srcdir,LIBFDT_archive)Tested locally with 3 VPATH configurations (no-, VPATH, VPATH in src subdir), and with docker-image-fedora, docker-test-debug@fedora that failed before.
Claudio Fontana (2):
Makefile: libfdt: build only the strict necessary
Makefile: remove old compatibility gunksMakefile | 32 ++++++++++++++++---------------- configure | 6 +----- rules.mak | 2 ++ 3 files changed, 19 insertions(+), 21 deletions(-)
Quoted 9 lines · Philippe Mathieu-Daudé
Hi Claudio,
Quoted 5 lines · Claudio Fontana
v3 -> v4: NB! only useful when updating to latest dtc (not in QEMU yet)
* changed the approach to leverage new upstream dtc
Makefile, needs dtc submodule update to include upstream dtc commit85e5d839847af54efab170f2b1331b2a6421e647.
Quoted 5 lines
I don't have this commit locally:
fatal: bad object
85e5d839847af54efab170f2b1331b2a6421e647My remote is https://git.qemu.org/git/dtc.git, might it be de-synchronized?
Hi Philippe, maybe that commit is not in the qemu dtc.git yet, only in David's tree at:
https://github.com/dgibson/dtc.git
Quoted 6 lines
Quoted 4 lines
*
LIBFDT_srcdirdoes not exist anymore in upstream dtc: it is also not used anymore.Why not include the submodule update in the first patch?
Right, I am not sure how git.qemu.org/git/dtc.git is updated?
I guess once it is, I should include the submodule update.
Thanks!
Claudio
Quoted 44 lines
Quoted 43 lines
*
LIBFDT_lib: need to avoid building libfdt.so at least for now, so pass as empty to avoid building the .so. This is to avoid breaking existing trees with objects already compiled without -fPIC.* clean: no need to make dtc clean target, every artifact is captured by global clean rule
v2 -> v3:
* changed into a 2 patch series; in the second patch we remove the old compatibility gunks that were meant for removal some time after 4.1.
* renamed the libfdt PHONY rule to dtc/all, with the intent to make existing working trees forward and backward compatible across the change.
v1 -> v2:
* fix error generated when running
UNCHECKED_GOALSwithout prior configure, for example during make docker-image-fedora. Without configure, DSOSUF is empty, and the module pattern rule in rules.mak that uses this variable can match too much; provide a default in theMakefileto avoid it.* only attempt to build the archive when there is a non-empty list of objects. This could be done in general for the %.a: pattern in rules.mak, but maybe there are valid reasons to build an empty .a?
* removed some intermediate variables that did not add much value (
LIBFDT_srcdir,LIBFDT_archive)Tested locally with 3 VPATH configurations (no-, VPATH, VPATH in src subdir), and with docker-image-fedora, docker-test-debug@fedora that failed before.
Claudio Fontana (2):
Makefile: libfdt: build only the strict necessary
Makefile: remove old compatibility gunksMakefile | 32 ++++++++++++++++---------------- configure | 6 +----- rules.mak | 2 ++ 3 files changed, 19 insertions(+), 21 deletions(-)
Quoted 22 lines · Claudio Fontana
Quoted 9 lines · Philippe Mathieu-Daudé
Hi Claudio,
Quoted 5 lines · Claudio Fontana
v3 -> v4: NB! only useful when updating to latest dtc (not in QEMU yet)
* changed the approach to leverage new upstream dtc
Makefile, needs dtc submodule update to include upstream dtc commit85e5d839847af54efab170f2b1331b2a6421e647.Quoted 5 lines
I don't have this commit locally:
fatal: bad object
85e5d839847af54efab170f2b1331b2a6421e647My remote is https://git.qemu.org/git/dtc.git, might it be de-synchronized?
Hi Philippe, maybe that commit is not in the qemu dtc.git yet, only in David's tree at:
https://github.com/dgibson/dtc.git
Quoted 2 lines
Quoted 2 lines
Quoted 8 lines
Quoted 4 lines
Quoted 2 lines
*
LIBFDT_srcdirdoes not exist anymore in upstream dtc: it is also not used anymore.Why not include the submodule update in the first patch?
Right, I am not sure how git.qemu.org/git/dtc.git is updated?
I guess once it is, I should include the submodule update.
OK. Maybe David want to make a libdtc release first, before to update QEMU submodule.
Meanwhile using David's remote, and the submodule update:
-- >8 --
dtc +1 -1
@@ -1 +1 @@ -Subproject commit 88f18909db731a627456f26d779445f84e449536 +Subproject commit 85e5d839847af54efab170f2b1331b2a6421e647
---
for the series:
Quoted 50 lines
Thanks!
Claudio
Quoted 44 lines
Quoted 43 lines
*
LIBFDT_lib: need to avoid building libfdt.so at least for now, so pass as empty to avoid building the .so. This is to avoid breaking existing trees with objects already compiled without -fPIC.* clean: no need to make dtc clean target, every artifact is captured by global clean rule
v2 -> v3:
* changed into a 2 patch series; in the second patch we remove the old compatibility gunks that were meant for removal some time after 4.1.
* renamed the libfdt PHONY rule to dtc/all, with the intent to make existing working trees forward and backward compatible across the change.
v1 -> v2:
* fix error generated when running
UNCHECKED_GOALSwithout prior configure, for example during make docker-image-fedora. Without configure, DSOSUF is empty, and the module pattern rule in rules.mak that uses this variable can match too much; provide a default in theMakefileto avoid it.* only attempt to build the archive when there is a non-empty list of objects. This could be done in general for the %.a: pattern in rules.mak, but maybe there are valid reasons to build an empty .a?
* removed some intermediate variables that did not add much value (
LIBFDT_srcdir,LIBFDT_archive)Tested locally with 3 VPATH configurations (no-, VPATH, VPATH in src subdir), and with docker-image-fedora, docker-test-debug@fedora that failed before.
Claudio Fontana (2):
Makefile: libfdt: build only the strict necessary
Makefile: remove old compatibility gunksMakefile | 32 ++++++++++++++++---------------- configure | 6 +----- rules.mak | 2 ++ 3 files changed, 19 insertions(+), 21 deletions(-)
Quoted 12 lines · Claudio Fontana
Quoted 11 lines · Philippe Mathieu-Daudé
Hi Claudio,
Quoted 5 lines · Claudio Fontana
v3 -> v4: NB! only useful when updating to latest dtc (not in QEMU yet)
* changed the approach to leverage new upstream dtc
Makefile, needs dtc submodule update to include upstream dtc commit85e5d839847af54efab170f2b1331b2a6421e647.I don't have this commit locally:
Quoted 7 lines
Quoted 3 lines
fatal: bad object
85e5d839847af54efab170f2b1331b2a6421e647My remote is https://git.qemu.org/git/dtc.git, might it be de-synchronized?
Hi Philippe, maybe that commit is not in the qemu dtc.git yet, only in David's tree at:
Oops, I forgot to push it to the master tree atgit://git.kernel.org/pub/scm/utils/dtc/dtc.git
Done now. The qemu.org mirror should update within a day or so.
Quoted 58 lines
Quoted 4 lines
Quoted 2 lines
*
LIBFDT_srcdirdoes not exist anymore in upstream dtc: it is also not used anymore.Why not include the submodule update in the first patch?
Right, I am not sure how git.qemu.org/git/dtc.git is updated?
I guess once it is, I should include the submodule update.
Thanks!
Claudio
Quoted 44 lines
Quoted 43 lines
*
LIBFDT_lib: need to avoid building libfdt.so at least for now, so pass as empty to avoid building the .so. This is to avoid breaking existing trees with objects already compiled without -fPIC.* clean: no need to make dtc clean target, every artifact is captured by global clean rule
v2 -> v3:
* changed into a 2 patch series; in the second patch we remove the old compatibility gunks that were meant for removal some time after 4.1.
* renamed the libfdt PHONY rule to dtc/all, with the intent to make existing working trees forward and backward compatible across the change.
v1 -> v2:
* fix error generated when running
UNCHECKED_GOALSwithout prior configure, for example during make docker-image-fedora. Without configure, DSOSUF is empty, and the module pattern rule in rules.mak that uses this variable can match too much; provide a default in theMakefileto avoid it.* only attempt to build the archive when there is a non-empty list of objects. This could be done in general for the %.a: pattern in rules.mak, but maybe there are valid reasons to build an empty .a?
* removed some intermediate variables that did not add much value (
LIBFDT_srcdir,LIBFDT_archive)Tested locally with 3 VPATH configurations (no-, VPATH, VPATH in src subdir), and with docker-image-fedora, docker-test-debug@fedora that failed before.
Claudio Fontana (2):
Makefile: libfdt: build only the strict necessary
Makefile: remove old compatibility gunksMakefile | 32 ++++++++++++++++---------------- configure | 6 +----- rules.mak | 2 ++ 3 files changed, 19 insertions(+), 21 deletions(-)
Signature · 4 lines
David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson