Changeset 16961 in niluje


Ignore:
Timestamp:
Mar 17, 2020, 4:38:02 PM (2 weeks ago)
Author:
NiLuJe
Message:

Nickel Sysroot:

  • Update the fun branch to Qt 5.14 (Untested, not that we care ;p).
File:
1 edited

Legend:

Unmodified
Added
Removed
  • Configs/trunk/Kindle/Misc/kobo-nickel-sysroot.sh

    r16805 r16961  
    9797cd "${TC_BUILD_WD}"
    9898
    99 ## Do we shoot for Qt 5.12 and a fairly painless build, or do we opt for the masochistic 5.2 option?
    100 TC_WANT_QT_512="false"
     99## Do we shoot for a recent Qt 5 version and a fairly painless build, or do we opt for the masochistic 5.2 option?
     100TC_WANT_QT_LTS="false"
    101101## Do we shoot for the Kobo branches, or upstream's old/5.2?
    102102TC_WANT_QT_KOBO="true"
     
    176176#       but the truly ancient version shipped by Kobo features such suffixes...
    177177#       Sooo, build that truly old version, with the suffix, just to be safe...
    178 if [[ "${TC_WANT_QT_512}" == "true" ]] ; then
     178if [[ "${TC_WANT_QT_LTS}" == "true" ]] ; then
    179179        echo "* Building ICU 65.1 . . ."
    180180        echo ""
     
    202202        export LD="${CROSS_TC}-ld"
    203203        # ICU 64.x requires C++11
    204         if [[ "${TC_WANT_QT_512}" == "true" ]] ; then
     204        if [[ "${TC_WANT_QT_LTS}" == "true" ]] ; then
    205205                # Match the Qt std level, just in case...
    206206                export CXXFLAGS="${NOLTO_CFLAGS} -std=c++14"
     
    267267make install
    268268
    269 if [[ "${TC_WANT_QT_512}" == "true" ]] ; then
     269if [[ "${TC_WANT_QT_LTS}" == "true" ]] ; then
    270270        echo "* Building OpenSSL 1.1.1 . . ."
    271271        echo ""
     
    348348
    349349# Here comes the pain...
    350 if [[ "${TC_WANT_QT_512}" == "false" ]] ; then
     350if [[ "${TC_WANT_QT_LTS}" == "false" ]] ; then
    351351        echo "* Building Qt 5.2. . ."
    352352        echo ""
     
    474474####
    475475####
    476 # NOTE: Everything below targets Qt 5.12, which is nice, but not what we wanted :D.
     476# NOTE: Everything below targets a recent Qt 5 version, which is nice, but not what we wanted :D.
    477477#       On the upside, it actually works without having to backport anything, so, that's a plus.
    478478####
    479479####
    480480
    481 if [[ "${TC_WANT_QT_512}" == "true" ]] ; then
     481if [[ "${TC_WANT_QT_LTS}" == "true" ]] ; then
    482482        # And now for an up-to-date Qt...
    483         echo "* Building Qt 5.12. . ."
     483        echo "* Building Qt 5.14. . ."
    484484        echo ""
    485485        cd ..
    486486        rm -rf qt5
    487         until git clone -b 5.12 --single-branch --depth 1 https://github.com/qt/qt5.git ; do
     487        until git clone -b 5.14 --single-branch --depth 1 https://github.com/qt/qt5.git ; do
    488488                rm -rf qt5
    489489                sleep 15
     
    520520        echo "load(qt_config)" >> qtbase/mkspecs/linux-arm-nickel-gnueabihf-g++/qmake.conf
    521521
     522        # c.f., b.g.o/703306
     523        patch -p1 < ${PORTAGE_DIR}/dev-qt/qtcore/files/qtcore-5.14.1-cmake-macro-backward-compat.patch
     524
    522525        # pkg-config shenanigans...
    523526        export PKG_CONFIG_SYSROOT_DIR="${TC_BUILD_DIR}"
    524527        export PKG_CONFIG="pkg-config --define-variable=prefix=/"
    525528
    526         ./configure -prefix "${TC_BUILD_DIR}" -release -nomake tests -nomake examples -no-compile-examples -confirm-license -opensource -c++std c++14 -shared -accessibility -pkg-config -system-zlib -no-mtdev -system-libpng -system-libjpeg -openssl -qt-pcre -no-xcb-xlib -no-glib -gui -widgets -no-rpath -optimized-qmake -no-cups -no-iconv -icu -no-fontconfig -strip -no-pch -dbus-linked -no-xcb -no-eglfs -no-directfb -linuxfb -no-kms -platform linux-g++ -xplatform linux-arm-nickel-gnueabihf-g++ -no-mng -no-opengl -no-system-proxies -no-warnings-are-errors -qt-freetype -qt-harfbuzz -no-use-gold-linker -no-ltcg -recheck-all -I ${TC_BUILD_DIR}/include -L ${TC_BUILD_DIR}/lib -v
     529        ./configure -prefix "${TC_BUILD_DIR}" -release -nomake tests -nomake examples -no-compile-examples -confirm-license -opensource -c++std c++14 -shared -accessibility -pkg-config -system-zlib -no-mtdev -system-libpng -system-libjpeg -openssl -qt-pcre -no-xcb-xlib -no-glib -gui -widgets -no-rpath -optimized-qmake -no-cups -no-iconv -icu -no-fontconfig -strip -no-pch -dbus-linked -no-vulkan -no-xcb -no-eglfs -no-directfb -linuxfb -no-kms -platform linux-g++ -xplatform linux-arm-nickel-gnueabihf-g++ -no-mng -no-opengl -no-system-proxies -no-warnings-are-errors -qt-freetype -qt-harfbuzz -no-use-gold-linker -no-ltcg -no-feature-statx -recheck-all -I ${TC_BUILD_DIR}/include -L ${TC_BUILD_DIR}/lib -v
    527530        make ${JOBSFLAGS}
    528531        make install
Note: See TracChangeset for help on using the changeset viewer.