diff options
| author |   Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de> | 2011-01-07 18:09:55 +0100 |
|---|---|---|
| committer |   Enrico Scholz <enrico.scholz@sigma-chemnitz.de> | 2011-04-26 12:40:29 +0200 |
| commit | eb55e5e8bcab5345f9650f630465aba6f3cb16c1 (patch) | |
| tree | 2c10e179580b3f15447e79c7e66a47527d152cca | |
| parent | 9fb55ee61735ef420e468d9a84dee86e16a0480b (diff) | |
| download | openembedded-eb55e5e8bcab5345f9650f630465aba6f3cb16c1.tar.gz | |
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@sigma-chemnitz.de>
Cc: Jeremy Lainé <jeremy.laine@m4x.org>
| -rw-r--r-- | recipes/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 2e897650e0..cac8615543 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) |