[oe-commits] Enrico Scholz : tcp-wrappers: place LIBS after object files

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: eb55e5e8bcab5345f9650f630465aba6f3cb16c1
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=eb55e5e8bcab5345f9650f630465aba6f3cb16c1

Author: Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>
Date:   Fri Jan  7 18:09:55 2011 +0100

tcp-wrappers: place LIBS after object files

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

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
+@@ -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))
+ 
+ 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)