diff options
Diffstat (limited to 'meta/recipes-connectivity/iw/iw/separate-objdir.patch')
-rw-r--r-- | meta/recipes-connectivity/iw/iw/separate-objdir.patch | 36 |
1 files changed, 7 insertions, 29 deletions
diff --git a/meta/recipes-connectivity/iw/iw/separate-objdir.patch b/meta/recipes-connectivity/iw/iw/separate-objdir.patch index 883f8b2c60..0ea6a52789 100644 --- a/meta/recipes-connectivity/iw/iw/separate-objdir.patch +++ b/meta/recipes-connectivity/iw/iw/separate-objdir.patch | |||
@@ -1,6 +1,3 @@ | |||
1 | From 9e27fc2e1b3dc8c36ef6a502edffc3a3d84d9dd9 Mon Sep 17 00:00:00 2001 | ||
2 | From: Christopher Larson <chris_larson@mentor.com> | ||
3 | Date: Wed, 26 Aug 2015 17:23:48 -0700 | ||
4 | Subject: [PATCH] Support separation of SRCDIR and OBJDIR | 1 | Subject: [PATCH] Support separation of SRCDIR and OBJDIR |
5 | 2 | ||
6 | Typical use of VPATH to locate the sources. | 3 | Typical use of VPATH to locate the sources. |
@@ -8,26 +5,21 @@ Typical use of VPATH to locate the sources. | |||
8 | Upstream-Status: Pending | 5 | Upstream-Status: Pending |
9 | 6 | ||
10 | Signed-off-by: Christopher Larson <chris_larson@mentor.com> | 7 | Signed-off-by: Christopher Larson <chris_larson@mentor.com> |
11 | 8 | Signed-off-by: Maxin B. John <maxin.john@intel.com> | |
12 | --- | 9 | --- |
13 | Makefile | 7 +++++-- | 10 | diff -Naur iw-4.3-origin/Makefile iw-4.3/Makefile |
14 | version.sh | 2 +- | 11 | --- iw-4.3-origin/Makefile 2015-11-20 16:37:58.752077287 +0200 |
15 | 2 files changed, 6 insertions(+), 3 deletions(-) | 12 | +++ iw-4.3/Makefile 2015-11-20 16:57:15.510615815 +0200 |
16 | 13 | @@ -1,5 +1,7 @@ | |
17 | diff --git a/Makefile b/Makefile | ||
18 | index 548591a..da8d33a 100644 | ||
19 | --- a/Makefile | ||
20 | +++ b/Makefile | ||
21 | @@ -1,5 +1,8 @@ | ||
22 | MAKEFLAGS += --no-print-directory | 14 | MAKEFLAGS += --no-print-directory |
23 | 15 | - | |
24 | +SRCDIR ?= $(dir $(lastword $(MAKEFILE_LIST))) | 16 | +SRCDIR ?= $(dir $(lastword $(MAKEFILE_LIST))) |
25 | +OBJDIR ?= $(PWD) | 17 | +OBJDIR ?= $(PWD) |
26 | +VPATH = $(SRCDIR) | 18 | +VPATH = $(SRCDIR) |
27 | PREFIX ?= /usr | 19 | PREFIX ?= /usr |
28 | SBINDIR ?= $(PREFIX)/sbin | 20 | SBINDIR ?= $(PREFIX)/sbin |
29 | MANDIR ?= $(PREFIX)/share/man | 21 | MANDIR ?= $(PREFIX)/share/man |
30 | @@ -95,11 +98,11 @@ VERSION_OBJS := $(filter-out version.o, $(OBJS)) | 22 | @@ -95,11 +97,11 @@ |
31 | version.c: version.sh $(patsubst %.o,%.c,$(VERSION_OBJS)) nl80211.h iw.h Makefile \ | 23 | version.c: version.sh $(patsubst %.o,%.c,$(VERSION_OBJS)) nl80211.h iw.h Makefile \ |
32 | $(wildcard .git/index .git/refs/tags) | 24 | $(wildcard .git/index .git/refs/tags) |
33 | @$(NQ) ' GEN ' $@ | 25 | @$(NQ) ' GEN ' $@ |
@@ -41,17 +33,3 @@ index 548591a..da8d33a 100644 | |||
41 | 33 | ||
42 | ifeq ($(IW_ANDROID_BUILD),) | 34 | ifeq ($(IW_ANDROID_BUILD),) |
43 | iw: $(OBJS) | 35 | iw: $(OBJS) |
44 | diff --git a/version.sh b/version.sh | ||
45 | index 5354383..fa954cf 100755 | ||
46 | --- a/version.sh | ||
47 | +++ b/version.sh | ||
48 | @@ -5,5 +5,5 @@ OUT="$1" | ||
49 | |||
50 | v="$VERSION" | ||
51 | |||
52 | -echo '#include "iw.h"' > "$OUT" | ||
53 | +echo '#include <iw.h>' > "$OUT" | ||
54 | echo "const char iw_version[] = \"$v\";" >> "$OUT" | ||
55 | -- | ||
56 | 2.2.1 | ||
57 | |||