mirror of
https://github.com/AuxXxilium/kmod.git
synced 2025-03-11 17:31:01 +07:00
build-sys: workaround libtool issue with argv[0]
Symlinking tools to kmod doesn't work because argv[0] is not the name of the symlink, but rather 'kmod' (since libtool's wrapper script calls the tools/.libs/kmod directly) Now we create another binary kmod-nolib that is statically linked to libkmod so we can call the binary directly and do not worry about LD_LIBRARY_PATH.
This commit is contained in:
parent
043b3f9833
commit
0b22179acd
38
Makefile.am
38
Makefile.am
@ -66,6 +66,9 @@ libkmod_libkmod_la_SOURCES =\
|
||||
libkmod/libkmod-file.c \
|
||||
libkmod/libkmod-elf.c
|
||||
|
||||
noinst_LTLIBRARIES += libkmod/libkmod-private.la
|
||||
libkmod_libkmod_private_la_SOURCES = $(libkmod_libkmod_la_SOURCES)
|
||||
|
||||
EXTRA_DIST += libkmod/libkmod.sym
|
||||
EXTRA_DIST += libkmod/COPYING libkmod/README
|
||||
|
||||
@ -109,7 +112,14 @@ tools_kmod_CFLAGS = $(AM_CFLAGS)
|
||||
tools_kmod_LDADD = libkmod/libkmod-util.la \
|
||||
libkmod/libkmod.la
|
||||
|
||||
${noinst_SCRIPTS}: tools/kmod
|
||||
noinst_PROGRAMS = tools/kmod-nolib
|
||||
tools_kmod_nolib_SOURCES = $(tools_kmod_SOURCES)
|
||||
tools_kmod_nolib_CPPFLAGS = $(tools_kmod_CPPFLAGS)
|
||||
tools_kmod_nolib_CFLAGS = $(tools_kmod_CFLAGS)
|
||||
tools_kmod_nolib_LDADD = libkmod/libkmod-util.la \
|
||||
libkmod/libkmod-private.la
|
||||
|
||||
${noinst_SCRIPTS}: tools/kmod-nolib
|
||||
$(AM_V_GEN) ($(RM) $@; \
|
||||
$(LN_S) $(notdir $<) $@)
|
||||
endif
|
||||
@ -123,19 +133,19 @@ check_PROGRAMS = test/test-init test/test-loaded \
|
||||
|
||||
TESTS = test/test-init test/test-loaded
|
||||
|
||||
test_test_init_LDADD = libkmod/libkmod.la
|
||||
test_test_loaded_LDADD = libkmod/libkmod.la
|
||||
test_test_init_LDADD = libkmod/libkmod-private.la
|
||||
test_test_loaded_LDADD = libkmod/libkmod-private.la
|
||||
|
||||
test_test_rmmod_LDADD = libkmod/libkmod.la
|
||||
test_test_rmmod2_LDADD = libkmod/libkmod.la
|
||||
test_test_insmod_LDADD = libkmod/libkmod.la
|
||||
test_test_lookup_LDADD = libkmod/libkmod.la
|
||||
test_test_path_from_name_LDADD = libkmod/libkmod.la
|
||||
test_test_get_dependencies_LDADD = libkmod/libkmod.la
|
||||
test_test_mod_double_ref_LDADD = libkmod/libkmod.la
|
||||
test_test_blacklist_LDADD = libkmod/libkmod.la
|
||||
test_test_elf_LDADD = libkmod/libkmod.la
|
||||
test_test_probe_LDADD = libkmod/libkmod.la
|
||||
test_test_invalidate_config_LDADD = libkmod/libkmod.la
|
||||
test_test_rmmod_LDADD = libkmod/libkmod-private.la
|
||||
test_test_rmmod2_LDADD = libkmod/libkmod-private.la
|
||||
test_test_insmod_LDADD = libkmod/libkmod-private.la
|
||||
test_test_lookup_LDADD = libkmod/libkmod-private.la
|
||||
test_test_path_from_name_LDADD = libkmod/libkmod-private.la
|
||||
test_test_get_dependencies_LDADD = libkmod/libkmod-private.la
|
||||
test_test_mod_double_ref_LDADD = libkmod/libkmod-private.la
|
||||
test_test_blacklist_LDADD = libkmod/libkmod-private.la
|
||||
test_test_elf_LDADD = libkmod/libkmod-private.la
|
||||
test_test_probe_LDADD = libkmod/libkmod-private.la
|
||||
test_test_invalidate_config_LDADD = libkmod/libkmod-private.la
|
||||
|
||||
DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc
|
||||
|
1
tools/.gitignore
vendored
1
tools/.gitignore
vendored
@ -6,3 +6,4 @@ modprobe
|
||||
modinfo
|
||||
depmod
|
||||
kmod
|
||||
kmod-nolib
|
||||
|
Loading…
Reference in New Issue
Block a user