diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2016-10-24 14:52:51 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska-skaware@skarnet.org> | 2016-10-24 14:52:51 +0000 |
| commit | a2bd66d9a582df16c3a3e2aca12259035acba280 (patch) | |
| tree | 6dad820bba9a8aca3eaf8378caf197d51b5fc756 | |
| parent | 62f7e8ef32620e2c618ed5a38508d9b929c0ef71 (diff) | |
| download | s6-rc-a2bd66d9a582df16c3a3e2aca12259035acba280.tar.xz | |
Revert wrong shared lib fix
| -rw-r--r-- | package/deps.mak | 2 | ||||
| -rwxr-xr-x | tools/gen-deps.sh | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/package/deps.mak b/package/deps.mak index 61d5d48..054d439 100644 --- a/package/deps.mak +++ b/package/deps.mak @@ -32,7 +32,7 @@ src/s6-rc/s6-rc-update.o src/s6-rc/s6-rc-update.lo: src/s6-rc/s6-rc-update.c src src/s6-rc/s6-rc.o src/s6-rc/s6-rc.lo: src/s6-rc/s6-rc.c src/include/s6-rc/config.h src/include/s6-rc/s6rc.h libs6rc.a.xyzzy: src/libs6rc/s6rc_db_check_depcycles.o src/libs6rc/s6rc_db_check_pipelines.o src/libs6rc/s6rc_db_check_revdeps.o src/libs6rc/s6rc_db_read.o src/libs6rc/s6rc_db_read_sizes.o src/libs6rc/s6rc_db_read_uint32.o src/libs6rc/s6rc_graph_closure.o src/libs6rc/s6rc_lock.o src/libs6rc/s6rc_read_uint.o src/libs6rc/s6rc_sanitize_dir.o src/libs6rc/s6rc_servicedir_internal.o src/libs6rc/s6rc_servicedir_block.o src/libs6rc/s6rc_servicedir_unblock.o src/libs6rc/s6rc_servicedir_copy_offline.o src/libs6rc/s6rc_servicedir_copy_online.o src/libs6rc/s6rc_servicedir_manage.o src/libs6rc/s6rc_servicedir_unsupervise.o -libs6rc.so.xyzzy: EXTRA_LIBS := -ls6 -lskarnet ${SPAWN_LIB} ${SOCKET_LIB} ${SYSCLOCK_LIB} ${TAINNOW_LIB} ${TIMER_LIB} ${UTIL_LIB} +libs6rc.so.xyzzy: EXTRA_LIBS := -ls6 -lskarnet libs6rc.so.xyzzy: src/libs6rc/s6rc_db_check_depcycles.lo src/libs6rc/s6rc_db_check_pipelines.lo src/libs6rc/s6rc_db_check_revdeps.lo src/libs6rc/s6rc_db_read.lo src/libs6rc/s6rc_db_read_sizes.lo src/libs6rc/s6rc_db_read_uint32.lo src/libs6rc/s6rc_graph_closure.lo src/libs6rc/s6rc_lock.lo src/libs6rc/s6rc_read_uint.lo src/libs6rc/s6rc_sanitize_dir.lo src/libs6rc/s6rc_servicedir_internal.lo src/libs6rc/s6rc_servicedir_block.lo src/libs6rc/s6rc_servicedir_unblock.lo src/libs6rc/s6rc_servicedir_copy_offline.lo src/libs6rc/s6rc_servicedir_copy_online.lo src/libs6rc/s6rc_servicedir_manage.lo src/libs6rc/s6rc_servicedir_unsupervise.lo s6-rc: EXTRA_LIBS := ${TAINNOW_LIB} ${SPAWN_LIB} s6-rc: src/s6-rc/s6-rc.o ${LIBS6RC} -lskarnet diff --git a/tools/gen-deps.sh b/tools/gen-deps.sh index 2810ccc..5c96dd1 100755 --- a/tools/gen-deps.sh +++ b/tools/gen-deps.sh @@ -60,9 +60,6 @@ for dir in $(ls -1 src | grep -v ^include) ; do libs= while read dep ; do if echo $dep | grep -q -e ^-l -e '^\${.*_LIB}' ; then - if test $dep = '-lskarnet' ; then - dep='-lskarnet ${SPAWN_LIB} ${SOCKET_LIB} ${SYSCLOCK_LIB} ${TAINNOW_LIB} ${TIMER_LIB} ${UTIL_LIB}' - fi libs="$libs $dep" else deps="$deps src/$dir/$dep" |