diff options
Diffstat (limited to 'meta/recipes-connectivity/iw/iw/separate-objdir.patch')
-rw-r--r-- | meta/recipes-connectivity/iw/iw/separate-objdir.patch | 27 |
1 files changed, 17 insertions, 10 deletions
diff --git a/meta/recipes-connectivity/iw/iw/separate-objdir.patch b/meta/recipes-connectivity/iw/iw/separate-objdir.patch index 0ea6a52789..eb01a5a14e 100644 --- a/meta/recipes-connectivity/iw/iw/separate-objdir.patch +++ b/meta/recipes-connectivity/iw/iw/separate-objdir.patch | |||
@@ -7,29 +7,36 @@ Upstream-Status: Pending | |||
7 | Signed-off-by: Christopher Larson <chris_larson@mentor.com> | 7 | Signed-off-by: Christopher Larson <chris_larson@mentor.com> |
8 | Signed-off-by: Maxin B. John <maxin.john@intel.com> | 8 | Signed-off-by: Maxin B. John <maxin.john@intel.com> |
9 | --- | 9 | --- |
10 | diff -Naur iw-4.3-origin/Makefile iw-4.3/Makefile | 10 | Makefile | 8 ++++++-- |
11 | --- iw-4.3-origin/Makefile 2015-11-20 16:37:58.752077287 +0200 | 11 | 1 file changed, 6 insertions(+), 2 deletions(-) |
12 | +++ iw-4.3/Makefile 2015-11-20 16:57:15.510615815 +0200 | 12 | |
13 | @@ -1,5 +1,7 @@ | 13 | diff --git a/Makefile b/Makefile |
14 | index 33aaf6a..9030796 100644 | ||
15 | --- a/Makefile | ||
16 | +++ b/Makefile | ||
17 | @@ -1,5 +1,9 @@ | ||
14 | MAKEFLAGS += --no-print-directory | 18 | MAKEFLAGS += --no-print-directory |
15 | - | 19 | |
16 | +SRCDIR ?= $(dir $(lastword $(MAKEFILE_LIST))) | 20 | +SRCDIR ?= $(dir $(lastword $(MAKEFILE_LIST))) |
17 | +OBJDIR ?= $(PWD) | 21 | +OBJDIR ?= $(PWD) |
18 | +VPATH = $(SRCDIR) | 22 | +VPATH = $(SRCDIR) |
23 | + | ||
19 | PREFIX ?= /usr | 24 | PREFIX ?= /usr |
20 | SBINDIR ?= $(PREFIX)/sbin | 25 | SBINDIR ?= $(PREFIX)/sbin |
21 | MANDIR ?= $(PREFIX)/share/man | 26 | MANDIR ?= $(PREFIX)/share/man |
22 | @@ -95,11 +97,11 @@ | 27 | @@ -103,11 +107,11 @@ VERSION_OBJS := $(filter-out version.o, $(OBJS)) |
23 | version.c: version.sh $(patsubst %.o,%.c,$(VERSION_OBJS)) nl80211.h iw.h Makefile \ | 28 | version.c: version.sh $(patsubst %.o,%.c,$(VERSION_OBJS)) nl80211.h iw.h Makefile \ |
24 | $(wildcard .git/index .git/refs/tags) | 29 | $(wildcard .git/index .git/refs/tags) |
25 | @$(NQ) ' GEN ' $@ | 30 | @$(NQ) ' GEN ' $@ |
26 | - $(Q)./version.sh $@ | 31 | - $(Q)./version.sh $@ |
27 | + $(Q)cd $(SRCDIR) && ./version.sh $(OBJDIR)/$@ | 32 | + $(Q)cd $(SRCDIR) && ./version.sh $(OBJDIR)/$@ |
28 | 33 | ||
29 | %.o: %.c iw.h nl80211.h | 34 | %.o: %.c iw.h nl80211.h |
30 | @$(NQ) ' CC ' $@ | 35 | @$(NQ) ' CC ' $@ |
31 | - $(Q)$(CC) $(CFLAGS) -c -o $@ $< | 36 | - $(Q)$(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $< |
32 | + $(Q)$(CC) -I$(SRCDIR) $(CFLAGS) -c -o $@ $< | 37 | + $(Q)$(CC) -I$(SRCDIR) $(CFLAGS) $(CPPFLAGS) -c -o $@ $< |
33 | 38 | ||
34 | ifeq ($(IW_ANDROID_BUILD),) | 39 | ifeq ($(IW_ANDROID_BUILD),) |
35 | iw: $(OBJS) | 40 | iw: $(OBJS) |
41 | -- | ||
42 | 2.20.1 (Apple Git-117) | ||