[ptxdist] qt4 with -system-sqlite

[ptxdist] qt4 with -system-sqlite

[Thorsten Scherer]

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

Re: [ptxdist] qt4 with -system-sqlite

[Michael Olbrich]

Hi,

On Thu, May 16, 2019 at 03:24:29PM +0200, Thorsten Scherer wrote:
> 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                               

This was broken, because it adds a -no-sqlite when disabled. That option
does not exist.

> -
> +ifdef QT4_SQLITE_SYSTEM

This is also incorrect, because PTXCONF_ is missing:

ifdef PTXCONF_QT4_SQLITE_SYSTEM

should work. Can you verify that?

Michael

> +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

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de