diff options
Diffstat (limited to 'package')
| -rw-r--r-- | package/deps-build | 4 | ||||
| -rw-r--r-- | package/deps.mak | 218 | ||||
| -rw-r--r-- | package/targets.mak | 7 |
3 files changed, 113 insertions, 116 deletions
diff --git a/package/deps-build b/package/deps-build index eb4384b..689b950 100644 --- a/package/deps-build +++ b/package/deps-build @@ -1,2 +1,2 @@ -/package/prog/skalibs -/package/admin/nsss $usensss +true /package/prog/skalibs 2.14.4.0 true libskarnet +$usensss /package/admin/nsss 0.2.0.6 false libnsss diff --git a/package/deps.mak b/package/deps.mak index 87a4521..293e0a6 100644 --- a/package/deps.mak +++ b/package/deps.mak @@ -81,116 +81,118 @@ src/libexecline/exlsn_free.o src/libexecline/exlsn_free.lo: src/libexecline/exls src/libexecline/exlsn_importas.o src/libexecline/exlsn_importas.lo: src/libexecline/exlsn_importas.c src/include/execline/execline.h src/include-local/exlsn.h src/libexecline/exlsn_main.o src/libexecline/exlsn_main.lo: src/libexecline/exlsn_main.c src/include/execline/execline.h src/include-local/exlsn.h src/libexecline/exlsn_multidefine.o src/libexecline/exlsn_multidefine.lo: src/libexecline/exlsn_multidefine.c src/include/execline/execline.h src/include-local/exlsn.h +src/multicall/execline.o src/multicall/execline.lo: src/multicall/execline.c src/include/execline/config.h src/include/execline/execline.h src/include-local/exlsn.h -background: EXTRA_LIBS := -lskarnet ${SPAWN_LIB} -background: src/execline/background.o ${LIBEXECLINE} -backtick: EXTRA_LIBS := -lskarnet ${SPAWN_LIB} -backtick: src/execline/backtick.o ${LIBEXECLINE} -case: EXTRA_LIBS := -lskarnet -case: src/execline/case.o ${LIBEXECLINE} -define: EXTRA_LIBS := -lskarnet -define: src/execline/define.o ${LIBEXECLINE} -dollarat: EXTRA_LIBS := -lskarnet -dollarat: src/execline/dollarat.o -elgetopt: EXTRA_LIBS := -lskarnet -elgetopt: src/execline/elgetopt.o ${LIBEXECLINE} -elgetpositionals: EXTRA_LIBS := -lskarnet -elgetpositionals: src/execline/elgetpositionals.o ${LIBEXECLINE} -elglob: EXTRA_LIBS := -lskarnet -elglob: src/execline/elglob.o ${LIBEXECLINE} -eltest: EXTRA_LIBS := -lskarnet -eltest: src/execline/eltest.o -emptyenv: EXTRA_LIBS := -lskarnet -emptyenv: src/execline/emptyenv.o ${LIBEXECLINE} -envfile: EXTRA_LIBS := -lskarnet -envfile: src/execline/envfile.o -exec: EXTRA_LIBS := -lskarnet -exec: src/execline/exec.o -execline-cd: EXTRA_LIBS := -lskarnet -execline-cd: src/execline/execline-cd.o -execline-umask: EXTRA_LIBS := -lskarnet -execline-umask: src/execline/execline-umask.o -execlineb: EXTRA_LIBS := -lskarnet -execlineb: src/execline/execlineb.o ${LIBEXECLINE} -exit: EXTRA_LIBS := -lskarnet -exit: src/execline/exit.o -export: EXTRA_LIBS := -lskarnet -export: src/execline/export.o -export-array: EXTRA_LIBS := -lskarnet -export-array: src/execline/export-array.o ${LIBEXECLINE} -fdblock: EXTRA_LIBS := -lskarnet -fdblock: src/execline/fdblock.o -fdclose: EXTRA_LIBS := -lskarnet -fdclose: src/execline/fdclose.o -fdmove: EXTRA_LIBS := -lskarnet -fdmove: src/execline/fdmove.o -fdreserve: EXTRA_LIBS := -lskarnet -fdreserve: src/execline/fdreserve.o -fdswap: EXTRA_LIBS := -lskarnet -fdswap: src/execline/fdswap.o -forbacktickx: EXTRA_LIBS := -lskarnet -forbacktickx: src/execline/forbacktickx.o -foreground: EXTRA_LIBS := -lskarnet ${SPAWN_LIB} -foreground: src/execline/foreground.o ${LIBEXECLINE} -forstdin: EXTRA_LIBS := -lskarnet ${SPAWN_LIB} -forstdin: src/execline/forstdin.o ${LIBEXECLINE} -forx: EXTRA_LIBS := -lskarnet ${SPAWN_LIB} -forx: src/execline/forx.o ${LIBEXECLINE} -getcwd: EXTRA_LIBS := -lskarnet -getcwd: src/execline/getcwd.o ${LIBEXECLINE} -getpid: EXTRA_LIBS := -lskarnet -getpid: src/execline/getpid.o ${LIBEXECLINE} -heredoc: EXTRA_LIBS := -lskarnet -heredoc: src/execline/heredoc.o -homeof: EXTRA_LIBS := -lskarnet ${MAYBEPTHREAD_LIB} -homeof: src/execline/homeof.o ${LIBNSSS} -if: EXTRA_LIBS := -lskarnet ${SPAWN_LIB} -if: src/execline/if.o ${LIBEXECLINE} -ifelse: EXTRA_LIBS := -lskarnet ${SPAWN_LIB} -ifelse: src/execline/ifelse.o ${LIBEXECLINE} -ifte: EXTRA_LIBS := -lskarnet ${SPAWN_LIB} -ifte: src/execline/ifte.o ${LIBEXECLINE} -ifthenelse: EXTRA_LIBS := -lskarnet ${SPAWN_LIB} -ifthenelse: src/execline/ifthenelse.o ${LIBEXECLINE} -importas: EXTRA_LIBS := -lskarnet -importas: src/execline/importas.o ${LIBEXECLINE} -loopwhilex: EXTRA_LIBS := -lskarnet ${SPAWN_LIB} -loopwhilex: src/execline/loopwhilex.o ${LIBEXECLINE} -multidefine: EXTRA_LIBS := -lskarnet -multidefine: src/execline/multidefine.o ${LIBEXECLINE} -multisubstitute: EXTRA_LIBS := -lskarnet -multisubstitute: src/execline/multisubstitute.o ${LIBEXECLINE} -pipeline: EXTRA_LIBS := -lskarnet ${SPAWN_LIB} -pipeline: src/execline/pipeline.o ${LIBEXECLINE} -piperw: EXTRA_LIBS := -lskarnet -piperw: src/execline/piperw.o -posix-cd: EXTRA_LIBS := -lskarnet -posix-cd: src/execline/posix-cd.o -posix-umask: EXTRA_LIBS := -lskarnet -posix-umask: src/execline/posix-umask.o -redirfd: EXTRA_LIBS := -lskarnet -redirfd: src/execline/redirfd.o -runblock: EXTRA_LIBS := -lskarnet -runblock: src/execline/runblock.o ${LIBEXECLINE} -shift: EXTRA_LIBS := -lskarnet -shift: src/execline/shift.o ${LIBEXECLINE} -trap: EXTRA_LIBS := -lskarnet ${SPAWN_LIB} -trap: src/execline/trap.o ${LIBEXECLINE} -tryexec: EXTRA_LIBS := -lskarnet -tryexec: src/execline/tryexec.o ${LIBEXECLINE} -unexport: EXTRA_LIBS := -lskarnet -unexport: src/execline/unexport.o -wait: EXTRA_LIBS := -lskarnet -wait: src/execline/wait.o ${LIBEXECLINE} -withstdinas: EXTRA_LIBS := -lskarnet -withstdinas: src/execline/withstdinas.o ${LIBEXECLINE} +background: EXTRA_LIBS := ${SPAWN_LIB} +background: src/execline/background.o ${LIBEXECLINE} -lskarnet +backtick: EXTRA_LIBS := ${SPAWN_LIB} +backtick: src/execline/backtick.o ${LIBEXECLINE} -lskarnet +case: EXTRA_LIBS := +case: src/execline/case.o ${LIBEXECLINE} -lskarnet +define: EXTRA_LIBS := +define: src/execline/define.o ${LIBEXECLINE} -lskarnet +dollarat: EXTRA_LIBS := +dollarat: src/execline/dollarat.o -lskarnet +elgetopt: EXTRA_LIBS := +elgetopt: src/execline/elgetopt.o ${LIBEXECLINE} -lskarnet +elgetpositionals: EXTRA_LIBS := +elgetpositionals: src/execline/elgetpositionals.o ${LIBEXECLINE} -lskarnet +elglob: EXTRA_LIBS := +elglob: src/execline/elglob.o ${LIBEXECLINE} -lskarnet +eltest: EXTRA_LIBS := +eltest: src/execline/eltest.o -lskarnet +emptyenv: EXTRA_LIBS := +emptyenv: src/execline/emptyenv.o ${LIBEXECLINE} -lskarnet +envfile: EXTRA_LIBS := +envfile: src/execline/envfile.o -lskarnet +exec: EXTRA_LIBS := +exec: src/execline/exec.o -lskarnet +execline-cd: EXTRA_LIBS := +execline-cd: src/execline/execline-cd.o -lskarnet +execline-umask: EXTRA_LIBS := +execline-umask: src/execline/execline-umask.o -lskarnet +execlineb: EXTRA_LIBS := +execlineb: src/execline/execlineb.o ${LIBEXECLINE} -lskarnet +exit: EXTRA_LIBS := +exit: src/execline/exit.o -lskarnet +export: EXTRA_LIBS := +export: src/execline/export.o -lskarnet +export-array: EXTRA_LIBS := +export-array: src/execline/export-array.o ${LIBEXECLINE} -lskarnet +fdblock: EXTRA_LIBS := +fdblock: src/execline/fdblock.o -lskarnet +fdclose: EXTRA_LIBS := +fdclose: src/execline/fdclose.o -lskarnet +fdmove: EXTRA_LIBS := +fdmove: src/execline/fdmove.o -lskarnet +fdreserve: EXTRA_LIBS := +fdreserve: src/execline/fdreserve.o -lskarnet +fdswap: EXTRA_LIBS := +fdswap: src/execline/fdswap.o -lskarnet +forbacktickx: EXTRA_LIBS := +forbacktickx: src/execline/forbacktickx.o -lskarnet +foreground: EXTRA_LIBS := ${SPAWN_LIB} +foreground: src/execline/foreground.o ${LIBEXECLINE} -lskarnet +forstdin: EXTRA_LIBS := ${SPAWN_LIB} +forstdin: src/execline/forstdin.o ${LIBEXECLINE} -lskarnet +forx: EXTRA_LIBS := ${SPAWN_LIB} +forx: src/execline/forx.o ${LIBEXECLINE} -lskarnet +getcwd: EXTRA_LIBS := +getcwd: src/execline/getcwd.o ${LIBEXECLINE} -lskarnet +getpid: EXTRA_LIBS := +getpid: src/execline/getpid.o ${LIBEXECLINE} -lskarnet +heredoc: EXTRA_LIBS := +heredoc: src/execline/heredoc.o -lskarnet +homeof: EXTRA_LIBS := ${MAYBEPTHREAD_LIB} +homeof: src/execline/homeof.o ${LIBNSSS} -lskarnet +if: EXTRA_LIBS := ${SPAWN_LIB} +if: src/execline/if.o ${LIBEXECLINE} -lskarnet +ifelse: EXTRA_LIBS := ${SPAWN_LIB} +ifelse: src/execline/ifelse.o ${LIBEXECLINE} -lskarnet +ifte: EXTRA_LIBS := ${SPAWN_LIB} +ifte: src/execline/ifte.o ${LIBEXECLINE} -lskarnet +ifthenelse: EXTRA_LIBS := ${SPAWN_LIB} +ifthenelse: src/execline/ifthenelse.o ${LIBEXECLINE} -lskarnet +importas: EXTRA_LIBS := +importas: src/execline/importas.o ${LIBEXECLINE} -lskarnet +loopwhilex: EXTRA_LIBS := ${SPAWN_LIB} +loopwhilex: src/execline/loopwhilex.o ${LIBEXECLINE} -lskarnet +multidefine: EXTRA_LIBS := +multidefine: src/execline/multidefine.o ${LIBEXECLINE} -lskarnet +multisubstitute: EXTRA_LIBS := +multisubstitute: src/execline/multisubstitute.o ${LIBEXECLINE} -lskarnet +pipeline: EXTRA_LIBS := ${SPAWN_LIB} +pipeline: src/execline/pipeline.o ${LIBEXECLINE} -lskarnet +piperw: EXTRA_LIBS := +piperw: src/execline/piperw.o -lskarnet +posix-cd: EXTRA_LIBS := +posix-cd: src/execline/posix-cd.o -lskarnet +posix-umask: EXTRA_LIBS := +posix-umask: src/execline/posix-umask.o -lskarnet +redirfd: EXTRA_LIBS := +redirfd: src/execline/redirfd.o -lskarnet +runblock: EXTRA_LIBS := +runblock: src/execline/runblock.o ${LIBEXECLINE} -lskarnet +shift: EXTRA_LIBS := +shift: src/execline/shift.o ${LIBEXECLINE} -lskarnet +trap: EXTRA_LIBS := ${SPAWN_LIB} +trap: src/execline/trap.o ${LIBEXECLINE} -lskarnet +tryexec: EXTRA_LIBS := +tryexec: src/execline/tryexec.o ${LIBEXECLINE} -lskarnet +unexport: EXTRA_LIBS := +unexport: src/execline/unexport.o -lskarnet +wait: EXTRA_LIBS := +wait: src/execline/wait.o ${LIBEXECLINE} -lskarnet +withstdinas: EXTRA_LIBS := +withstdinas: src/execline/withstdinas.o ${LIBEXECLINE} -lskarnet ifeq ($(strip $(STATIC_LIBS_ARE_PIC)),) -libexecline.a.xyzzy: src/libexecline/el_execsequence.o src/libexecline/el_forx_pidinfo.o src/libexecline/el_getstrict.o src/libexecline/el_modif_and_exec.o src/libexecline/el_modif_and_spawn.o src/libexecline/el_modifs_and_exec.o src/libexecline/el_parse.o src/libexecline/el_parse_from_buffer.o src/libexecline/el_parse_from_string.o src/libexecline/el_popenv.o src/libexecline/el_pushenv.o src/libexecline/el_semicolon.o src/libexecline/el_spawn0.o src/libexecline/el_gspawn0.o src/libexecline/el_substandrun.o src/libexecline/el_substandrun_str.o src/libexecline/el_substitute.o src/libexecline/el_transform.o src/libexecline/el_trueargv.o src/libexecline/el_vardupl.o src/libexecline/exlsn_define.o src/libexecline/exlsn_elglob.o src/libexecline/exlsn_importas.o src/libexecline/exlsn_multidefine.o src/libexecline/exlsn_exlp.o src/libexecline/exlsn_main.o src/libexecline/exlsn_free.o src/libexecline/exlp.o +libexecline.a.xyzzy: src/libexecline/el_execsequence.o src/libexecline/el_forx_pidinfo.o src/libexecline/el_getstrict.o src/libexecline/el_modif_and_exec.o src/libexecline/el_modif_and_spawn.o src/libexecline/el_modifs_and_exec.o src/libexecline/el_parse.o src/libexecline/el_parse_from_buffer.o src/libexecline/el_parse_from_string.o src/libexecline/el_popenv.o src/libexecline/el_pushenv.o src/libexecline/el_semicolon.o src/libexecline/el_spawn0.o src/libexecline/el_gspawn0.o src/libexecline/el_substandrun.o src/libexecline/el_substandrun_str.o src/libexecline/el_substitute.o src/libexecline/el_transform.o src/libexecline/el_trueargv.o src/libexecline/el_vardupl.o src/libexecline/exlsn_define.o src/libexecline/exlsn_elglob.o src/libexecline/exlsn_importas.o src/libexecline/exlsn_multidefine.o src/libexecline/exlsn_exlp.o src/libexecline/exlsn_main.o src/libexecline/exlsn_free.o src/libexecline/exlp.o -lskarnet else -libexecline.a.xyzzy: src/libexecline/el_execsequence.lo src/libexecline/el_forx_pidinfo.lo src/libexecline/el_getstrict.lo src/libexecline/el_modif_and_exec.lo src/libexecline/el_modif_and_spawn.lo src/libexecline/el_modifs_and_exec.lo src/libexecline/el_parse.lo src/libexecline/el_parse_from_buffer.lo src/libexecline/el_parse_from_string.lo src/libexecline/el_popenv.lo src/libexecline/el_pushenv.lo src/libexecline/el_semicolon.lo src/libexecline/el_spawn0.lo src/libexecline/el_gspawn0.lo src/libexecline/el_substandrun.lo src/libexecline/el_substandrun_str.lo src/libexecline/el_substitute.lo src/libexecline/el_transform.lo src/libexecline/el_trueargv.lo src/libexecline/el_vardupl.lo src/libexecline/exlsn_define.lo src/libexecline/exlsn_elglob.lo src/libexecline/exlsn_importas.lo src/libexecline/exlsn_multidefine.lo src/libexecline/exlsn_exlp.lo src/libexecline/exlsn_main.lo src/libexecline/exlsn_free.lo src/libexecline/exlp.lo +libexecline.a.xyzzy: src/libexecline/el_execsequence.lo src/libexecline/el_forx_pidinfo.lo src/libexecline/el_getstrict.lo src/libexecline/el_modif_and_exec.lo src/libexecline/el_modif_and_spawn.lo src/libexecline/el_modifs_and_exec.lo src/libexecline/el_parse.lo src/libexecline/el_parse_from_buffer.lo src/libexecline/el_parse_from_string.lo src/libexecline/el_popenv.lo src/libexecline/el_pushenv.lo src/libexecline/el_semicolon.lo src/libexecline/el_spawn0.lo src/libexecline/el_gspawn0.lo src/libexecline/el_substandrun.lo src/libexecline/el_substandrun_str.lo src/libexecline/el_substitute.lo src/libexecline/el_transform.lo src/libexecline/el_trueargv.lo src/libexecline/el_vardupl.lo src/libexecline/exlsn_define.lo src/libexecline/exlsn_elglob.lo src/libexecline/exlsn_importas.lo src/libexecline/exlsn_multidefine.lo src/libexecline/exlsn_exlp.lo src/libexecline/exlsn_main.lo src/libexecline/exlsn_free.lo src/libexecline/exlp.lo -lskarnet endif -libexecline.so.xyzzy: EXTRA_LIBS := -lskarnet ${SPAWN_LIB} -libexecline.so.xyzzy: src/libexecline/el_execsequence.lo src/libexecline/el_forx_pidinfo.lo src/libexecline/el_getstrict.lo src/libexecline/el_modif_and_exec.lo src/libexecline/el_modif_and_spawn.lo src/libexecline/el_modifs_and_exec.lo src/libexecline/el_parse.lo src/libexecline/el_parse_from_buffer.lo src/libexecline/el_parse_from_string.lo src/libexecline/el_popenv.lo src/libexecline/el_pushenv.lo src/libexecline/el_semicolon.lo src/libexecline/el_spawn0.lo src/libexecline/el_gspawn0.lo src/libexecline/el_substandrun.lo src/libexecline/el_substandrun_str.lo src/libexecline/el_substitute.lo src/libexecline/el_transform.lo src/libexecline/el_trueargv.lo src/libexecline/el_vardupl.lo src/libexecline/exlsn_define.lo src/libexecline/exlsn_elglob.lo src/libexecline/exlsn_importas.lo src/libexecline/exlsn_multidefine.lo src/libexecline/exlsn_exlp.lo src/libexecline/exlsn_main.lo src/libexecline/exlsn_free.lo src/libexecline/exlp.lo -execline: EXTRA_LIBS := -lskarnet ${SPAWN_LIB} ${MAYBEPTHREAD_LIB} -execline: src/multicall/execline.o ${LIBEXECLINE} ${LIBNSSS} +libexecline.pc: EXTRA_LIBS := -lskarnet ${SPAWN_LIB} +libexecline.so.xyzzy: EXTRA_LIBS := ${SPAWN_LIB} +libexecline.so.xyzzy: src/libexecline/el_execsequence.lo src/libexecline/el_forx_pidinfo.lo src/libexecline/el_getstrict.lo src/libexecline/el_modif_and_exec.lo src/libexecline/el_modif_and_spawn.lo src/libexecline/el_modifs_and_exec.lo src/libexecline/el_parse.lo src/libexecline/el_parse_from_buffer.lo src/libexecline/el_parse_from_string.lo src/libexecline/el_popenv.lo src/libexecline/el_pushenv.lo src/libexecline/el_semicolon.lo src/libexecline/el_spawn0.lo src/libexecline/el_gspawn0.lo src/libexecline/el_substandrun.lo src/libexecline/el_substandrun_str.lo src/libexecline/el_substitute.lo src/libexecline/el_transform.lo src/libexecline/el_trueargv.lo src/libexecline/el_vardupl.lo src/libexecline/exlsn_define.lo src/libexecline/exlsn_elglob.lo src/libexecline/exlsn_importas.lo src/libexecline/exlsn_multidefine.lo src/libexecline/exlsn_exlp.lo src/libexecline/exlsn_main.lo src/libexecline/exlsn_free.lo src/libexecline/exlp.lo -lskarnet +execline: EXTRA_LIBS := ${SPAWN_LIB} ${MAYBEPTHREAD_LIB} +execline: src/multicall/execline.o ${LIBEXECLINE} ${LIBNSSS} -lskarnet INTERNAL_LIBS := diff --git a/package/targets.mak b/package/targets.mak index a7a1fd9..0f8716a 100644 --- a/package/targets.mak +++ b/package/targets.mak @@ -1,6 +1,7 @@ LIBEXEC_TARGETS := LIB_DEFS := EXECLINE=execline +EXECLINE_REQUIRES := libskarnet ifeq ($(MULTICALL),1) @@ -32,10 +33,4 @@ SYMLINK_TARGET_cd := execline-cd SYMLINK_TARGET_umask := execline-umask endif -$(DESTDIR)$(bindir)/define: ./define package/modes - exec $(INSTALL) -D -m 600 $< $@ - grep -- ^$(@F) < package/modes | { read name mode owner && \ - if [ x$$owner != x ] ; then chown -- $$owner $@ ; fi && \ - chmod $$mode $@ ; } - endif |