diff options
| author |   Christopher Larson <chris_larson@mentor.com> | 2016-05-11 09:25:27 -0700 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-05-18 13:13:42 +0100 |
| commit | 92214ca9e14d5dda1dd3e958944e96003ef77422 (patch) | |
| tree | 1a977a2a5ede481e0cf5c1058b300bab882a04d9 | |
| parent | b309bfa265456cda7269ff67e9df5f5c05a9a5a5 (diff) | |
| download | openembedded-core-92214ca9e14d5dda1dd3e958944e96003ef77422.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>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
| -rw-r--r-- | meta/recipes-devtools/pseudo/pseudo/obey-ldflags.patch | 50 | ||||
| -rw-r--r-- | meta/recipes-devtools/pseudo/pseudo_1.7.5.bb | 16 |
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 @@ +From 0ace81a687355a3c55caa161b51972a82f5c413f Mon Sep 17 00:00:00 2001 +From: Christopher Larson <chris_larson@mentor.com> +Date: Mon, 9 May 2016 17:00:57 -0700 +Subject: [PATCH] Obey external LDFLAGS the way we obey CFLAGS + +Upstream-Status: Backport + +Signed-off-by: Christopher Larson <chris_larson@mentor.com> +--- + Makefile.in | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index 6511814..22ef625 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -109,26 +109,26 @@ pseudo: $(PSEUDO) + $(PSEUDO): $(BIN) pseudo.o $(SHOBJS) $(DBOBJS) pseudo_client.o pseudo_server.o pseudo_ipc.o + $(CC) $(CFLAGS) $(CFLAGS_PSEUDO) -o $(PSEUDO) \ + pseudo.o pseudo_server.o pseudo_client.o pseudo_ipc.o \ +- $(DBOBJS) $(SHOBJS) $(DB_LDFLAGS) $(CLIENT_LDFLAGS) ++ $(DBOBJS) $(SHOBJS) $(LDFLAGS) $(DB_LDFLAGS) $(CLIENT_LDFLAGS) + + pseudolog: $(PSEUDOLOG) + + $(PSEUDOLOG): $(BIN) pseudolog.o $(SHOBJS) $(DBOBJS) pseudo_client.o pseudo_ipc.o + $(CC) $(CFLAGS) $(CFLAGS_PSEUDO) -o $(PSEUDOLOG) pseudolog.o pseudo_client.o pseudo_ipc.o \ +- $(DBOBJS) $(SHOBJS) $(DB_LDFLAGS) $(CLIENT_LDFLAGS) ++ $(DBOBJS) $(SHOBJS) $(LDFLAGS) $(DB_LDFLAGS) $(CLIENT_LDFLAGS) + + pseudodb: $(PSEUDODB) + + $(PSEUDODB): $(BIN) pseudodb.o $(SHOBJS) $(DBOBJS) pseudo_ipc.o + $(CC) $(CFLAGS) $(CFLAGS_PSEUDO) -o $(PSEUDODB) pseudodb.o \ +- $(DBOBJS) $(SHOBJS) pseudo_ipc.o $(DB_LDFLAGS) $(CLIENT_LDFLAGS) ++ $(DBOBJS) $(SHOBJS) pseudo_ipc.o $(LDFLAGS) $(DB_LDFLAGS) $(CLIENT_LDFLAGS) + + libpseudo: $(LIBPSEUDO) + + $(LIBPSEUDO): $(LIB) $(WRAPOBJS) pseudo_client.o pseudo_ipc.o $(SHOBJS) + $(CC) $(CFLAGS) $(CFLAGS_PSEUDO) -shared -o $(LIBPSEUDO) \ + pseudo_client.o pseudo_ipc.o \ +- $(WRAPOBJS) $(SHOBJS) $(CLIENT_LDFLAGS) ++ $(WRAPOBJS) $(SHOBJS) $(LDFLAGS) $(CLIENT_LDFLAGS) + + # *everything* now relies on stuff that's generated in the + # wrapper process. +-- +2.8.0 + 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 @@ require pseudo.inc -SRC_URI = " \ - http://downloads.yoctoproject.org/releases/pseudo/${BPN}-${PV}.tar.bz2 \ - file://0001-configure-Prune-PIE-flags.patch \ - file://fallback-passwd \ - file://fallback-group \ - file://moreretries.patch \ - file://handle-remove-xattr.patch \ -" +SRC_URI = "http://downloads.yoctoproject.org/releases/pseudo/${BPN}-${PV}.tar.bz2 \ + file://0001-configure-Prune-PIE-flags.patch \ + file://fallback-passwd \ + file://fallback-group \ + file://moreretries.patch \ + file://handle-remove-xattr.patch \ + file://obey-ldflags.patch \ + " SRC_URI[md5sum] = "c10209938f03128d0c193f041ff3596d" SRC_URI[sha256sum] = "fd89cadec984d3b8202aca465898b1bb4350e0d63ba9aa9ac899f6f50270e688" |