From 0dfd033b8fc1f8a69bb572e4e7578998493efae4 Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Wed, 12 Aug 2015 13:07:01 +0000 Subject: xyzzy fix (fixes https://bugs.gentoo.org/show_bug.cgi?id=541092) --- package/deps.mak | 4 ++-- package/info | 2 +- package/targets.mak | 14 +------------- 3 files changed, 4 insertions(+), 16 deletions(-) (limited to 'package') diff --git a/package/deps.mak b/package/deps.mak index b0f8835..23d9089 100644 --- a/package/deps.mak +++ b/package/deps.mak @@ -59,7 +59,7 @@ s6-tcpserver6-socketbinder: private EXTRA_LIBS := ${SOCKET_LIB} s6-tcpserver6-socketbinder: src/conn-tools/s6-tcpserver6-socketbinder.o -lskarnet s6-tcpserver6d: private EXTRA_LIBS := ${SOCKET_LIB} s6-tcpserver6d: src/conn-tools/s6-tcpserver6d.o -lskarnet -libs6net.a: src/libs6net/s6net_ident_client.o src/libs6net/s6net_ident_reply_get.o src/libs6net/s6net_ident_reply_parse.o src/libs6net/s6net_ident_error.o -libs6net.so: src/libs6net/s6net_ident_client.lo src/libs6net/s6net_ident_reply_get.lo src/libs6net/s6net_ident_reply_parse.lo src/libs6net/s6net_ident_error.lo +libs6net.a.xyzzy: src/libs6net/s6net_ident_client.o src/libs6net/s6net_ident_reply_get.o src/libs6net/s6net_ident_reply_parse.o src/libs6net/s6net_ident_error.o +libs6net.so.xyzzy: src/libs6net/s6net_ident_client.lo src/libs6net/s6net_ident_reply_get.lo src/libs6net/s6net_ident_reply_parse.lo src/libs6net/s6net_ident_error.lo minidentd: private EXTRA_LIBS := ${SOCKET_LIB} ${TAINNOW_LIB} minidentd: src/minidentd/minidentd.o src/minidentd/mgetuid.o -lskarnet diff --git a/package/info b/package/info index c16c543..0494e20 100644 --- a/package/info +++ b/package/info @@ -1,4 +1,4 @@ package=s6-networking -version=2.1.0.1 +version=2.1.0.2 category=net package_macro_name=S6_NETWORKING diff --git a/package/targets.mak b/package/targets.mak index 1aacad2..e28b327 100644 --- a/package/targets.mak +++ b/package/targets.mak @@ -19,19 +19,7 @@ minidentd LIBEXEC_TARGETS := -ifdef DO_ALLSTATIC -LIBS6NET := libs6net.a -else -LIBS6NET := libs6net.so -endif - -ifdef DO_SHARED -SHARED_LIBS := libs6net.so -endif - -ifdef DO_STATIC -STATIC_LIBS := libs6net.a -endif +LIB_DEFS := S6NET=s6net EXTRA_TARGETS := src/minidentd/mgetuid.c -- cgit v1.2.3