diff options
| author | Treeve Jelbert | 2019-06-25 10:47:11 +0200 |
|---|---|---|
| committer | Treeve Jelbert | 2019-06-25 10:47:11 +0200 |
| commit | 6a4a8931d0080af6e5206c15238dcd568d275f23 (patch) | |
| tree | 5789256b55b33884aabc910a032ef0a2536d239b /qt5 | |
| parent | b69ed64fd147d18fb3da994eaa42515c06cc3ea5 (diff) | |
qtbase - tweaks
Diffstat (limited to 'qt5')
| -rwxr-xr-x | qt5/qtbase/BUILD | 7 | ||||
| -rwxr-xr-x | qt5/qtbase/CONFIGURE | 3 | ||||
| -rwxr-xr-x | qt5/qtbase/DEPENDS | 2 | ||||
| -rw-r--r-- | qt5/qtbase/HISTORY | 4 |
4 files changed, 10 insertions, 6 deletions
diff --git a/qt5/qtbase/BUILD b/qt5/qtbase/BUILD index 9a0134a8d1..49cf0dfe3b 100755 --- a/qt5/qtbase/BUILD +++ b/qt5/qtbase/BUILD @@ -1,14 +1,11 @@ - -OPTS="$QT_DEBUG \ +OPTS+=" $QT_DEBUG \ $QT_DECL \ $QT_PCH \ $QT_EXAMPLE examples \ $QT_TESTS tests \ $QT_ACCESS \ - ${QT_GOLD}-use-gold-linker \ - $OPTS" && + --linker=$QT_LINKER" && cd $SOURCE_DIRECTORY && - ./configure -opensource -confirm-license \ -prefix $QT5DIR -platform linux-g++ \ -reduce-relocations -reduce-exports $OPTS -v && diff --git a/qt5/qtbase/CONFIGURE b/qt5/qtbase/CONFIGURE index 5af2273ae4..8fb10ad32c 100755 --- a/qt5/qtbase/CONFIGURE +++ b/qt5/qtbase/CONFIGURE @@ -2,6 +2,7 @@ persistent_remove QT_JVS persistent_remove QT_AUDIO persistent_remove QT_XRAMA persistent_remove QT_GIF +persistent_remove QT_GOLD config_query QT_DOC 'install documents(very big)?' n && config_query_option QT_EXAMPLE 'install examples?' n \ @@ -24,6 +25,6 @@ config_query_option QT_ACCESS 'Compile Accessibility support' y \ '-accessibility' \ '-no-accessibility' && -config_query_option QT_GOLD 'use gold linker' y '' '-no' && +config_query_list QT_LINKER 'which linker' gold bfd lld && config_query QT_SQL 'enable SQL support?' y diff --git a/qt5/qtbase/DEPENDS b/qt5/qtbase/DEPENDS index c82b9535d6..0c19131e8a 100755 --- a/qt5/qtbase/DEPENDS +++ b/qt5/qtbase/DEPENDS @@ -12,6 +12,8 @@ depends icu '-icu' && depends sqlite '-system-sqlite' && depends -sub PCRE16 pcre2 '-system-pcre' && depends ca-certificates && +depends zstd && +depends shared-mime-info '-no-mimetype-database' && optional_depends pkgconfig \ '-force-pkg-config' \ diff --git a/qt5/qtbase/HISTORY b/qt5/qtbase/HISTORY index aa96566a36..c8ea037d41 100644 --- a/qt5/qtbase/HISTORY +++ b/qt5/qtbase/HISTORY @@ -1,3 +1,7 @@ +2019-06-25 Treeve Jelbert <treeve@sourcemage.org> + * CONFIGURE BUILD: add linker options + * DEPENDS: add zstd shared-mime-info + 2019-06-19 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 5.13.0 * patches/*: updated |