kde: kf6-pty — disable UTEMPTER + fix botched __redox__ #ifdef balance
redbear-ci / check (push) Has been cancelled
redbear-ci / check (push) Has been cancelled
- FindUTEMPTER aborts when cross-compiling unless told what to do; Redox has no utmp/wtmp login-record DB, so pass -DCMAKE_DISABLE_FIND_PACKAGE_UTEMPTER=ON (PTYs work without it; utempter only feeds who/w login accounting). - kpty.cpp's __redox__ no-op guard around KPty::login()/logout() had dropped the #endif for the UTEMPTER_PATH and HAVE_LOGIN blocks and never closed the new __redox__ #ifdef, leaving both functions 3 #if deep at their closing brace (unterminated #else / expected '}'). Add the 3 missing #endif to each.
This commit is contained in:
@@ -47,6 +47,7 @@ cmake "${COOKBOOK_SOURCE}" \
|
||||
-DCMAKE_BUILD_TYPE=Release \
|
||||
-DCMAKE_PREFIX_PATH="${COOKBOOK_SYSROOT}" \
|
||||
-DBUILD_TESTING=OFF \
|
||||
-DCMAKE_DISABLE_FIND_PACKAGE_UTEMPTER=ON \
|
||||
-DBUILD_QCH=OFF \
|
||||
-DHAVE_PTSNAME=TRUE \
|
||||
-DHAVE_GRANTPT=TRUE \
|
||||
|
||||
@@ -540,6 +540,9 @@ void KPty::login(const char *user, const char *remotehost)
|
||||
endutent();
|
||||
updwtmp(_PATH_WTMP, &l_struct);
|
||||
#endif
|
||||
#endif // HAVE_LOGIN
|
||||
#endif // UTEMPTER_PATH
|
||||
#endif // __redox__
|
||||
}
|
||||
|
||||
void KPty::logout()
|
||||
@@ -621,6 +624,9 @@ void KPty::logout()
|
||||
}
|
||||
endutent();
|
||||
#endif
|
||||
#endif // HAVE_LOGIN
|
||||
#endif // UTEMPTER_PATH
|
||||
#endif // __redox__
|
||||
}
|
||||
|
||||
bool KPty::tcGetAttr(struct ::termios *ttmode) const
|
||||
|
||||
Reference in New Issue
Block a user