Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ismael Luceno (4c375521e49606f106db3543ab89dda4ee357a85)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (4c375521e49606f106db3543ab89dda4ee357a85)
  • Date: Fri, 18 Mar 2022 15:18:25 +0000

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

qt5/qtbase/BUILD | 6 +++++-
qt5/qtbase/DEPENDS | 4 ++++
qt5/qtbase/HISTORY | 4 ++++
qt5/qtbase/PRE_BUILD | 10 ++++++++++
4 files changed, 23 insertions(+), 1 deletion(-)

New commits:
commit 4c375521e49606f106db3543ab89dda4ee357a85
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

qtbase: Fix build against musl

diff --git a/qt5/qtbase/BUILD b/qt5/qtbase/BUILD
index 0a4022f..9dc8cd9 100755
--- a/qt5/qtbase/BUILD
+++ b/qt5/qtbase/BUILD
@@ -15,8 +15,12 @@ sizeopt= &&
if list_find "$CXXFLAGS" -Os; then
sizeopt=-optimize-size
fi &&
+platform=linux-g++ &&
+case "$HOST" in
+ (*-musl) platform+=-musl ;;
+esac &&
./configure -opensource -confirm-license \
- -prefix $QT5DIR -platform linux-g++ \
+ -prefix $QT5DIR -platform $platform \
-reduce-relocations -reduce-exports $sizeopt \
$OPTS -v &&
make
diff --git a/qt5/qtbase/DEPENDS b/qt5/qtbase/DEPENDS
index 84cabeb..5a35ae9 100755
--- a/qt5/qtbase/DEPENDS
+++ b/qt5/qtbase/DEPENDS
@@ -1,3 +1,7 @@
+case "$HOST" in
+ (*-musl)
+ depends libexecinfo ;;
+esac &&
depends -sub CXX gcc &&
depends which &&
depends perl &&
diff --git a/qt5/qtbase/HISTORY b/qt5/qtbase/HISTORY
index 9647c40..7fbe172 100644
--- a/qt5/qtbase/HISTORY
+++ b/qt5/qtbase/HISTORY
@@ -1,3 +1,7 @@
+2022-03-17 Ismael Luceno <ismael AT sourcemage.org>
+ * BUILD, DEPENDS, PRE_BUILD: Fixed build against musl
+ on musl it depends on libexecinfo
+
2022-03-08 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5.15.3
* patches/0001-Fix-build-with-GCC-11-include-limits.patch: deleted
diff --git a/qt5/qtbase/PRE_BUILD b/qt5/qtbase/PRE_BUILD
index 7e018d5..d16d977 100755
--- a/qt5/qtbase/PRE_BUILD
+++ b/qt5/qtbase/PRE_BUILD
@@ -10,4 +10,14 @@ fi &&

default_pre_build &&
cd $SOURCE_DIRECTORY &&
+# Add musl mkspecs if not provided
+for i in linux-g++ linux-clang linux-clang-libc++; do
+ if ! [ -d mkspecs/"$i"-musl ]; then
+ message "Adding mkspec for: $i-musl"
+ cp -r mkspecs/"$i" mkspecs/"$i"-musl &&
+ sedit '/\/linux\.conf)$/{
+ aQMAKE_LIBS_EXECINFO = -lexecinfo
+ }' mkspecs/"$i"-musl/qmake.conf || exit 1
+ fi
+done &&
apply_patch_dir patches



  • [SM-Commit] GIT changes to master grimoire by Ismael Luceno (4c375521e49606f106db3543ab89dda4ee357a85), Ismael Luceno, 03/18/2022

Archive powered by MHonArc 2.6.24.

Top of Page