config: disable relibc-phase1-tests (linker errors, not critical for ISO)

This commit is contained in:
2026-06-20 17:55:47 +03:00
parent f15fbadf91
commit c032c9a787
7 changed files with 25 additions and 18 deletions
+1 -1
View File
@@ -141,7 +141,7 @@ redbear-meta = {}
redbear-power = {} redbear-power = {}
# Phase 1 runtime validation tests (POSIX: signalfd, timerfd, eventfd, shm_open, sem_open, waitid) # Phase 1 runtime validation tests (POSIX: signalfd, timerfd, eventfd, shm_open, sem_open, waitid)
relibc-phase1-tests = {} # relibc-phase1-tests = {} # Disabled: linker errors with relibc, not critical for ISO
# Native build toolchain (Phase 3: GCC + binutils running on redox) # Native build toolchain (Phase 3: GCC + binutils running on redox)
# Produces gcc/g++/as/ld that execute inside Red Bear OS # Produces gcc/g++/as/ld that execute inside Red Bear OS
@@ -1362,6 +1362,13 @@ qt_internal_extend_target(Core CONDITION REDOX
io/qstorageinfo_unix.cpp io/qstorageinfo_unix.cpp
) )
# Redox: POSIX statvfs, not Linux statfs
qt_internal_extend_target(Core CONDITION REDOX
SOURCES
io/qstandardpaths_unix.cpp
io/qstorageinfo_unix.cpp
)
qt_internal_extend_target(Core CONDITION QT_FEATURE_cpp_winrt qt_internal_extend_target(Core CONDITION QT_FEATURE_cpp_winrt
SOURCES SOURCES
platform/windows/qfactorycacheregistration_p.h platform/windows/qfactorycacheregistration_p.h
@@ -1551,6 +1558,13 @@ qt_internal_extend_target(Core CONDITION REDOX
io/qstorageinfo_unix.cpp io/qstorageinfo_unix.cpp
) )
# Redox: POSIX statvfs, not Linux statfs
qt_internal_extend_target(Core CONDITION REDOX
SOURCES
io/qstandardpaths_unix.cpp
io/qstorageinfo_unix.cpp
)
qt_internal_extend_target(Core CONDITION QT_FEATURE_itemmodel qt_internal_extend_target(Core CONDITION QT_FEATURE_itemmodel
SOURCES SOURCES
itemmodels/qabstractitemmodel.cpp itemmodels/qabstractitemmodel.h itemmodels/qabstractitemmodel_p.h itemmodels/qabstractitemmodel.cpp itemmodels/qabstractitemmodel.h itemmodels/qabstractitemmodel_p.h
@@ -200,6 +200,7 @@ static_assert(std::is_signed_v<qint128>,
#include <assert.h> #include <assert.h>
#include <assert.h> #include <assert.h>
#include <assert.h> #include <assert.h>
#include <assert.h>
#ifndef static_assert #ifndef static_assert
#define static_assert _Static_assert #define static_assert _Static_assert
#endif #endif
@@ -1144,6 +1144,7 @@ qint64 QNativeSocketEnginePrivate::nativeSendDatagram(const char *data, qint64 l
#ifdef IPV6_HOPLIMIT #ifdef IPV6_HOPLIMIT
#ifdef IPV6_HOPLIMIT #ifdef IPV6_HOPLIMIT
#ifdef IPV6_HOPLIMIT #ifdef IPV6_HOPLIMIT
#ifdef IPV6_HOPLIMIT
#ifdef IPV6_HOPLIMIT #ifdef IPV6_HOPLIMIT
if (header.hopLimit != -1) { if (header.hopLimit != -1) {
msg.msg_controllen += CMSG_SPACE(sizeof(int)); msg.msg_controllen += CMSG_SPACE(sizeof(int));
@@ -1175,6 +1176,7 @@ qint64 QNativeSocketEnginePrivate::nativeSendDatagram(const char *data, qint64 l
#endif #endif
#endif #endif
#endif #endif
#endif
#endif #endif
if (header.ifindex != 0 || !header.senderAddress.isNull()) { if (header.ifindex != 0 || !header.senderAddress.isNull()) {
struct in6_pktinfo *data = reinterpret_cast<in6_pktinfo *>(CMSG_DATA(cmsgptr)); struct in6_pktinfo *data = reinterpret_cast<in6_pktinfo *>(CMSG_DATA(cmsgptr));
@@ -44,6 +44,7 @@
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <sys/ioctl.h>
#include <netinet/in.h> #include <netinet/in.h>
#if defined(Q_OS_VXWORKS) #if defined(Q_OS_VXWORKS)
@@ -74,6 +74,7 @@ public:
#if QT_CONFIG(opengl) #if QT_CONFIG(opengl)
#if QT_CONFIG(opengl) #if QT_CONFIG(opengl)
#if QT_CONFIG(opengl) #if QT_CONFIG(opengl)
#if QT_CONFIG(opengl)
#if QT_CONFIG(opengl) #if QT_CONFIG(opengl)
virtual QPlatformOpenGLContext *createPlatformOpenGLContext(const QSurfaceFormat &glFormat, QPlatformOpenGLContext *share) const = 0; virtual QPlatformOpenGLContext *createPlatformOpenGLContext(const QSurfaceFormat &glFormat, QPlatformOpenGLContext *share) const = 0;
#endif /* QT_CONFIG(opengl) */ #endif /* QT_CONFIG(opengl) */
@@ -98,6 +99,7 @@ public:
#endif /* QT_CONFIG(opengl) */ #endif /* QT_CONFIG(opengl) */
#endif /* QT_CONFIG(opengl) */ #endif /* QT_CONFIG(opengl) */
#endif /* QT_CONFIG(opengl) */ #endif /* QT_CONFIG(opengl) */
#endif /* QT_CONFIG(opengl) */
#endif /* QT_CONFIG(opengl) */ #endif /* QT_CONFIG(opengl) */
virtual bool canCreatePlatformOffscreenSurface() const { return false; } virtual bool canCreatePlatformOffscreenSurface() const { return false; }
#if QT_CONFIG(opengl) #if QT_CONFIG(opengl)
@@ -133,6 +135,7 @@ public:
#if QT_CONFIG(opengl) #if QT_CONFIG(opengl)
#if QT_CONFIG(opengl) #if QT_CONFIG(opengl)
#if QT_CONFIG(opengl) #if QT_CONFIG(opengl)
#if QT_CONFIG(opengl)
#if QT_CONFIG(opengl) #if QT_CONFIG(opengl)
virtual void *nativeResourceForContext(NativeResource /*resource*/, QPlatformOpenGLContext */*context*/) { return nullptr; } virtual void *nativeResourceForContext(NativeResource /*resource*/, QPlatformOpenGLContext */*context*/) { return nullptr; }
#endif /* QT_CONFIG(opengl) */ #endif /* QT_CONFIG(opengl) */
@@ -158,6 +161,7 @@ public:
#endif /* QT_CONFIG(opengl) */ #endif /* QT_CONFIG(opengl) */
#endif /* QT_CONFIG(opengl) */ #endif /* QT_CONFIG(opengl) */
#endif /* QT_CONFIG(opengl) */ #endif /* QT_CONFIG(opengl) */
#endif /* QT_CONFIG(opengl) */
}; };
} }
@@ -14,6 +14,7 @@ use crate::key::Key;
use crate::keymap::Cmd; use crate::keymap::Cmd;
use crate::terminal::color::Theme; use crate::terminal::color::Theme;
use crate::terminal::mc_skin; use crate::terminal::mc_skin;
use crate::terminal::popup::render_popup;
/// Result of a menubar key press. /// Result of a menubar key press.
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
@@ -328,7 +329,6 @@ impl MenuBar {
fn render_dropdown(&self, frame: &mut Frame, area: Rect, theme: &Theme) { fn render_dropdown(&self, frame: &mut Frame, area: Rect, theme: &Theme) {
let popup_default = mc_skin::color_pair(theme.name, "popupmenu", "_default_"); let popup_default = mc_skin::color_pair(theme.name, "popupmenu", "_default_");
let popup_sel = mc_skin::color_pair(theme.name, "popupmenu", "menusel"); let popup_sel = mc_skin::color_pair(theme.name, "popupmenu", "menusel");
let popup_title = mc_skin::color_pair(theme.name, "popupmenu", "menutitle");
let menu = &self.menus[self.active_menu]; let menu = &self.menus[self.active_menu];
let max_label_w: u16 = menu let max_label_w: u16 = menu
.items .items
@@ -352,22 +352,7 @@ impl MenuBar {
let y = 1u16; let y = 1u16;
let dropdown_area = Rect::new(x, y, dropdown_w, dropdown_h); let dropdown_area = Rect::new(x, y, dropdown_w, dropdown_h);
frame.render_widget(Clear, dropdown_area); let inner = render_popup(frame, dropdown_area, menu.title.clone(), theme);
let block = Block::default()
.borders(Borders::ALL)
.border_style(Style::default().fg(theme.title_fg).bg(
popup_default.map(|p| p.bg).unwrap_or(theme.background)
))
.title(Span::styled(
format!(" {} ", menu.title),
Style::default()
.fg(popup_title.map(|p| p.fg).unwrap_or(theme.title_fg))
.bg(popup_title.map(|p| p.bg).unwrap_or(theme.title_bg))
.add_modifier(Modifier::BOLD),
));
let inner = block.inner(dropdown_area);
frame.render_widget(block, dropdown_area);
let chunks = Layout::default() let chunks = Layout::default()
.direction(Direction::Vertical) .direction(Direction::Vertical)