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 @@ -From 9e27fc2e1b3dc8c36ef6a502edffc3a3d84d9dd9 Mon Sep 17 00:00:00 2001 -From: Christopher Larson <chris_larson@mentor.com> -Date: Wed, 26 Aug 2015 17:23:48 -0700 Subject: [PATCH] Support separation of SRCDIR and OBJDIR Typical use of VPATH to locate the sources. @@ -8,26 +5,21 @@ Typical use of VPATH to locate the sources. Upstream-Status: Pending Signed-off-by: Christopher Larson <chris_larson@mentor.com> - +Signed-off-by: Maxin B. John <maxin.john@intel.com> --- - Makefile | 7 +++++-- - version.sh | 2 +- - 2 files changed, 6 insertions(+), 3 deletions(-) - -diff --git a/Makefile b/Makefile -index 548591a..da8d33a 100644 ---- a/Makefile -+++ b/Makefile -@@ -1,5 +1,8 @@ +diff -Naur iw-4.3-origin/Makefile iw-4.3/Makefile +--- iw-4.3-origin/Makefile 2015-11-20 16:37:58.752077287 +0200 ++++ iw-4.3/Makefile 2015-11-20 16:57:15.510615815 +0200 +@@ -1,5 +1,7 @@ MAKEFLAGS += --no-print-directory - +- +SRCDIR ?= $(dir $(lastword $(MAKEFILE_LIST))) +OBJDIR ?= $(PWD) +VPATH = $(SRCDIR) PREFIX ?= /usr SBINDIR ?= $(PREFIX)/sbin MANDIR ?= $(PREFIX)/share/man -@@ -95,11 +98,11 @@ VERSION_OBJS := $(filter-out version.o, $(OBJS)) +@@ -95,11 +97,11 @@ version.c: version.sh $(patsubst %.o,%.c,$(VERSION_OBJS)) nl80211.h iw.h Makefile \ $(wildcard .git/index .git/refs/tags) @$(NQ) ' GEN ' $@ @@ -41,17 +33,3 @@ index 548591a..da8d33a 100644 ifeq ($(IW_ANDROID_BUILD),) iw: $(OBJS) -diff --git a/version.sh b/version.sh -index 5354383..fa954cf 100755 ---- a/version.sh -+++ b/version.sh -@@ -5,5 +5,5 @@ OUT="$1" - - v="$VERSION" - --echo '#include "iw.h"' > "$OUT" -+echo '#include <iw.h>' > "$OUT" - echo "const char iw_version[] = \"$v\";" >> "$OUT" --- -2.2.1 - |