tcl: rework logic for databases support

Hello,

package/tcl/tcl.mk HOST_TCL_CONF_OPTS = \ · line 33

Quoted 9 lines · Vicente Olivert Riera

package/tcl/tcl.mk +1 -1

@@ -32,7 +27,7 @@ HOST_TCL_CONF_OPTS = \
 # I haven't found a good way to force pkgs to not build
 # or configure without just removing the entire pkg directory.
 define HOST_TCL_REMOVE_PACKAGES
-	rm -fr $(@D)/pkgs/sqlite[0-9].[0-9].[0-9] \
+	rm -fr $(@D)/pkgs/sqlite[0-9].[0-9][0-9].[0-9] \
 		$(@D)/pkgs/tdbc[0-9].[0-9].[0-9] \
 		$(@D)/pkgs/tdbcmysql[0-9].[0-9].[0-9] \
 		$(@D)/pkgs/tdbcodbc[0-9].[0-9].[0-9] \

Could we switch to using * instead of this silly [0-9] thing? So:

	rm -rf $(@D)/pkgs/sqlite* $(@D)/pkgs/tdbc* ...

Quoted 9 lines

package/tcl/tcl.mk +2 -3

@@ -41,11 +36,10 @@ define HOST_TCL_REMOVE_PACKAGES
 endef
 HOST_TCL_PRE_CONFIGURE_HOOKS += HOST_TCL_REMOVE_PACKAGES
 define TCL_REMOVE_PACKAGES
-	rm -fr $(if $(BR2_PACKAGE_SQLITE),,$(@D)/pkgs/sqlite[0-9].[0-9].[0-9]) \
-		$(if $(BR2_PACKAGE_SQLITE),,$(@D)/pkgs/tdbc[0-9].[0-9].[0-9]) \
-		$(@D)/pkgs/tdbcmysql[0-9].[0-9].[0-9] \
+	rm -fr $(@D)/pkgs/sqlite[0-9].[0-9][0-9].[0-9] \
+		$(if $(BR2_PACKAGE_MYSQL),,$(@D)/pkgs/tdbcmysql[0-9].[0-9].[0-9]) \

package/tcl/tcl.mk define HOST_TCL_REMOVE_PACKAGES · line 43

Quoted 4 lines

package/tcl/tcl.mk +1 -1

 		$(@D)/pkgs/tdbcodbc[0-9].[0-9].[0-9] \
-		$(@D)/pkgs/tdbcpostgres[0-9].[0-9].[0-9] \
+		$(if $(BR2_PACKAGE_POSTGRESQL),,$(@D)/pkgs/tdbcpostgres[0-9].[0-9].[0-9]) \
 		$(if $(BR2_PACKAGE_SQLITE),,$(@D)/pkgs/tdbcsqlite3-[0-9].[0-9].[0-9])

OK, I think this would need a comment above to explain what's going on, it's not trivial to understand why you're removing sqlite and tdbcodbc unconditionally, and tdbcpostgresq/tdbcsqlite conditionally.

package/tcl/tcl.mk endef · line 80

Quoted 9 lines

package/tcl/tcl.mk +2 -0

 endef
 TCL_PRE_CONFIGURE_HOOKS += TCL_REMOVE_PACKAGES

@@ -82,6 +76,8 @@ endef
 TCL_POST_INSTALL_TARGET_HOOKS += TCL_REMOVE_EXTRA
 
 TCL_DEPENDENCIES = $(if $(BR2_PACKAGE_SQLITE),sqlite)
+TCL_DEPENDENCIES += $(if $(BR2_PACKAGE_MYSQL),mysql)
+TCL_DEPENDENCIES += $(if $(BR2_PACKAGE_POSTGRESQL),postgresql)

TCL_DEPENDENCIES = \
	$(if ...) \
	$(if ...)

Would be nicer.

Maybe this calls for three patches:

1/ Switch to * instead of [0-9]
2/ Fix the sqlite usage
3/ Enable postgresql/mysql usage

Thanks!

Thomas

We remove sqlite unconditionally because we don't want to use the bundled version.

For tdbcodbc I don't have any particular reason to remove it or keep it. What do you prefer?

Hello,

Quoted 2 lines · Vicente Olivert Riera

We remove sqlite unconditionally because we don't want to use the bundled version.

Yes, explain this in a comment :)

Quoted 2 lines

For tdbcodbc I don't have any particular reason to remove it or keep it. What do you prefer?

If it was already removed before your patch, keep it this way.

Thanks!

Thomas

Hi Thomas,

Quoted 3 lines · Thomas Petazzoni

Hello,

On Wed, 30 Mar 2016 16:21:22 +0100, Vicente Olivert Riera wrote:

Quoted 8 lines

package/tcl/tcl.mk endef · line 80

Quoted 3 lines

  TCL_DEPENDENCIES = $(if $(BR2_PACKAGE_SQLITE),sqlite)

package/tcl/tcl.mk +2 -0

+TCL_DEPENDENCIES += $(if $(BR2_PACKAGE_MYSQL),mysql)
+TCL_DEPENDENCIES += $(if $(BR2_PACKAGE_POSTGRESQL),postgresql)

TCL_DEPENDENCIES = \
	$(if ...) \
	$(if ...)

Quoted 1 line

Would be nicer.

That was my first approach and I didn't look nicer to me, so I changed it :P Anyway, if you prefer that way, I'll do it that way, no problem.

Quoted 2 lines

That was my first approach and I didn't look nicer to me, so I changed it :P Anyway, if you prefer that way, I'll do it that way, no problem.

Like you, Vincent, I also prefer TCL_DEPENDENCIES to be repeated.

- You don't need to move your eyes to see which variable is affected.
- When adding/removing a dependency, you don't have to worry about the backslashes.

I do prefer in this case that all assignments, including the first one, have +=

Hello,

Quoted 7 lines · Arnout Vandecappelle

Quoted 2 lines

That was my first approach and I didn't look nicer to me, so I changed it :P Anyway, if you prefer that way, I'll do it that way, no problem.

Like you, Vincent, I also prefer TCL_DEPENDENCIES to be repeated.

- You don't need to move your eyes to see which variable is affected.
- When adding/removing a dependency, you don't have to worry about the

backslashes.

Quoted 3 lines

I do prefer in this case that all assignments, including the first one,

have +=

Matter of taste, I guess. But if I follow your thought, then we should do:

LIBGTK3_CONF_OPTS += --disable-glibtest
LIBGTK3_CONF_OPTS += --enable-explicit-deps=no
LIBGTK3_CONF_OPTS += --enable-gtk2-dependency
LIBGTK3_CONF_OPTS += --disable-introspection

I think this is really verbose, but again a matter of taste.