Dirk Mueller
ad8ffc4215
- Switch to procps 4 branch, bsorbing the former procps4 package:
+ Add provides/obsoletes procps4: make zypper replace procps4
with the main package for users that manually switched.
Do the final switch to procs4; the issues from 2022 (e.g. salt) should be
fixed.
OBS-URL: https://build.opensuse.org/request/show/1190400
OBS-URL: https://build.opensuse.org/package/show/Base:System/procps?expand=0&rev=254
34 lines
873 B
Plaintext
34 lines
873 B
Plaintext
---
|
|
Makefile.am | 2 +-
|
|
configure.ac | 8 ++++++++
|
|
2 files changed, 9 insertions(+), 1 deletion(-)
|
|
|
|
--- Makefile.am
|
|
+++ Makefile.am 2022-10-20 13:21:37.505517043 +0000
|
|
@@ -191,7 +191,7 @@ src_top_top_SOURCES += local/strverscmp.
|
|
endif
|
|
|
|
src_top_top_CFLAGS = @NCURSES_CFLAGS@
|
|
-src_top_top_LDADD = $(LDADD) @NCURSES_LIBS@ $(DL_LIB)
|
|
+src_top_top_LDADD = $(LDADD) @TOP_NCURSES_LIBS@ $(DL_LIB)
|
|
endif
|
|
|
|
if BUILD_SKILL
|
|
--- configure.ac
|
|
+++ configure.ac 2022-10-20 13:23:50.707138810 +0000
|
|
@@ -281,6 +281,14 @@ fi
|
|
# else
|
|
# WATCH_NCURSES_LIBS="$NCURSES_LIBS"
|
|
# fi
|
|
+cf_tinfo=""
|
|
+AC_CHECK_LIB(tinfo, setupterm, [cf_tinfo="tinfo"])
|
|
+if test x$cf_tinfo = xtinfo ; then
|
|
+ TOP_NCURSES_LIBS="-ltinfo"
|
|
+else
|
|
+ TOP_NCURSES_LIBS="$NCURSES_LIBS"
|
|
+fi
|
|
+AC_SUBST([TOP_NCURSES_LIBS])
|
|
|
|
AC_ARG_WITH([systemd],
|
|
[AS_HELP_STRING([--with-systemd], [enable systemd support])],
|