From 7a107279da1c8b441954ef4d59a9aa7ede0aa140 Mon Sep 17 00:00:00 2001 From: Ian Leonard Date: Tue, 19 Jan 2021 19:33:44 +0000 Subject: [PATCH] databases: automated code cleanup Signed-off-by: Ian Leonard --- packages/databases/mariadb-connector-c/package.mk | 4 ++-- packages/databases/sqlite/package.mk | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/databases/mariadb-connector-c/package.mk b/packages/databases/mariadb-connector-c/package.mk index 9e9e1d273c..020aab3d7c 100644 --- a/packages/databases/mariadb-connector-c/package.mk +++ b/packages/databases/mariadb-connector-c/package.mk @@ -6,7 +6,7 @@ PKG_VERSION="3.1.11" PKG_SHA256="2cd769afea447231588580234523121268eae7576f75a7bee25a7e6ec04282f8" PKG_LICENSE="LGPL" PKG_SITE="https://mariadb.org/" -PKG_URL="https://github.com/MariaDB/mariadb-connector-c/archive/v$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/MariaDB/mariadb-connector-c/archive/v${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain zlib openssl" PKG_LONGDESC="mariadb-connector: library to conntect to mariadb/mysql database server" PKG_BUILD_FLAGS="-gold" @@ -20,5 +20,5 @@ PKG_CMAKE_OPTS_TARGET="-DWITH_EXTERNAL_ZLIB=ON post_makeinstall_target() { # drop all unneeded - rm -rf $INSTALL/usr + rm -rf ${INSTALL}/usr } diff --git a/packages/databases/sqlite/package.mk b/packages/databases/sqlite/package.mk index 55178cceaf..15c78baa5d 100644 --- a/packages/databases/sqlite/package.mk +++ b/packages/databases/sqlite/package.mk @@ -23,15 +23,15 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-static \ pre_configure_target() { # sqlite fails to compile with fast-math link time optimization. - CFLAGS=`echo $CFLAGS | sed -e "s|-Ofast|-O3|g"` - CFLAGS=`echo $CFLAGS | sed -e "s|-ffast-math||g"` + CFLAGS=$(echo ${CFLAGS} | sed -e "s|-Ofast|-O3|g") + CFLAGS=$(echo ${CFLAGS} | sed -e "s|-ffast-math||g") # This option adds additional logic to the ANALYZE command and to the query planner # that can help SQLite to chose a better query plan under certain situations. The # ANALYZE command is enhanced to collect histogram data from each index and store # that data in the sqlite_stat4 table. The query planner will then use the histogram # data to help it make better index choices. - CFLAGS="$CFLAGS -DSQLITE_ENABLE_STAT4" + CFLAGS+=" -DSQLITE_ENABLE_STAT4" # When this C-preprocessor macro is defined, SQLite includes some additional APIs # that provide convenient access to meta-data about tables and queries. The APIs that @@ -43,7 +43,7 @@ pre_configure_target() { # - sqlite3_column_origin_name() # - sqlite3_column_origin_name16() # - sqlite3_table_column_metadata() - CFLAGS="$CFLAGS -DSQLITE_ENABLE_COLUMN_METADATA=1" + CFLAGS+=" -DSQLITE_ENABLE_COLUMN_METADATA=1" # This macro sets the default limit on the amount of memory that will be used for # memory-mapped I/O for each open database file. If the N is zero, then memory @@ -51,5 +51,5 @@ pre_configure_target() { # SQLITE_MAX_MMAP_SIZE can be modified at start-time using the # sqlite3_config(SQLITE_CONFIG_MMAP_SIZE) call, or at run-time using the # mmap_size pragma. - CFLAGS="$CFLAGS -DSQLITE_TEMP_STORE=3 -DSQLITE_DEFAULT_MMAP_SIZE=268435456" + CFLAGS+=" -DSQLITE_TEMP_STORE=3 -DSQLITE_DEFAULT_MMAP_SIZE=268435456" }