summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/pseudo/pseudo/obey-ldflags.patch
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2016-07-05 13:18:31 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-07-08 10:50:18 +0100
commit9df3cdf42d8c1216682f497f0b166a43ef9f4184 (patch)
tree0d541abdea34c5e414898d5688a214bc63cfa5a7 /meta/recipes-devtools/pseudo/pseudo/obey-ldflags.patch
parenta14d30f7de192b9a2bffc65f567483abff962f22 (diff)
downloadpoky-9df3cdf42d8c1216682f497f0b166a43ef9f4184.tar.gz
pseudo: Upgrade to 1.8.1
* Drop patches where the changes exist upstream * Fetch from git as no tarball is available for 1.8.1 * Move common code to pseudo.inc * Update patchset in git recipe (From OE-Core rev: 0c36984d4c501d12fa91cf7371511641585cc256) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/pseudo/pseudo/obey-ldflags.patch')
-rw-r--r--meta/recipes-devtools/pseudo/pseudo/obey-ldflags.patch50
1 files changed, 0 insertions, 50 deletions
diff --git a/meta/recipes-devtools/pseudo/pseudo/obey-ldflags.patch b/meta/recipes-devtools/pseudo/pseudo/obey-ldflags.patch
deleted file mode 100644
index 8881f6ee86..0000000000
--- a/meta/recipes-devtools/pseudo/pseudo/obey-ldflags.patch
+++ /dev/null
@@ -1,50 +0,0 @@
1From 0ace81a687355a3c55caa161b51972a82f5c413f Mon Sep 17 00:00:00 2001
2From: Christopher Larson <chris_larson@mentor.com>
3Date: Mon, 9 May 2016 17:00:57 -0700
4Subject: [PATCH] Obey external LDFLAGS the way we obey CFLAGS
5
6Upstream-Status: Backport
7
8Signed-off-by: Christopher Larson <chris_larson@mentor.com>
9---
10 Makefile.in | 8 ++++----
11 1 file changed, 4 insertions(+), 4 deletions(-)
12
13diff --git a/Makefile.in b/Makefile.in
14index 6511814..22ef625 100644
15--- a/Makefile.in
16+++ b/Makefile.in
17@@ -109,26 +109,26 @@ pseudo: $(PSEUDO)
18 $(PSEUDO): $(BIN) pseudo.o $(SHOBJS) $(DBOBJS) pseudo_client.o pseudo_server.o pseudo_ipc.o
19 $(CC) $(CFLAGS) $(CFLAGS_PSEUDO) -o $(PSEUDO) \
20 pseudo.o pseudo_server.o pseudo_client.o pseudo_ipc.o \
21- $(DBOBJS) $(SHOBJS) $(DB_LDFLAGS) $(CLIENT_LDFLAGS)
22+ $(DBOBJS) $(SHOBJS) $(LDFLAGS) $(DB_LDFLAGS) $(CLIENT_LDFLAGS)
23
24 pseudolog: $(PSEUDOLOG)
25
26 $(PSEUDOLOG): $(BIN) pseudolog.o $(SHOBJS) $(DBOBJS) pseudo_client.o pseudo_ipc.o
27 $(CC) $(CFLAGS) $(CFLAGS_PSEUDO) -o $(PSEUDOLOG) pseudolog.o pseudo_client.o pseudo_ipc.o \
28- $(DBOBJS) $(SHOBJS) $(DB_LDFLAGS) $(CLIENT_LDFLAGS)
29+ $(DBOBJS) $(SHOBJS) $(LDFLAGS) $(DB_LDFLAGS) $(CLIENT_LDFLAGS)
30
31 pseudodb: $(PSEUDODB)
32
33 $(PSEUDODB): $(BIN) pseudodb.o $(SHOBJS) $(DBOBJS) pseudo_ipc.o
34 $(CC) $(CFLAGS) $(CFLAGS_PSEUDO) -o $(PSEUDODB) pseudodb.o \
35- $(DBOBJS) $(SHOBJS) pseudo_ipc.o $(DB_LDFLAGS) $(CLIENT_LDFLAGS)
36+ $(DBOBJS) $(SHOBJS) pseudo_ipc.o $(LDFLAGS) $(DB_LDFLAGS) $(CLIENT_LDFLAGS)
37
38 libpseudo: $(LIBPSEUDO)
39
40 $(LIBPSEUDO): $(LIB) $(WRAPOBJS) pseudo_client.o pseudo_ipc.o $(SHOBJS)
41 $(CC) $(CFLAGS) $(CFLAGS_PSEUDO) -shared -o $(LIBPSEUDO) \
42 pseudo_client.o pseudo_ipc.o \
43- $(WRAPOBJS) $(SHOBJS) $(CLIENT_LDFLAGS)
44+ $(WRAPOBJS) $(SHOBJS) $(LDFLAGS) $(CLIENT_LDFLAGS)
45
46 # *everything* now relies on stuff that's generated in the
47 # wrapper process.
48--
492.8.0
50