| Andrew Geissler | 9aee500 | 2022-03-30 16:27:02 +0000 | [diff] [blame^] | 1 | From 2e84550b47b475d830622f41576992a1d45d6af0 Mon Sep 17 00:00:00 2001 |
| 2 | From: Zhao Yi <38274519+yizhao1@users.noreply.github.com> |
| 3 | Date: Tue, 15 Mar 2022 19:28:26 +0800 |
| 4 | Subject: [PATCH] Makefile: fix parallel build failure (#267) |
| 5 | |
| 6 | * Makefile: fix parallel build failure |
| 7 | |
| 8 | Add src/_features.h as dependency for dbus.o to fix the parallel build |
| 9 | failure: |
| 10 | src/dbus.c:17:10: fatal error: _features.h: No such file or directory |
| 11 | |
| 12 | Upstream-Status: Backport |
| 13 | [https://github.com/canonical/netplan/commit/2e84550b47b475d830622f41576992a1d45d6af0] |
| 14 | |
| 15 | Signed-off-by: Yi Zhao <yi.zhao@windriver.com> |
| 16 | --- |
| 17 | Makefile | 4 ++-- |
| 18 | 1 file changed, 2 insertions(+), 2 deletions(-) |
| 19 | |
| 20 | diff --git a/Makefile b/Makefile |
| 21 | index 0368e41..8ac7432 100644 |
| 22 | --- a/Makefile |
| 23 | +++ b/Makefile |
| 24 | @@ -52,7 +52,7 @@ NOSETESTS3 ?= $(shell command -v nosetests-3 || command -v nosetests3 || echo tr |
| 25 | |
| 26 | default: netplan/_features.py generate netplan-dbus dbus/io.netplan.Netplan.service doc/netplan.html doc/netplan.5 doc/netplan-generate.8 doc/netplan-apply.8 doc/netplan-try.8 doc/netplan-dbus.8 doc/netplan-get.8 doc/netplan-set.8 |
| 27 | |
| 28 | -%.o: src/%.c |
| 29 | +%.o: src/%.c src/_features.h |
| 30 | $(CC) $(BUILDFLAGS) $(CFLAGS) $(LDFLAGS) -c $^ `pkg-config --cflags --libs glib-2.0 gio-2.0 yaml-0.1 uuid` |
| 31 | |
| 32 | libnetplan.so.$(NETPLAN_SOVER): $(SRCS) abicompat.lds |
| 33 | @@ -62,7 +62,7 @@ libnetplan.so.$(NETPLAN_SOVER): $(SRCS) abicompat.lds |
| 34 | generate: libnetplan.so.$(NETPLAN_SOVER) generate.o |
| 35 | $(CC) $(BUILDFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $(filter-out $<,$^) -L. -lnetplan `pkg-config --cflags --libs glib-2.0 gio-2.0 yaml-0.1 uuid` |
| 36 | |
| 37 | -netplan-dbus: libnetplan.so.$(NETPLAN_SOVER) src/_features.h dbus.o |
| 38 | +netplan-dbus: libnetplan.so.$(NETPLAN_SOVER) dbus.o |
| 39 | $(CC) $(BUILDFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $(filter-out $<,$(patsubst %.h,,$^)) -L. -lnetplan `pkg-config --cflags --libs libsystemd glib-2.0 gio-2.0 yaml-0.1 uuid` |
| 40 | |
| 41 | src/_features.h: src/[^_]*.[hc] |
| 42 | -- |
| 43 | 2.25.1 |
| 44 | |