summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2015-08-12 13:07:01 +0000
committerLaurent Bercot <ska-skaware@skarnet.org>2015-08-12 13:07:01 +0000
commit0dfd033b8fc1f8a69bb572e4e7578998493efae4 (patch)
treeddda69b6cc2416750d5ff2fae6afb002d188cae2 /package
parent20efd75e91f81dad48e32adffba514c6330a4c6b (diff)
downloads6-networking-0dfd033b8fc1f8a69bb572e4e7578998493efae4.tar.xz
xyzzy fix (fixes https://bugs.gentoo.org/show_bug.cgi?id=541092)
Diffstat (limited to 'package')
-rw-r--r--package/deps.mak4
-rw-r--r--package/info2
-rw-r--r--package/targets.mak14
3 files changed, 4 insertions, 16 deletions
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