* Fix building util-linux on non-linux
@ 2020-11-17 20:20 Samuel Thibault
2020-11-18 9:34 ` Karel Zak
0 siblings, 1 reply; 2+ messages in thread
From: Samuel Thibault @ 2020-11-17 20:20 UTC (permalink / raw)
To: Karel Zak; +Cc: util-linux
[-- Attachment #1: Type: text/plain, Size: 63 bytes --]
Hello,
The attached patch fixes building on non-linux
Samuel
[-- Attachment #2: patch --]
[-- Type: text/plain, Size: 1471 bytes --]
diff --git a/login-utils/Makemodule.am b/login-utils/Makemodule.am
index 4f52cea3c..8bc3ee37e 100644
--- a/login-utils/Makemodule.am
+++ b/login-utils/Makemodule.am
@@ -31,8 +31,10 @@ dist_man_MANS += login-utils/sulogin.8
sulogin_SOURCES = \
login-utils/sulogin.c \
login-utils/sulogin-consoles.c \
- login-utils/sulogin-consoles.h \
- lib/plymouth-ctrl.c
+ login-utils/sulogin-consoles.h
+if USE_PLYMOUTH_SUPPORT
+sulogin_SOURCES += lib/plymouth-ctrl.c
+endif
sulogin_LDADD = $(LDADD) libcommon.la
if HAVE_LIBCRYPT
diff --git a/sys-utils/hwclock.c b/sys-utils/hwclock.c
index 1f7ef3317..db448687d 100644
--- a/sys-utils/hwclock.c
+++ b/sys-utils/hwclock.c
@@ -678,7 +678,7 @@ display_time(struct timeval hwctime)
#ifndef SYS_settimeofday
# ifdef __NR_settimeofday
# define SYS_settimeofday __NR_settimeofday
-# else
+# elif defined(__NR_settimeofday_time32)
# define SYS_settimeofday __NR_settimeofday_time32
# endif
#endif
diff --git a/term-utils/Makemodule.am b/term-utils/Makemodule.am
index 92df7dbc8..c424dbdf8 100644
--- a/term-utils/Makemodule.am
+++ b/term-utils/Makemodule.am
@@ -42,8 +42,10 @@ endif # BUILD_SCRIPTLIVE
if BUILD_AGETTY
sbin_PROGRAMS += agetty
dist_man_MANS += term-utils/agetty.8
-agetty_SOURCES = term-utils/agetty.c \
- lib/plymouth-ctrl.c
+agetty_SOURCES = term-utils/agetty.c
+if USE_PLYMOUTH_SUPPORT
+agetty_SOURCES += lib/plymouth-ctrl.c
+endif
agetty_LDADD = $(LDADD) libcommon.la
if BSD
agetty_LDADD += -lutil
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: Fix building util-linux on non-linux
2020-11-17 20:20 Fix building util-linux on non-linux Samuel Thibault
@ 2020-11-18 9:34 ` Karel Zak
0 siblings, 0 replies; 2+ messages in thread
From: Karel Zak @ 2020-11-18 9:34 UTC (permalink / raw)
To: Samuel Thibault, util-linux
On Tue, Nov 17, 2020 at 09:20:17PM +0100, Samuel Thibault wrote:
> Hello,
>
> The attached patch fixes building on non-linux
>
> Samuel
> diff --git a/login-utils/Makemodule.am b/login-utils/Makemodule.am
> index 4f52cea3c..8bc3ee37e 100644
> --- a/login-utils/Makemodule.am
> +++ b/login-utils/Makemodule.am
> @@ -31,8 +31,10 @@ dist_man_MANS += login-utils/sulogin.8
> sulogin_SOURCES = \
> login-utils/sulogin.c \
> login-utils/sulogin-consoles.c \
> - login-utils/sulogin-consoles.h \
> - lib/plymouth-ctrl.c
> + login-utils/sulogin-consoles.h
> +if USE_PLYMOUTH_SUPPORT
> +sulogin_SOURCES += lib/plymouth-ctrl.c
> +endif
> sulogin_LDADD = $(LDADD) libcommon.la
Yep, stupid bug. Fixed by https://github.com/karelzak/util-linux/pull/1190.
Karel
--
Karel Zak <kzak@redhat.com>
http://karelzak.blogspot.com
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-11-18 9:34 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-17 20:20 Fix building util-linux on non-linux Samuel Thibault
2020-11-18 9:34 ` Karel Zak
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).