* [Buildroot] [PATCH 1/4] tcl: switch to * instead of [0-9]
@ 2016-03-30 16:14 Vicente Olivert Riera
2016-03-30 16:14 ` [Buildroot] [PATCH 2/4] tcl: fix sqlite usage Vicente Olivert Riera
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Vicente Olivert Riera @ 2016-03-30 16:14 UTC (permalink / raw)
To: buildroot
Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
---
package/tcl/tcl.mk | 20 ++++++++------------
1 file changed, 8 insertions(+), 12 deletions(-)
diff --git a/package/tcl/tcl.mk b/package/tcl/tcl.mk
index 9fd1195..edf939b 100644
--- a/package/tcl/tcl.mk
+++ b/package/tcl/tcl.mk
@@ -32,21 +32,17 @@ 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] \
- $(@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] \
- $(@D)/pkgs/tdbcpostgres[0-9].[0-9].[0-9] \
- $(@D)/pkgs/tdbcsqlite3-[0-9].[0-9].[0-9]
+ rm -fr $(@D)/pkgs/sqlite3* \
+ $(@D)/pkgs/tdbc*
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] \
- $(@D)/pkgs/tdbcodbc[0-9].[0-9].[0-9] \
- $(@D)/pkgs/tdbcpostgres[0-9].[0-9].[0-9] \
- $(if $(BR2_PACKAGE_SQLITE),,$(@D)/pkgs/tdbcsqlite3-[0-9].[0-9].[0-9])
+ rm -fr $(if $(BR2_PACKAGE_SQLITE),,$(@D)/pkgs/sqlite3*) \
+ $(if $(BR2_PACKAGE_SQLITE),,$(@D)/pkgs/tdbc1*) \
+ $(@D)/pkgs/tdbcmysql* \
+ $(@D)/pkgs/tdbcodbc* \
+ $(@D)/pkgs/tdbcpostgres* \
+ $(if $(BR2_PACKAGE_SQLITE),,$(@D)/pkgs/tdbcsqlite3*)
endef
TCL_PRE_CONFIGURE_HOOKS += TCL_REMOVE_PACKAGES
--
2.7.3
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH 2/4] tcl: fix sqlite usage
2016-03-30 16:14 [Buildroot] [PATCH 1/4] tcl: switch to * instead of [0-9] Vicente Olivert Riera
@ 2016-03-30 16:14 ` Vicente Olivert Riera
2016-03-30 16:14 ` [Buildroot] [PATCH 3/4] tcl: enable mysql support Vicente Olivert Riera
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Vicente Olivert Riera @ 2016-03-30 16:14 UTC (permalink / raw)
To: buildroot
- Remove the bundled sqlite unconditionally.
- Remove the --with-system-sqlite option as is only valid for the
bundled sqlite configure script which we will no longer use.
- Do not remove TDBC when BR2_PACKAGE_SQLITE is not selected as it may
be used for other TDBC drivers such as MySQL or PostgreSQL.
Fixes:
http://autobuild.buildroot.net/results/022/02296f8624d3406a63d3a179f53862f245c56dc1/
Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
---
package/tcl/tcl.mk | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/package/tcl/tcl.mk b/package/tcl/tcl.mk
index edf939b..7c2cb47 100644
--- a/package/tcl/tcl.mk
+++ b/package/tcl/tcl.mk
@@ -14,15 +14,10 @@ TCL_SUBDIR = unix
TCL_INSTALL_STAGING = YES
TCL_AUTORECONF = YES
-# Note that --with-system-sqlite will only make a difference
-# in the sqlite package (which gets removed if sqlite not
-# configured). Don't need to worry about conditionally including
-# it in the configure options
TCL_CONF_OPTS = \
--disable-symbols \
--disable-langinfo \
- --disable-framework \
- --with-system-sqlite
+ --disable-framework
HOST_TCL_CONF_OPTS = \
--disable-symbols \
@@ -36,9 +31,10 @@ define HOST_TCL_REMOVE_PACKAGES
$(@D)/pkgs/tdbc*
endef
HOST_TCL_PRE_CONFIGURE_HOOKS += HOST_TCL_REMOVE_PACKAGES
+
+# We remove the bundled sqlite as we prefer to not use bundled stuff at all.
define TCL_REMOVE_PACKAGES
- rm -fr $(if $(BR2_PACKAGE_SQLITE),,$(@D)/pkgs/sqlite3*) \
- $(if $(BR2_PACKAGE_SQLITE),,$(@D)/pkgs/tdbc1*) \
+ rm -fr $(@D)/pkgs/sqlite3* \
$(@D)/pkgs/tdbcmysql* \
$(@D)/pkgs/tdbcodbc* \
$(@D)/pkgs/tdbcpostgres* \
--
2.7.3
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH 3/4] tcl: enable mysql support
2016-03-30 16:14 [Buildroot] [PATCH 1/4] tcl: switch to * instead of [0-9] Vicente Olivert Riera
2016-03-30 16:14 ` [Buildroot] [PATCH 2/4] tcl: fix sqlite usage Vicente Olivert Riera
@ 2016-03-30 16:14 ` Vicente Olivert Riera
2016-03-30 16:14 ` [Buildroot] [PATCH 4/4] tcl: enable postgresql support Vicente Olivert Riera
2016-03-30 17:37 ` [Buildroot] [PATCH 1/4] tcl: switch to * instead of [0-9] Thomas Petazzoni
3 siblings, 0 replies; 5+ messages in thread
From: Vicente Olivert Riera @ 2016-03-30 16:14 UTC (permalink / raw)
To: buildroot
Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
---
package/tcl/tcl.mk | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/package/tcl/tcl.mk b/package/tcl/tcl.mk
index 7c2cb47..0ce6b9f 100644
--- a/package/tcl/tcl.mk
+++ b/package/tcl/tcl.mk
@@ -35,7 +35,7 @@ HOST_TCL_PRE_CONFIGURE_HOOKS += HOST_TCL_REMOVE_PACKAGES
# We remove the bundled sqlite as we prefer to not use bundled stuff at all.
define TCL_REMOVE_PACKAGES
rm -fr $(@D)/pkgs/sqlite3* \
- $(@D)/pkgs/tdbcmysql* \
+ $(if $(BR2_PACKAGE_MYSQL),,$(@D)/pkgs/tdbcmysql*) \
$(@D)/pkgs/tdbcodbc* \
$(@D)/pkgs/tdbcpostgres* \
$(if $(BR2_PACKAGE_SQLITE),,$(@D)/pkgs/tdbcsqlite3*)
@@ -73,7 +73,8 @@ define TCL_REMOVE_EXTRA
endef
TCL_POST_INSTALL_TARGET_HOOKS += TCL_REMOVE_EXTRA
-TCL_DEPENDENCIES = $(if $(BR2_PACKAGE_SQLITE),sqlite)
+TCL_DEPENDENCIES = $(if $(BR2_PACKAGE_SQLITE),sqlite) \
+ $(if $(BR2_PACKAGE_MYSQL),mysql)
HOST_TCL_DEPENDENCIES =
$(eval $(autotools-package))
--
2.7.3
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH 4/4] tcl: enable postgresql support
2016-03-30 16:14 [Buildroot] [PATCH 1/4] tcl: switch to * instead of [0-9] Vicente Olivert Riera
2016-03-30 16:14 ` [Buildroot] [PATCH 2/4] tcl: fix sqlite usage Vicente Olivert Riera
2016-03-30 16:14 ` [Buildroot] [PATCH 3/4] tcl: enable mysql support Vicente Olivert Riera
@ 2016-03-30 16:14 ` Vicente Olivert Riera
2016-03-30 17:37 ` [Buildroot] [PATCH 1/4] tcl: switch to * instead of [0-9] Thomas Petazzoni
3 siblings, 0 replies; 5+ messages in thread
From: Vicente Olivert Riera @ 2016-03-30 16:14 UTC (permalink / raw)
To: buildroot
Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
---
package/tcl/tcl.mk | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/package/tcl/tcl.mk b/package/tcl/tcl.mk
index 0ce6b9f..51dfbf3 100644
--- a/package/tcl/tcl.mk
+++ b/package/tcl/tcl.mk
@@ -37,7 +37,7 @@ define TCL_REMOVE_PACKAGES
rm -fr $(@D)/pkgs/sqlite3* \
$(if $(BR2_PACKAGE_MYSQL),,$(@D)/pkgs/tdbcmysql*) \
$(@D)/pkgs/tdbcodbc* \
- $(@D)/pkgs/tdbcpostgres* \
+ $(if $(BR2_PACKAGE_POSTGRESQL),,$(@D)/pkgs/tdbcpostgres*) \
$(if $(BR2_PACKAGE_SQLITE),,$(@D)/pkgs/tdbcsqlite3*)
endef
TCL_PRE_CONFIGURE_HOOKS += TCL_REMOVE_PACKAGES
@@ -74,7 +74,8 @@ endef
TCL_POST_INSTALL_TARGET_HOOKS += TCL_REMOVE_EXTRA
TCL_DEPENDENCIES = $(if $(BR2_PACKAGE_SQLITE),sqlite) \
- $(if $(BR2_PACKAGE_MYSQL),mysql)
+ $(if $(BR2_PACKAGE_MYSQL),mysql) \
+ $(if $(BR2_PACKAGE_POSTGRESQL),postgresql)
HOST_TCL_DEPENDENCIES =
$(eval $(autotools-package))
--
2.7.3
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH 1/4] tcl: switch to * instead of [0-9]
2016-03-30 16:14 [Buildroot] [PATCH 1/4] tcl: switch to * instead of [0-9] Vicente Olivert Riera
` (2 preceding siblings ...)
2016-03-30 16:14 ` [Buildroot] [PATCH 4/4] tcl: enable postgresql support Vicente Olivert Riera
@ 2016-03-30 17:37 ` Thomas Petazzoni
3 siblings, 0 replies; 5+ messages in thread
From: Thomas Petazzoni @ 2016-03-30 17:37 UTC (permalink / raw)
To: buildroot
Hello,
On Wed, 30 Mar 2016 17:14:07 +0100, Vicente Olivert Riera wrote:
> Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
> ---
> package/tcl/tcl.mk | 20 ++++++++------------
> 1 file changed, 8 insertions(+), 12 deletions(-)
All four patches applied, thanks! On this first patch, I've added a
real commit log to explain why we're doing this change.
Thanks!
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2016-03-30 17:37 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-03-30 16:14 [Buildroot] [PATCH 1/4] tcl: switch to * instead of [0-9] Vicente Olivert Riera
2016-03-30 16:14 ` [Buildroot] [PATCH 2/4] tcl: fix sqlite usage Vicente Olivert Riera
2016-03-30 16:14 ` [Buildroot] [PATCH 3/4] tcl: enable mysql support Vicente Olivert Riera
2016-03-30 16:14 ` [Buildroot] [PATCH 4/4] tcl: enable postgresql support Vicente Olivert Riera
2016-03-30 17:37 ` [Buildroot] [PATCH 1/4] tcl: switch to * instead of [0-9] Thomas Petazzoni
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox