NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tcl: switch to * instead of [0-9]

Browse Source 
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>
This commit is contained in:
Vicente Olivert Riera 2016-03-30 17:14:07 +01:00 committed by Thomas Petazzoni
parent 198a7f1bbc
commit 28ccd4d514
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
package/tcl/tcl.mk
View File

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