[oe] [PATCH] tcp-wrappers: place LIBS after object files

[Paul Menzel]

Dear Enrico,


Am Dienstag, den 26.04.2011, 12:41 +0200 schrieb Enrico Scholz:
> From: Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>

it seems you need to update your Git configuration to your common email
address.

> This fixes builds with '-Wl,-as-needed'. Patch changes the previous
> 'ldflags.patch' files instead of adding a new one.

It would be great if you could add a log of the failed build.

> Signed-off-by: Enrico Scholz <enrico.scholz at sigma-chemnitz.de>
> Cc: Jeremy Lainé <jeremy.laine at m4x.org>
> ---
>  .../tcp-wrappers/tcp-wrappers-7.6/ldflags.patch    |   22 +++++++++++++++----
>  1 files changed, 17 insertions(+), 5 deletions(-)
> 
> diff --git a/recipes/tcp-wrappers/tcp-wrappers-7.6/ldflags.patch b/recipes/tcp-wrappers/tcp-wrappers-7.6/ldflags.patch
> index 2e89765..cac8615 100644
> --- a/recipes/tcp-wrappers/tcp-wrappers-7.6/ldflags.patch
> +++ b/recipes/tcp-wrappers/tcp-wrappers-7.6/ldflags.patch
> @@ -1,13 +1,25 @@
> -Index: tcp_wrappers_7.6.orig/Makefile
> +Index: tcp_wrappers_7.6/Makefile
>  ===================================================================
> ---- tcp_wrappers_7.6.orig.orig/Makefile	2009-04-06 10:55:47.000000000 +0000
> -+++ tcp_wrappers_7.6.orig/Makefile	2009-04-06 10:57:04.000000000 +0000
> -@@ -748,31 +748,31 @@
> +--- tcp_wrappers_7.6.orig/Makefile
> ++++ tcp_wrappers_7.6/Makefile

The diff could have been smaller, but no big problem.

> +@@ -724,9 +724,9 @@ SHLIBSOMAJ	= shared/libwrap.so.$(SOMAJOR
> + SHLIBSO		= shared/libwrap.so
> + SHLIBFLAGS	= -Lshared -lwrap
> + 
> +-SHLINKFLAGS = -shared -Xlinker -soname -Xlinker libwrap.so.$(SOMAJOR) -lc $(LIBS)
> ++SHLINKFLAGS = -shared -Xlinker -soname -Xlinker libwrap.so.$(SOMAJOR)
> + SHCFLAGS = -fPIC -shared -D_REENTRANT
> +-SHLIB_OBJ= $(addprefix shared/, $(LIB_OBJ));
> ++SHLIB_OBJ= $(addprefix shared/, $(LIB_OBJ))

The »;« was superfluous, since no command followed?

> + all other: config-check tcpd tcpdmatch try-from safe_finger tcpdchk $(LIB)
> + 
> +@@ -748,31 +748,31 @@ $(LIB):	$(LIB_OBJ)
>   
>   $(SHLIB): $(SHLIB_OBJ)
>   	rm -f $(SHLIB)
>  -	$(CC) -o $(SHLIB) $(SHLINKFLAGS) $(SHLIB_OBJ)
> -+	$(CC) $(LDFLAGS) -o $(SHLIB) $(SHLINKFLAGS) $(SHLIB_OBJ)
> ++	$(CC) $(LDFLAGS) -o $(SHLIB) $(SHLINKFLAGS) $(SHLIB_OBJ) $(LIBS)
>   	ln -sf $(notdir $(SHLIB)) $(SHLIBSOMAJ)
>   	ln -sf $(notdir $(SHLIBSOMAJ)) $(SHLIBSO)

Is this patch already upstream?


Thanks,

Paul
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: This is a digitally signed message part
URL: <http://lists.openembedded.org/pipermail/openembedded-devel/attachments/20110426/e1d2cf42/attachment-0002.sig>