aboutsummaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
authorGravatar Vicente Olivert Riera <Vincent.Riera@imgtec.com>2016-03-30 17:14:07 +0100
committerGravatar Thomas Petazzoni <thomas.petazzoni@free-electrons.com>2016-03-30 19:26:57 +0200
commit28ccd4d514e5fe7ceca8a4925c241f649890fa69 (patch)
tree867ac08776213d53c09828133af4ed2f0ed22628 /package
parent198a7f1bbcd2449516471a7deed72e2e8a7335f2 (diff)
downloadbuildroot-28ccd4d514e5fe7ceca8a4925c241f649890fa69.tar.gz
buildroot-28ccd4d514e5fe7ceca8a4925c241f649890fa69.tar.bz2
tcl: switch to * instead of [0-9]
Those [0-9] expressions are needlessly complex, and they actually no longer work now that sqlite3.11.0 is bundled internally (11 is two digits, which was accounted for). Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package')
-rw-r--r--package/tcl/tcl.mk19
1 files changed, 7 insertions, 12 deletions
diff --git a/package/tcl/tcl.mk b/package/tcl/tcl.mk
index 9fd11954c6..10a37c303f 100644
--- a/package/tcl/tcl.mk
+++ b/package/tcl/tcl.mk
@@ -32,21 +32,16 @@ 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