Makefile: libfdt: build only the strict necessary
PATCH v2 1/1 Makefile: libfdt: build only the strict necessary
when building dtc/libfdt, we were previously using dtc/Makefile, which tries to build some artifacts that are not needed, and can complain on stderr about the absence of tools that are not required to build just libfdt.
Instead, build only the strict necessary to get libfdt.a .
Remove the subdir-dtc "compatibility gunk" for recursion, since we are not recursing anymore.
--- Makefile | 23 +++++++++++++---------- configure | 6 +----- rules.mak | 2 ++ 3 files changed, 16 insertions(+), 15 deletions(-)
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.
Makefile +13 -10
@@ -4,6 +4,10 @@ ifneq ($(words $(subst :, ,$(CURDIR))), 1) $(error main directory cannot contain spaces nor colons) endif +# some pattern rules in rules.mak are confused by an empty DSOSUF, +# and UNCHECKED_GOALS for testing (docker-) can run without prior configure. +DSOSUF ?= ".so" + # Always point to the root of the build tree (needs GNU make). BUILD_DIR=$(CURDIR)
@@ -526,15 +530,16 @@ $(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 -DTC_CFLAGS=$(CFLAGS) $(QEMU_CFLAGS) -DTC_CPPFLAGS=-I$(BUILD_DIR)/dtc -I$(SRC_PATH)/dtc -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,) +LIBFDT_objdir = dtc/libfdt +-include $(SRC_PATH)/dtc/libfdt/Makefile.libfdt +LIBFDT_objects = $(addprefix $(LIBFDT_objdir)/, $(LIBFDT_OBJS)) +.PHONY: libfdt +libfdt: .git-submodule-status $(LIBFDT_objdir)/libfdt.a +$(LIBFDT_objdir)/libfdt.a: $(LIBFDT_objects) + $(if $(LIBFDT_objects),$(call quiet-command,rm -f $@ && $(AR) rcs $@ $^,"AR","$(TARGET_DIR)$@"),) -dtc/%: .git-submodule-status +$(LIBFDT_objects): | $(LIBFDT_objdir) +$(LIBFDT_objdir): .git-submodule-status @mkdir -p $@ # Overriding CFLAGS causes us to lose defines added in the sub-makefile.
@@ -563,7 +568,6 @@ slirp/all: .git-submodule-status # 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
@@ -821,7 +825,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 +1 -5
@@ -4278,10 +4278,6 @@ EOF if test -d "${source_path}/dtc/libfdt" || test -e "${source_path}/.git" ; then fdt=git 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" fdt_libs="$fdt_libs"
@@ -8151,7 +8147,7 @@ echo "PIXMAN_CFLAGS=$pixman_cflags" >> $config_host_mak echo "PIXMAN_LIBS=$pixman_libs" >> $config_host_mak if [ "$fdt" = "git" ]; then - echo "config-host.h: dtc/all" >> $config_host_mak + echo "config-host.h: libfdt" >> $config_host_mak fi if [ "$capstone" = "git" -o "$capstone" = "internal" ]; then echo "config-host.h: capstone/all" >> $config_host_mak
rules.mak +2 -0
@@ -105,6 +105,8 @@ LINK = $(call quiet-command, $(LINKPROG) $(CFLAGS) $(QEMU_LDFLAGS) -o $@ \ DSO_OBJ_CFLAGS := -fPIC -DBUILD_DSO module-common.o: CFLAGS += $(DSO_OBJ_CFLAGS) + +# Note: DSOSUF must not be empty, or these rules will try to match too much %$(DSOSUF): QEMU_LDFLAGS += $(LDFLAGS_SHARED) %$(DSOSUF): %.mo $(call LINK,$^)
Signature · 1 line
2.16.4
Hi Claudio,
Quoted 50 lines · Claudio Fontana
when building dtc/libfdt, we were previously using dtc/Makefile, which tries to build some artifacts that are not needed, and can complain on stderr about the absence of tools that are not required to build just libfdt.
Instead, build only the strict necessary to get libfdt.a .
Remove the subdir-dtc "compatibility gunk" for recursion, since we are not recursing anymore.
Signed-off-by Claudio Fontana <[email protected]>--- Makefile | 23 +++++++++++++---------- configure | 6 +----- rules.mak | 2 ++ 3 files changed, 16 insertions(+), 15 deletions(-)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.
Makefile +4
-0@@ -4,6 +4,10 @@ ifneq ($(words $(subst :, ,$(CURDIR))), 1) $(error main directory cannot contain spaces nor colons) endif +# some pattern rules in rules.mak are confused by an empty DSOSUF, +# and UNCHECKED_GOALS for testing (docker-) can run without prior configure. +DSOSUF ?= ".so" + # Always point to the root of the build tree (needs GNU make). BUILD_DIR=$(CURDIR)
Makefile $(SOFTMMU_FUZZ_RULES): $(edk2-decompressed) · line 534
Quoted 9 lines
Makefile +0
-6@@ -526,15 +530,16 @@ $(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 -DTC_CFLAGS=$(CFLAGS) $(QEMU_CFLAGS) -DTC_CPPFLAGS=-I$(BUILD_DIR)/dtc -I$(SRC_PATH)/dtc -I$(SRC_PATH)/dtc/libfdt - -.PHONY: dtc/all -dtc/all: .git-submodule-status dtc/libfdt dtc/tests
I'm getting:
config-host.mak is out-of-date, running configure
make: *** No rule to make target 'dtc/all', needed by 'config-host.h'. Stop.
On second try it works.
Instead of alarming users, we could keep this target as a silent no-op, then remove it after some time.
For the rest, patch looks good, nice cleanup!
Regards,
Phil.
Quoted 69 lines
Makefile +9
-4- $(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,) +LIBFDT_objdir = dtc/libfdt +-include $(SRC_PATH)/dtc/libfdt/Makefile.libfdt +LIBFDT_objects = $(addprefix $(LIBFDT_objdir)/, $(LIBFDT_OBJS)) +.PHONY: libfdt +libfdt: .git-submodule-status $(LIBFDT_objdir)/libfdt.a +$(LIBFDT_objdir)/libfdt.a: $(LIBFDT_objects) + $(if $(LIBFDT_objects),$(call quiet-command,rm -f $@ && $(AR) rcs $@ $^,"AR","$(TARGET_DIR)$@"),) -dtc/%: .git-submodule-status +$(LIBFDT_objects): | $(LIBFDT_objdir) +$(LIBFDT_objdir): .git-submodule-status @mkdir -p $@ # Overriding CFLAGS causes us to lose defines added in the sub-makefile.@@ -563,7 +568,6 @@ slirp/all: .git-submodule-status # 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@@ -821,7 +825,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 +1
-5@@ -4278,10 +4278,6 @@ EOF if test -d "${source_path}/dtc/libfdt" || test -e "${source_path}/.git" ; then fdt=git 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" fdt_libs="$fdt_libs"@@ -8151,7 +8147,7 @@ echo "PIXMAN_CFLAGS=$pixman_cflags" >> $config_host_mak echo "PIXMAN_LIBS=$pixman_libs" >> $config_host_mak if [ "$fdt" = "git" ]; then - echo "config-host.h: dtc/all" >> $config_host_mak + echo "config-host.h: libfdt" >> $config_host_mak fi if [ "$capstone" = "git" -o "$capstone" = "internal" ]; then echo "config-host.h: capstone/all" >> $config_host_makrules.mak +2
-0@@ -105,6 +105,8 @@ LINK = $(call quiet-command, $(LINKPROG) $(CFLAGS) $(QEMU_LDFLAGS) -o $@ \ DSO_OBJ_CFLAGS := -fPIC -DBUILD_DSO module-common.o: CFLAGS += $(DSO_OBJ_CFLAGS) + +# Note: DSOSUF must not be empty, or these rules will try to match too much %$(DSOSUF): QEMU_LDFLAGS += $(LDFLAGS_SHARED) %$(DSOSUF): %.mo $(call LINK,$^)
Quoted 65 lines · Philippe Mathieu-Daudé
Hi Claudio,
Quoted 53 lines · Claudio Fontana
when building dtc/libfdt, we were previously using dtc/Makefile, which tries to build some artifacts that are not needed, and can complain on stderr about the absence of tools that are not required to build just libfdt.
Instead, build only the strict necessary to get libfdt.a .
Remove the subdir-dtc "compatibility gunk" for recursion, since we are not recursing anymore.
Signed-off-by Claudio Fontana <[email protected]>---
Makefile | 23 +++++++++++++----------
configure | 6 +-----
rules.mak | 2 ++3 files changed, 16 insertions(+), 15 deletions(-)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.
Makefile +0
-0@@ -4,6 +4,10 @@ ifneq ($(words $(subst :, ,$(CURDIR))), 1) $(error main directory cannot contain spaces nor colons)endif
Makefile +2
-0+# some pattern rules in rules.mak are confused by an empty DSOSUF, +# and UNCHECKED_GOALS for testing (docker-) can run without priorconfigure.
Makefile +2
-0+DSOSUF ?= ".so" +# Always point to the root of the build tree (needs GNU make). BUILD_DIR=$(CURDIR)
Makefile +0
-0@@ -526,15 +530,16 @@ $(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/libfdtMakefile $(SOFTMMU_FUZZ_RULES): $(edk2-decompressed) · line 534
Quoted 6 lines
Makefile +0
-6-DTC_CFLAGS=$(CFLAGS) $(QEMU_CFLAGS) -DTC_CPPFLAGS=-I$(BUILD_DIR)/dtc -I$(SRC_PATH)/dtc -I$(SRC_PATH)/dtc/libfdt - -.PHONY: dtc/all -dtc/all: .git-submodule-status dtc/libfdt dtc/testsI'm getting:
Quoted 4 lines
config-host.mak is out-of-date, running configure
make: *** No rule to make target 'dtc/all', needed by 'config-host.h'. Stop.On second try it works.
FYI same happens when going back (previous this patch applied) but there is nothing we can do to prevent that afaik:
config-host.mak is out-of-date, running configure
make: *** No rule to make target 'libfdt', needed by 'config-host.h'. Stop.
Quoted 77 lines
Instead of alarming users, we could keep this target as a silent no-op, then remove it after some time.
For the rest, patch looks good, nice cleanup!
Regards,
Phil.
Quoted 68 lines
- $(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,)Makefile +7
-0+LIBFDT_objdir = dtc/libfdt +-include $(SRC_PATH)/dtc/libfdt/Makefile.libfdt +LIBFDT_objects = $(addprefix $(LIBFDT_objdir)/, $(LIBFDT_OBJS)) +.PHONY: libfdt +libfdt: .git-submodule-status $(LIBFDT_objdir)/libfdt.a +$(LIBFDT_objdir)/libfdt.a: $(LIBFDT_objects) + $(if $(LIBFDT_objects),$(call quiet-command,rm -f $@ && $(AR) rcs$@ $^,"AR","$(TARGET_DIR)$@"),)
-dtc/%: .git-submodule-status
+$(LIBFDT_objects): | $(LIBFDT_objdir)
+$(LIBFDT_objdir): .git-submodule-status
@mkdir -p $@
# Overriding CFLAGS causes us to lose defines added in the sub-makefile.Makefile +0
-1@@ -563,7 +568,6 @@ slirp/all: .git-submodule-status # Compatibility gunk to keep make working across the rename of targets # for recursion, to be removed some time after 4.1. -subdir-dtc: dtc/allsubdir-capstone: capstone/all
subdir-slirp: slirp/allMakefile +0
-0@@ -821,7 +825,6 @@ distclean: clean rm -rf $$d || exit 1 ; \done
rm -Rf .sdk
- if test -fdtc/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
-0@@ -4278,10 +4278,6 @@ EOFif test -d "${source_path}/dtc/libfdt" || test -e "${source_path}/.git" ; then fdt=git
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" fdt_libs="$fdt_libs"configure +0
-0@@ -8151,7 +8147,7 @@ echo "PIXMAN_CFLAGS=$pixman_cflags" >>$config_host_mak
echo "PIXMAN_LIBS=$pixman_libs" >> $config_host_mak if [ "$fdt" = "git" ]; then
- echo "config-host.h: dtc/all" >> $config_host_mak + echo "config-host.h: libfdt" >> $config_host_mak fi
if [ "$capstone" = "git" -o "$capstone" = "internal" ]; then echo "config-host.h: capstone/all" >> $config_host_makrules.mak +0
-0@@ -105,6 +105,8 @@ LINK = $(call quiet-command, $(LINKPROG) $(CFLAGS) $(QEMU_LDFLAGS) -o $@ \
DSO_OBJ_CFLAGS:= -fPIC -DBUILD_DSO
module-common.o: CFLAGS += $(DSO_OBJ_CFLAGS)rules.mak +2
-0+ +# Note: DSOSUF must not be empty, or these rules will try to matchtoo much
%$(DSOSUF):QEMU_LDFLAGS+= $(LDFLAGS_SHARED)
%$(DSOSUF): %.mo
$(call LINK,$^)
Hello Philippe, Markus,
Quoted 74 lines · Philippe Mathieu-Daudé
Quoted 73 lines · Philippe Mathieu-Daudé
Hi Claudio,
Quoted 61 lines · Claudio Fontana
when building dtc/libfdt, we were previously using dtc/Makefile, which tries to build some artifacts that are not needed, and can complain on stderr about the absence of tools that are not required to build just libfdt.
Instead, build only the strict necessary to get libfdt.a .
Remove the subdir-dtc "compatibility gunk" for recursion, since we are not recursing anymore.
Signed-off-by Claudio Fontana <[email protected]>---
Makefile | 23 +++++++++++++----------
configure | 6 +-----
rules.mak | 2 ++3 files changed, 16 insertions(+), 15 deletions(-)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.Makefile +0
-0@@ -4,6 +4,10 @@ ifneq ($(words $(subst :, ,$(CURDIR))), 1) $(error main directory cannot contain spaces nor colons)endif
Makefile +2
-0+# some pattern rules in rules.mak are confused by an empty DSOSUF, +# and UNCHECKED_GOALS for testing (docker-) can run without priorconfigure.
Makefile +2
-0+DSOSUF ?= ".so" +# Always point to the root of the build tree (needs GNU make). BUILD_DIR=$(CURDIR)
Makefile +0
-0@@ -526,15 +530,16 @@ $(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/libfdtMakefile $(SOFTMMU_FUZZ_RULES): $(edk2-decompressed) · line 534
Quoted 6 lines
Makefile +0
-6-DTC_CFLAGS=$(CFLAGS) $(QEMU_CFLAGS) -DTC_CPPFLAGS=-I$(BUILD_DIR)/dtc -I$(SRC_PATH)/dtc -I$(SRC_PATH)/dtc/libfdt - -.PHONY: dtc/all -dtc/all: .git-submodule-status dtc/libfdt dtc/testsI'm getting:
Quoted 8 lines
Quoted 5 lines
config-host.mak is out-of-date, running configure
make: *** No rule to make target 'dtc/all', needed by 'config-host.h'. Stop.On second try it works.
FYI same happens when going back (previous this patch applied) but there is nothing we can do to prevent that afaik:
hmm maybe preserving the previous name for the phony rule "dtc/all" could make it work both forward and backward.. I'll try it in v3.
Quoted 9 lines
config-host.mak is out-of-date, running configure
make: *** No rule to make target 'libfdt', needed by 'config-host.h'. Stop.Quoted 5 lines
Instead of alarming users, we could keep this target as a silent no-op, then remove it after some time.
For the rest, patch looks good, nice cleanup!
I am tempted to remove the old compatibility gunks that are marked as "to be removed some time after 4.1" as the second patch in the series, any thoughts? (Markus?)
Ciao,
Claudio
Quoted 79 lines
Quoted 78 lines
Regards,
Phil.
Quoted 73 lines
- $(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,)
Makefile +7
-0+LIBFDT_objdir = dtc/libfdt +-include $(SRC_PATH)/dtc/libfdt/Makefile.libfdt +LIBFDT_objects = $(addprefix $(LIBFDT_objdir)/, $(LIBFDT_OBJS)) +.PHONY: libfdt +libfdt: .git-submodule-status $(LIBFDT_objdir)/libfdt.a +$(LIBFDT_objdir)/libfdt.a: $(LIBFDT_objects) + $(if $(LIBFDT_objects),$(call quiet-command,rm -f $@ && $(AR) rcs$@ $^,"AR","$(TARGET_DIR)$@"),)
-dtc/%: .git-submodule-status
+$(LIBFDT_objects): | $(LIBFDT_objdir) +$(LIBFDT_objdir): .git-submodule-status
@mkdir -p $@
# Overriding CFLAGS causes us to lose defines added in the sub-makefile.Makefile +0
-1@@ -563,7 +568,6 @@ slirp/all: .git-submodule-status # Compatibility gunk to keep make working across the rename of targets # for recursion, to be removed some time after 4.1. -subdir-dtc: dtc/allsubdir-capstone: capstone/all
subdir-slirp: slirp/allMakefile +0
-0@@ -821,7 +825,6 @@ distclean: clean rm -rf $$d || exit 1 ; \done
rm -Rf .sdk
- if test -fdtc/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
-0@@ -4278,10 +4278,6 @@ EOFif test -d "${source_path}/dtc/libfdt" || test -e "${source_path}/.git" ; then
fdt=git
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" fdt_libs="$fdt_libs"configure +0
-0@@ -8151,7 +8147,7 @@ echo "PIXMAN_CFLAGS=$pixman_cflags" >>$config_host_mak
echo "PIXMAN_LIBS=$pixman_libs" >> $config_host_mak if [ "$fdt" = "git" ]; then
- echo "config-host.h: dtc/all" >> $config_host_mak + echo "config-host.h: libfdt" >> $config_host_mak fi
if [ "$capstone" = "git" -o "$capstone" = "internal" ]; then echo "config-host.h: capstone/all" >> $config_host_makrules.mak +0
-0@@ -105,6 +105,8 @@ LINK = $(call quiet-command, $(LINKPROG) $(CFLAGS) $(QEMU_LDFLAGS) -o $@ \
DSO_OBJ_CFLAGS:= -fPIC -DBUILD_DSO
module-common.o: CFLAGS += $(DSO_OBJ_CFLAGS)rules.mak +2
-0+ +# Note: DSOSUF must not be empty, or these rules will try to matchtoo much
%$(DSOSUF):QEMU_LDFLAGS+= $(LDFLAGS_SHARED)
%$(DSOSUF): %.mo
$(call LINK,$^)
Claudio Fontana <[email protected]> writes:
[...]
Quoted 2 lines
I am tempted to remove the old compatibility gunks that are marked as "to be removed some time after 4.1" as the second patch in the series, any thoughts? (Markus?)
Yes, please!