summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorChristopher Larson <chris_larson@mentor.com>2016-05-11 09:25:27 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-05-14 23:05:11 +0100
commit01cbd46ac5b215bd8b8b1378881ef0bdf61ba177 (patch)
treefb1f897ef3c8063c04e946fa69c16f9dd1d2d293 /meta/recipes-devtools
parentb39ddd9fe72567a17b9cd2840dce63e54e1aa7d3 (diff)
downloadpoky-01cbd46ac5b215bd8b8b1378881ef0bdf61ba177.tar.gz
pseudo: obey our LDFLAGS
(From OE-Core rev: fc04eae73cb99d3783b09d062120a9b7dc95210a) Signed-off-by: Christopher Larson <chris_larson@mentor.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/pseudo/pseudo/obey-ldflags.patch50
-rw-r--r--meta/recipes-devtools/pseudo/pseudo_1.7.5.bb16
2 files changed, 58 insertions, 8 deletions
diff --git a/meta/recipes-devtools/pseudo/pseudo/obey-ldflags.patch b/meta/recipes-devtools/pseudo/pseudo/obey-ldflags.patch
new file mode 100644
index 0000000000..8881f6ee86
--- /dev/null
+++ b/meta/recipes-devtools/pseudo/pseudo/obey-ldflags.patch
@@ -0,0 +1,50 @@
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
diff --git a/meta/recipes-devtools/pseudo/pseudo_1.7.5.bb b/meta/recipes-devtools/pseudo/pseudo_1.7.5.bb
index d90e64445d..dfb9b3999e 100644
--- a/meta/recipes-devtools/pseudo/pseudo_1.7.5.bb
+++ b/meta/recipes-devtools/pseudo/pseudo_1.7.5.bb
@@ -1,13 +1,13 @@
1require pseudo.inc 1require pseudo.inc
2 2
3SRC_URI = " \ 3SRC_URI = "http://downloads.yoctoproject.org/releases/pseudo/${BPN}-${PV}.tar.bz2 \
4 http://downloads.yoctoproject.org/releases/pseudo/${BPN}-${PV}.tar.bz2 \ 4 file://0001-configure-Prune-PIE-flags.patch \
5 file://0001-configure-Prune-PIE-flags.patch \ 5 file://fallback-passwd \
6 file://fallback-passwd \ 6 file://fallback-group \
7 file://fallback-group \ 7 file://moreretries.patch \
8 file://moreretries.patch \ 8 file://handle-remove-xattr.patch \
9 file://handle-remove-xattr.patch \ 9 file://obey-ldflags.patch \
10" 10 "
11 11
12SRC_URI[md5sum] = "c10209938f03128d0c193f041ff3596d" 12SRC_URI[md5sum] = "c10209938f03128d0c193f041ff3596d"
13SRC_URI[sha256sum] = "fd89cadec984d3b8202aca465898b1bb4350e0d63ba9aa9ac899f6f50270e688" 13SRC_URI[sha256sum] = "fd89cadec984d3b8202aca465898b1bb4350e0d63ba9aa9ac899f6f50270e688"