mirror of
https://github.com/motioneye-project/motioneyeos.git
synced 2025-08-06 18:07:43 +00:00
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>
This commit is contained in:
parent
198a7f1bbc
commit
28ccd4d514
@ -32,21 +32,16 @@ HOST_TCL_CONF_OPTS = \
|
|||||||
# I haven't found a good way to force pkgs to not build
|
# I haven't found a good way to force pkgs to not build
|
||||||
# or configure without just removing the entire pkg directory.
|
# or configure without just removing the entire pkg directory.
|
||||||
define HOST_TCL_REMOVE_PACKAGES
|
define HOST_TCL_REMOVE_PACKAGES
|
||||||
rm -fr $(@D)/pkgs/sqlite[0-9].[0-9].[0-9] \
|
rm -fr $(@D)/pkgs/sqlite3* $(@D)/pkgs/tdbc*
|
||||||
$(@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]
|
|
||||||
endef
|
endef
|
||||||
HOST_TCL_PRE_CONFIGURE_HOOKS += HOST_TCL_REMOVE_PACKAGES
|
HOST_TCL_PRE_CONFIGURE_HOOKS += HOST_TCL_REMOVE_PACKAGES
|
||||||
define TCL_REMOVE_PACKAGES
|
define TCL_REMOVE_PACKAGES
|
||||||
rm -fr $(if $(BR2_PACKAGE_SQLITE),,$(@D)/pkgs/sqlite[0-9].[0-9].[0-9]) \
|
rm -fr $(if $(BR2_PACKAGE_SQLITE),,$(@D)/pkgs/sqlite3*) \
|
||||||
$(if $(BR2_PACKAGE_SQLITE),,$(@D)/pkgs/tdbc[0-9].[0-9].[0-9]) \
|
$(if $(BR2_PACKAGE_SQLITE),,$(@D)/pkgs/tdbc1*) \
|
||||||
$(@D)/pkgs/tdbcmysql[0-9].[0-9].[0-9] \
|
$(@D)/pkgs/tdbcmysql* \
|
||||||
$(@D)/pkgs/tdbcodbc[0-9].[0-9].[0-9] \
|
$(@D)/pkgs/tdbcodbc* \
|
||||||
$(@D)/pkgs/tdbcpostgres[0-9].[0-9].[0-9] \
|
$(@D)/pkgs/tdbcpostgres* \
|
||||||
$(if $(BR2_PACKAGE_SQLITE),,$(@D)/pkgs/tdbcsqlite3-[0-9].[0-9].[0-9])
|
$(if $(BR2_PACKAGE_SQLITE),,$(@D)/pkgs/tdbcsqlite3*)
|
||||||
endef
|
endef
|
||||||
TCL_PRE_CONFIGURE_HOOKS += TCL_REMOVE_PACKAGES
|
TCL_PRE_CONFIGURE_HOOKS += TCL_REMOVE_PACKAGES
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user