Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (6a4a8931d0080af6e5206c15238dcd568d275f23)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (6a4a8931d0080af6e5206c15238dcd568d275f23)
  • Date: Tue, 25 Jun 2019 10:27:12 +0000

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

qt5/qtbase/BUILD | 7 ++-----
qt5/qtbase/CONFIGURE | 3 ++-
qt5/qtbase/DEPENDS | 2 ++
qt5/qtbase/HISTORY | 4 ++++
4 files changed, 10 insertions(+), 6 deletions(-)

New commits:
commit 6a4a8931d0080af6e5206c15238dcd568d275f23
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

qtbase - tweaks

diff --git a/qt5/qtbase/BUILD b/qt5/qtbase/BUILD
index 9a0134a..49cf0df 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 5af2273..8fb10ad 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 c82b953..0c19131 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 aa96566..c8ea037 100644
--- a/qt5/qtbase/HISTORY
+++ b/qt5/qtbase/HISTORY
@@ -1,3 +1,7 @@
+2019-06-25 Treeve Jelbert <treeve AT sourcemage.org>
+ * CONFIGURE BUILD: add linker options
+ * DEPENDS: add zstd shared-mime-info
+
2019-06-19 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5.13.0
* patches/*: updated



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (6a4a8931d0080af6e5206c15238dcd568d275f23), Treeve Jelbert, 06/25/2019

Archive powered by MHonArc 2.6.24.

Top of Page