Skip to content

Fix static build dropping all built-in plugins #514

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
troglobit merged 1 commit into from
Oct 27, 2026
Merged

Fix static build dropping all built-in plugins #514

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 18 additions & 13 deletions plugins/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,51 +6,56 @@ AM_CPPFLAGS += -D_XOPEN_SOURCE=600 -D_BSD_SOURCE -D_GNU_SOURCE -D_DEFAULT
AM_CPPFLAGS += -D__FINIT__ $(lite_CFLAGS) $(uev_CFLAGS)

if STATIC
noinst_LTLIBRARIES = libplug.la
libplug_la_SOURCES = bootmisc.c pidfile.c procps.c sys.c usr.c
noinst_LIBRARIES = libplug.a
libplug_a_SOURCES = bootmisc.c pidfile.c procps.c sys.c usr.c
libplug_a_CFLAGS = $(AM_CFLAGS)

if BUILD_ALSA_UTILS_PLUGIN
libplug_la_SOURCES += alsa-utils.c
libplug_a_SOURCES += alsa-utils.c
endif

if BUILD_DBUS_PLUGIN
libplug_la_SOURCES += dbus.c
libplug_a_SOURCES += dbus.c
endif

if BUILD_HOOK_SCRIPTS_PLUGIN
libplug_a_SOURCES += hook-scripts.c
endif

if BUILD_MODULES_LOAD_PLUGIN
libplug_la_SOURCES += modules-load.c
libplug_a_SOURCES += modules-load.c
endif

if BUILD_MODPROBE_PLUGIN
libplug_la_SOURCES += modprobe.c
libplug_a_SOURCES += modprobe.c
endif

if BUILD_NETLINK_PLUGIN
libplug_la_SOURCES += netlink.c
libplug_a_SOURCES += netlink.c
endif

if BUILD_PLYMOUTH_PLUGIN
libplug_la_SOURCES += plymouth.c
libplug_a_SOURCES += plymouth.c
endif

if BUILD_RESOLVCONF_PLUGIN
libplug_la_SOURCES += resolvconf.c
libplug_a_SOURCES += resolvconf.c
endif

if BUILD_RTC_PLUGIN
libplug_la_SOURCES += rtc.c
libplug_a_SOURCES += rtc.c
endif

if BUILD_TTY_PLUGIN
libplug_la_SOURCES += tty.c
libplug_a_SOURCES += tty.c
endif

if BUILD_URANDOM_PLUGIN
libplug_la_SOURCES += urandom.c
libplug_a_SOURCES += urandom.c
endif

if BUILD_X11_COMMON_PLUGIN
libplug_la_SOURCES += x11-common.c
libplug_a_SOURCES += x11-common.c
endif

else
Expand Down
4 changes: 3 additions & 1 deletion src/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,10 @@ finit_CPPFLAGS = $(AM_CPPFLAGS) -D__FINIT__
finit_CFLAGS = -W -Wall -Wextra -Wno-unused-parameter -std=gnu99
finit_CFLAGS += $(lite_CFLAGS) $(uev_CFLAGS) $(confuse_CFLAGS)
finit_LDADD = $(lite_LIBS) $(uev_LIBS) $(confuse_LIBS)
finit_LDFLAGS = $(AM_LDFLAGS)
if STATIC
finit_LDADD += ../plugins/libplug.la
finit_LDADD += ../plugins/libplug.a
finit_LDFLAGS += -Wl,--whole-archive,../plugins/libplug.a,--no-whole-archive
else
finit_LDADD += -ldl
endif
Expand Down
Loading