mirror of
https://github.com/genodelabs/genode.git
synced 2025-06-15 21:58:24 +00:00
Adapt Qt4 to change of stdcxx, issue #339
The new C++ standard library provided by libports is a shared library. We need to include it in each run script that uses Qt4.
This commit is contained in:
@ -114,8 +114,9 @@ INC_DIR += $(QT4_REP_DIR)/include/genode
|
|||||||
#
|
#
|
||||||
# We cannot just extend the 'LIBS' variable here because 'import-*.mk' are
|
# We cannot just extend the 'LIBS' variable here because 'import-*.mk' are
|
||||||
# included (in 'base/mk/lib.mk') by iterating through the elements of the
|
# included (in 'base/mk/lib.mk') by iterating through the elements of the
|
||||||
# 'LIBS' variable. Hence, we need to manually import the stdlib snippet.
|
# 'LIBS' variable. Hence, we also need to manually import the stdlib snippet.
|
||||||
#
|
#
|
||||||
|
LIBS += stdcxx
|
||||||
include $(call select_from_repositories,lib/import/import-stdcxx.mk)
|
include $(call select_from_repositories,lib/import/import-stdcxx.mk)
|
||||||
|
|
||||||
# custom main() thread stack size support via main() wrapper
|
# custom main() thread stack size support via main() wrapper
|
||||||
|
@ -109,6 +109,7 @@ set boot_modules {
|
|||||||
qt_core.lib.so
|
qt_core.lib.so
|
||||||
qt_gui.lib.so
|
qt_gui.lib.so
|
||||||
zlib.lib.so
|
zlib.lib.so
|
||||||
|
stdcxx.lib.so
|
||||||
}
|
}
|
||||||
|
|
||||||
# platform-specific modules
|
# platform-specific modules
|
||||||
|
@ -112,6 +112,7 @@ set boot_modules {
|
|||||||
qt_network.lib.so
|
qt_network.lib.so
|
||||||
qt_webcore.lib.so
|
qt_webcore.lib.so
|
||||||
zlib.lib.so
|
zlib.lib.so
|
||||||
|
stdcxx.lib.so
|
||||||
}
|
}
|
||||||
|
|
||||||
# platform-specific modules
|
# platform-specific modules
|
||||||
|
@ -126,6 +126,7 @@ set boot_modules {
|
|||||||
qnitpickerviewwidget.lib.so
|
qnitpickerviewwidget.lib.so
|
||||||
qpluginwidget.lib.so
|
qpluginwidget.lib.so
|
||||||
test-plugin.tar
|
test-plugin.tar
|
||||||
|
stdcxx.lib.so
|
||||||
}
|
}
|
||||||
|
|
||||||
# platform-specific modules
|
# platform-specific modules
|
||||||
|
@ -116,6 +116,7 @@ set boot_modules {
|
|||||||
qt_ui_tools.lib.so
|
qt_ui_tools.lib.so
|
||||||
qt_xml.lib.so
|
qt_xml.lib.so
|
||||||
zlib.lib.so
|
zlib.lib.so
|
||||||
|
stdcxx.lib.so
|
||||||
}
|
}
|
||||||
|
|
||||||
# platform-specific modules
|
# platform-specific modules
|
||||||
|
@ -143,6 +143,7 @@ set boot_modules {
|
|||||||
libc_rom.lib.so
|
libc_rom.lib.so
|
||||||
avplay
|
avplay
|
||||||
mediafile
|
mediafile
|
||||||
|
stdcxx.lib.so
|
||||||
}
|
}
|
||||||
|
|
||||||
# platform-specific modules
|
# platform-specific modules
|
||||||
|
@ -112,6 +112,7 @@ set boot_modules {
|
|||||||
qt_ui_tools.lib.so
|
qt_ui_tools.lib.so
|
||||||
qt_xml.lib.so
|
qt_xml.lib.so
|
||||||
zlib.lib.so
|
zlib.lib.so
|
||||||
|
stdcxx.lib.so
|
||||||
}
|
}
|
||||||
|
|
||||||
# platform-specific modules
|
# platform-specific modules
|
||||||
|
@ -155,6 +155,7 @@ set boot_modules {
|
|||||||
qt_gui.lib.so
|
qt_gui.lib.so
|
||||||
zlib.lib.so
|
zlib.lib.so
|
||||||
usb_drv
|
usb_drv
|
||||||
|
stdcxx.lib.so
|
||||||
}
|
}
|
||||||
|
|
||||||
# platform-specific modules
|
# platform-specific modules
|
||||||
|
Reference in New Issue
Block a user