[OE-core] [PATCH] pseudo: obey our LDFLAGS

[Christopher Larson]

Hmm, interesting. It doesn't actually appear to be using LDFLAGS from the
environment at all just now. I'll take another look. Thanks.
On Wed, May 11, 2016 at 9:33 AM Mark Hatle <mark.hatle at windriver.com> wrote:

> On 5/11/16 11:25 AM, Christopher Larson wrote:
> > From: Christopher Larson <chris_larson at mentor.com>
> >
> > Signed-off-by: Christopher Larson <chris_larson at mentor.com>
> > ---
> >  .../pseudo/pseudo/obey-ldflags.patch               | 48
> ++++++++++++++++++++++
> >  meta/recipes-devtools/pseudo/pseudo_1.7.5.bb       | 16 ++++----
> >  2 files changed, 56 insertions(+), 8 deletions(-)
> >  create mode 100644
> meta/recipes-devtools/pseudo/pseudo/obey-ldflags.patch
> >
> > 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 0000000..7e4c629
> > --- /dev/null
> > +++ b/meta/recipes-devtools/pseudo/pseudo/obey-ldflags.patch
> > @@ -0,0 +1,48 @@
> > +From 0ace81a687355a3c55caa161b51972a82f5c413f Mon Sep 17 00:00:00 2001
> > +From: Christopher Larson <chris_larson at mentor.com>
> > +Date: Mon, 9 May 2016 17:00:57 -0700
> > +Subject: [PATCH] Obey external LDFLAGS the way we obey CFLAGS
> > +
> > +Signed-off-by: Christopher Larson <chris_larson at 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)
>
> I may be wrong, but I thought the 'client_ldflags' was supposed to inherit
> the
> LDFLAGS, allowing them to be sanitized.
>
> The issue was that pseudo was in a strange situation where it may have to
> build
> both 32-bit and 64-bit clients in order to function properly.
>
> (Perhaps my memory is out of date and it's no longer a concern?)
>
> --Mark
>
> > +
> > + 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 d90e644..dfb9b39 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"
> >
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.openembedded.org/pipermail/openembedded-core/attachments/20160511/c84c7baf/attachment-0002.html>