From: Thorsten Scherer <thorsten.scherer@eckelmann.de>
To: ptxdist <ptxdist@pengutronix.de>
Subject: [ptxdist] qt4 with -system-sqlite
Date: Thu, 16 May 2019 15:24:29 +0200 [thread overview]
Message-ID: <20190516132429.GB7898@ws067.eckelmann.group> (raw)
Hello,
we had an issue compiling qt4 with sqlite provided by the system. The configure
option "-system-sqlite" wasn't appended.
I grepped through the git history and found:
ad4ffd4ad5f63110b68146d5b7a83e01cd445fa6 qt4: fix sqlite configure options
diff --git a/rules/qt4.make b/rules/qt4.make
index 4b5eafc7e..efeb016c5 100644
--- a/rules/qt4.make
+++ b/rules/qt4.make
@@ -206,8 +206,9 @@ QT4_AUTOCONF-$(call ptx/qt-no, BUILD_SCRIPT) += script
QT4_AUTOCONF-$(call ptx/qt-no, BUILD_DECLARATIVE) += declarative
QT4_AUTOCONF-$(call ptx/qt-plugin, SQLITE) += sql-sqlite
-QT4_AUTOCONF-$(call ptx/qt-system, SQLITE) += sqlite
-
+ifdef QT4_SQLITE_SYSTEM
+QT4_AUTOCONF += -system-sqlite
+endif
QT4_AUTOCONF-no := $(filter-out $(QT4_AUTOCONF-y),$(QT4_AUTOCONF-no))
After applying the following patch (which basically but not exactly reverts
the patch above), the qt4 configure options worked as expected.
diff --git a/rules/qt4.make b/rules/qt4.make
index 14d9a0556..75e54a246 100644
--- a/rules/qt4.make
+++ b/rules/qt4.make
@@ -206,6 +206,7 @@ QT4_AUTOCONF-$(call ptx/qt-system, TIFF) += libtiff
QT4_AUTOCONF-$(call ptx/qt-system, GIF) += gif
QT4_AUTOCONF-$(call ptx/qt-system, JPG) += libjpeg
QT4_AUTOCONF-$(call ptx/qt-system, ZLIB) += zlib
+QT4_AUTOCONF-$(call ptx/qt-system, SQLITE) += sqlite
QT4_AUTOCONF-$(call ptx/qt-system, FREETYPE) += freetype
ifdef PTXCONF_QT4_FREETYPE_SYSTEM
QT4_AUTOCONF += -I$(SYSROOT)/usr/include/freetype2
@@ -226,9 +227,6 @@ QT4_AUTOCONF-$(call ptx/qt-no, BUILD_SCRIPT) += script
QT4_AUTOCONF-$(call ptx/qt-no, BUILD_DECLARATIVE) += declarative
QT4_AUTOCONF-$(call ptx/qt-plugin, SQLITE) += sql-sqlite
-ifdef QT4_SQLITE_SYSTEM
-QT4_AUTOCONF += -system-sqlite
-endif
QT4_AUTOCONF-no := $(filter-out $(QT4_AUTOCONF-y),$(QT4_AUTOCONF-no))
The difference I can spot is qt-system being called before qt-plugin. So my
question is:
Is this patch really fixing the problem? (or might there any side effect I
am not aware of?)
Maybe anyone has time and patience to reproduce this.
Thanks a lot!
Best regards
Thorsten
--
Thorsten Scherer
Eckelmann AG - https://www.eckelmann.de
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
next reply other threads:[~2019-05-16 13:24 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-16 13:24 Thorsten Scherer [this message]
2019-05-17 14:21 ` Michael Olbrich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190516132429.GB7898@ws067.eckelmann.group \
--to=thorsten.scherer@eckelmann.de \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox