From 3087041cd06ff773063bee102b45425fa5500ddf Mon Sep 17 00:00:00 2001
From: Ian Leonard <antonlacon@gmail.com>
Date: Tue, 19 Jan 2021 19:33:55 +0000
Subject: [PATCH] lang: automated code cleanup

Signed-off-by: Ian Leonard <antonlacon@gmail.com>
---
 packages/lang/Python3/package.mk              | 54 ++++++++---------
 .../lang/gcc-arm-aarch64-none-elf/package.mk  | 10 ++--
 .../gcc-arm-aarch64-none-linux-gnu/package.mk | 10 ++--
 .../package.mk                                | 10 ++--
 packages/lang/gcc-or1k-linux/package.mk       | 10 ++--
 packages/lang/gcc/package.mk                  | 60 +++++++++----------
 packages/lang/llvm/package.mk                 | 30 +++++-----
 7 files changed, 92 insertions(+), 92 deletions(-)

diff --git a/packages/lang/Python3/package.mk b/packages/lang/Python3/package.mk
index e2bf5e9d56..2f6b0acda3 100644
--- a/packages/lang/Python3/package.mk
+++ b/packages/lang/Python3/package.mk
@@ -7,7 +7,7 @@ PKG_VERSION="3.8.7"
 PKG_SHA256="ddcc1df16bb5b87aa42ec5d20a5b902f2d088caa269b28e01590f97a798ec50a"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.python.org/"
-PKG_URL="http://www.python.org/ftp/python/$PKG_VERSION/${PKG_NAME::-1}-$PKG_VERSION.tar.xz"
+PKG_URL="http://www.python.org/ftp/python/${PKG_VERSION}/${PKG_NAME::-1}-${PKG_VERSION}.tar.xz"
 PKG_DEPENDS_HOST="zlib:host bzip2:host libffi:host util-linux:host xz:host"
 PKG_DEPENDS_TARGET="toolchain Python3:host sqlite expat zlib bzip2 xz openssl libffi readline ncurses util-linux"
 PKG_LONGDESC="Python3 is an interpreted object-oriented programming language."
@@ -85,56 +85,56 @@ PKG_CONFIGURE_OPTS_TARGET="ac_cv_prog_HAS_HG=/bin/false
 "
 
 pre_configure_host() {
-  export PYTHON_MODULES_INCLUDE="$HOST_INCDIR"
-  export PYTHON_MODULES_LIB="$HOST_LIBDIR"
-  export DISABLED_EXTENSIONS="readline _curses _curses_panel $PKG_PY_DISABLED_MODULES"
+  export PYTHON_MODULES_INCLUDE="${HOST_INCDIR}"
+  export PYTHON_MODULES_LIB="${HOST_LIBDIR}"
+  export DISABLED_EXTENSIONS="readline _curses _curses_panel ${PKG_PY_DISABLED_MODULES}"
 }
 
 post_make_host() {
-  # python distutils per default adds -L$LIBDIR when linking binary extensions
-  sed -e "s|^ 'LIBDIR':.*| 'LIBDIR': '/usr/lib',|g" -i $(find $PKG_BUILD/.$HOST_NAME -not -path '*/__pycache__/*' -name '_sysconfigdata__*.py')
+  # python distutils per default adds -L${LIBDIR} when linking binary extensions
+  sed -e "s|^ 'LIBDIR':.*| 'LIBDIR': '/usr/lib',|g" -i $(find ${PKG_BUILD}/.${HOST_NAME} -not -path '*/__pycache__/*' -name '_sysconfigdata__*.py')
 }
 
 post_makeinstall_host() {
-  ln -sf $PKG_PYTHON_VERSION $TOOLCHAIN/bin/python
+  ln -sf ${PKG_PYTHON_VERSION} ${TOOLCHAIN}/bin/python
 
-  rm -f $TOOLCHAIN/bin/smtpd.py*
-  rm -f $TOOLCHAIN/bin/pyvenv
-  rm -f $TOOLCHAIN/bin/pydoc*
+  rm -f ${TOOLCHAIN}/bin/smtpd.py*
+  rm -f ${TOOLCHAIN}/bin/pyvenv
+  rm -f ${TOOLCHAIN}/bin/pydoc*
 
-  rm -fr $PKG_BUILD/.$HOST_NAME/build/temp.*
+  rm -fr ${PKG_BUILD}/.${HOST_NAME}/build/temp.*
 
-  cp $PKG_BUILD/Tools/scripts/reindent.py $TOOLCHAIN/lib/$PKG_PYTHON_VERSION
+  cp ${PKG_BUILD}/Tools/scripts/reindent.py ${TOOLCHAIN}/lib/${PKG_PYTHON_VERSION}
 }
 
 pre_configure_target() {
-  export PYTHON_MODULES_INCLUDE="$TARGET_INCDIR"
-  export PYTHON_MODULES_LIB="$TARGET_LIBDIR"
-  export DISABLED_EXTENSIONS="$PKG_PY_DISABLED_MODULES"
+  export PYTHON_MODULES_INCLUDE="${TARGET_INCDIR}"
+  export PYTHON_MODULES_LIB="${TARGET_LIBDIR}"
+  export DISABLED_EXTENSIONS="${PKG_PY_DISABLED_MODULES}"
 }
 
 post_makeinstall_target() {
-  ln -sf $PKG_PYTHON_VERSION $INSTALL/usr/bin/python
+  ln -sf ${PKG_PYTHON_VERSION} ${INSTALL}/usr/bin/python
 
-  rm -fr $PKG_BUILD/.$TARGET_NAME/build/temp.*
+  rm -fr ${PKG_BUILD}/.${TARGET_NAME}/build/temp.*
 
-  PKG_INSTALL_PATH_LIB=$INSTALL/usr/lib/$PKG_PYTHON_VERSION
+  PKG_INSTALL_PATH_LIB=${INSTALL}/usr/lib/${PKG_PYTHON_VERSION}
 
   for dir in config compiler sysconfigdata lib-dynload/sysconfigdata lib2to3/tests test; do
-    rm -rf $PKG_INSTALL_PATH_LIB/$dir
+    rm -rf ${PKG_INSTALL_PATH_LIB}/${dir}
   done
 
-  rm -rf $PKG_INSTALL_PATH_LIB/distutils/command/*.exe
+  rm -rf ${PKG_INSTALL_PATH_LIB}/distutils/command/*.exe
 
-  rm -rf $INSTALL/usr/bin/pyvenv
-  rm -rf $INSTALL/usr/bin/python*-config
-  rm -rf $INSTALL/usr/bin/smtpd.py $INSTALL/usr/bin/smtpd.py.*
+  rm -rf ${INSTALL}/usr/bin/pyvenv
+  rm -rf ${INSTALL}/usr/bin/python*-config
+  rm -rf ${INSTALL}/usr/bin/smtpd.py ${INSTALL}/usr/bin/smtpd.py.*
 
-  find $INSTALL -name '*.o' -delete
+  find ${INSTALL} -name '*.o' -delete
 
-  python_compile $PKG_INSTALL_PATH_LIB
+  python_compile ${PKG_INSTALL_PATH_LIB}
 
   # strip
-  chmod u+w $INSTALL/usr/lib/libpython*.so.*
-  debug_strip $INSTALL/usr
+  chmod u+w ${INSTALL}/usr/lib/libpython*.so.*
+  debug_strip ${INSTALL}/usr
 }
diff --git a/packages/lang/gcc-arm-aarch64-none-elf/package.mk b/packages/lang/gcc-arm-aarch64-none-elf/package.mk
index b3d396906e..fc74541c73 100644
--- a/packages/lang/gcc-arm-aarch64-none-elf/package.mk
+++ b/packages/lang/gcc-arm-aarch64-none-elf/package.mk
@@ -12,16 +12,16 @@ PKG_LONGDESC="ARM Aarch64 GNU Linux Binary Toolchain"
 PKG_TOOLCHAIN="manual"
 
 makeinstall_host() {
-  mkdir -p $TOOLCHAIN/lib/gcc-arm-aarch64-none-elf/
-    cp -a * $TOOLCHAIN/lib/gcc-arm-aarch64-none-elf
+  mkdir -p ${TOOLCHAIN}/lib/gcc-arm-aarch64-none-elf/
+    cp -a * ${TOOLCHAIN}/lib/gcc-arm-aarch64-none-elf
 
   # wrap gcc and g++ with ccache like in gcc package.mk
-  PKG_GCC_PREFIX="$TOOLCHAIN/lib/gcc-arm-aarch64-none-elf/bin/aarch64-none-elf-"
+  PKG_GCC_PREFIX="${TOOLCHAIN}/lib/gcc-arm-aarch64-none-elf/bin/aarch64-none-elf-"
 
   cp "${PKG_GCC_PREFIX}gcc" "${PKG_GCC_PREFIX}gcc.real"
 cat > "${PKG_GCC_PREFIX}gcc" << EOF
 #!/bin/sh
-$TOOLCHAIN/bin/ccache ${PKG_GCC_PREFIX}gcc.real "\$@"
+${TOOLCHAIN}/bin/ccache ${PKG_GCC_PREFIX}gcc.real "\$@"
 EOF
 
   chmod +x "${PKG_GCC_PREFIX}gcc"
@@ -29,7 +29,7 @@ EOF
   cp "${PKG_GCC_PREFIX}g++" "${PKG_GCC_PREFIX}g++.real"
 cat > "${PKG_GCC_PREFIX}g++" << EOF
 #!/bin/sh
-$TOOLCHAIN/bin/ccache ${PKG_GCC_PREFIX}g++.real "\$@"
+${TOOLCHAIN}/bin/ccache ${PKG_GCC_PREFIX}g++.real "\$@"
 EOF
 
   chmod +x "${PKG_GCC_PREFIX}g++"
diff --git a/packages/lang/gcc-arm-aarch64-none-linux-gnu/package.mk b/packages/lang/gcc-arm-aarch64-none-linux-gnu/package.mk
index e8d85f1030..3c555809a4 100644
--- a/packages/lang/gcc-arm-aarch64-none-linux-gnu/package.mk
+++ b/packages/lang/gcc-arm-aarch64-none-linux-gnu/package.mk
@@ -12,16 +12,16 @@ PKG_LONGDESC="ARM Aarch64 GNU Linux Binary Toolchain"
 PKG_TOOLCHAIN="manual"
 
 makeinstall_host() {
-  mkdir -p $TOOLCHAIN/lib/gcc-arm-aarch64-none-linux-gnu/
-    cp -a * $TOOLCHAIN/lib/gcc-arm-aarch64-none-linux-gnu
+  mkdir -p ${TOOLCHAIN}/lib/gcc-arm-aarch64-none-linux-gnu/
+    cp -a * ${TOOLCHAIN}/lib/gcc-arm-aarch64-none-linux-gnu
 
   # wrap gcc and g++ with ccache like in gcc package.mk
-  PKG_GCC_PREFIX="$TOOLCHAIN/lib/gcc-arm-aarch64-none-linux-gnu/bin/aarch64-none-linux-gnu-"
+  PKG_GCC_PREFIX="${TOOLCHAIN}/lib/gcc-arm-aarch64-none-linux-gnu/bin/aarch64-none-linux-gnu-"
 
   cp "${PKG_GCC_PREFIX}gcc" "${PKG_GCC_PREFIX}gcc.real"
 cat > "${PKG_GCC_PREFIX}gcc" << EOF
 #!/bin/sh
-$TOOLCHAIN/bin/ccache ${PKG_GCC_PREFIX}gcc.real "\$@"
+${TOOLCHAIN}/bin/ccache ${PKG_GCC_PREFIX}gcc.real "\$@"
 EOF
 
   chmod +x "${PKG_GCC_PREFIX}gcc"
@@ -29,7 +29,7 @@ EOF
   cp "${PKG_GCC_PREFIX}g++" "${PKG_GCC_PREFIX}g++.real"
 cat > "${PKG_GCC_PREFIX}g++" << EOF
 #!/bin/sh
-$TOOLCHAIN/bin/ccache ${PKG_GCC_PREFIX}g++.real "\$@"
+${TOOLCHAIN}/bin/ccache ${PKG_GCC_PREFIX}g++.real "\$@"
 EOF
 
   chmod +x "${PKG_GCC_PREFIX}g++"
diff --git a/packages/lang/gcc-arm-arm-none-linux-gnueabihf/package.mk b/packages/lang/gcc-arm-arm-none-linux-gnueabihf/package.mk
index 40a20b403c..83edbc73d8 100644
--- a/packages/lang/gcc-arm-arm-none-linux-gnueabihf/package.mk
+++ b/packages/lang/gcc-arm-arm-none-linux-gnueabihf/package.mk
@@ -12,16 +12,16 @@ PKG_LONGDESC="ARM AArch32 GNU Linux Binary Toolchain"
 PKG_TOOLCHAIN="manual"
 
 makeinstall_host() {
-  mkdir -p $TOOLCHAIN/lib/gcc-arm-arm-none-linux-gnueabihf/
-    cp -a * $TOOLCHAIN/lib/gcc-arm-arm-none-linux-gnueabihf
+  mkdir -p ${TOOLCHAIN}/lib/gcc-arm-arm-none-linux-gnueabihf/
+    cp -a * ${TOOLCHAIN}/lib/gcc-arm-arm-none-linux-gnueabihf
 
   # wrap gcc and g++ with ccache like in gcc package.mk
-  PKG_GCC_PREFIX="$TOOLCHAIN/lib/gcc-arm-arm-none-linux-gnueabihf/bin/arm-none-linux-gnueabihf-"
+  PKG_GCC_PREFIX="${TOOLCHAIN}/lib/gcc-arm-arm-none-linux-gnueabihf/bin/arm-none-linux-gnueabihf-"
 
   cp "${PKG_GCC_PREFIX}gcc" "${PKG_GCC_PREFIX}gcc.real"
 cat > "${PKG_GCC_PREFIX}gcc" << EOF
 #!/bin/sh
-$TOOLCHAIN/bin/ccache ${PKG_GCC_PREFIX}gcc.real "\$@"
+${TOOLCHAIN}/bin/ccache ${PKG_GCC_PREFIX}gcc.real "\$@"
 EOF
 
   chmod +x "${PKG_GCC_PREFIX}gcc"
@@ -29,7 +29,7 @@ EOF
   cp "${PKG_GCC_PREFIX}g++" "${PKG_GCC_PREFIX}g++.real"
 cat > "${PKG_GCC_PREFIX}g++" << EOF
 #!/bin/sh
-$TOOLCHAIN/bin/ccache ${PKG_GCC_PREFIX}g++.real "\$@"
+${TOOLCHAIN}/bin/ccache ${PKG_GCC_PREFIX}g++.real "\$@"
 EOF
 
   chmod +x "${PKG_GCC_PREFIX}g++"
diff --git a/packages/lang/gcc-or1k-linux/package.mk b/packages/lang/gcc-or1k-linux/package.mk
index fa0f7ca9df..149a15a26e 100644
--- a/packages/lang/gcc-or1k-linux/package.mk
+++ b/packages/lang/gcc-or1k-linux/package.mk
@@ -12,16 +12,16 @@ PKG_LONGDESC="OpenRISC 1000 GNU Linux Binary Toolchain"
 PKG_TOOLCHAIN="manual"
 
 makeinstall_host() {
-  mkdir -p $TOOLCHAIN/lib/gcc-or1k-linux/
-    cp -a * $TOOLCHAIN/lib/gcc-or1k-linux
+  mkdir -p ${TOOLCHAIN}/lib/gcc-or1k-linux/
+    cp -a * ${TOOLCHAIN}/lib/gcc-or1k-linux
 
   # wrap gcc and g++ with ccache like in gcc package.mk
-  PKG_GCC_PREFIX="$TOOLCHAIN/lib/gcc-or1k-linux/bin/or1k-linux-"
+  PKG_GCC_PREFIX="${TOOLCHAIN}/lib/gcc-or1k-linux/bin/or1k-linux-"
 
   rm -f "${PKG_GCC_PREFIX}gcc"
 cat > "${PKG_GCC_PREFIX}gcc" << EOF
 #!/bin/sh
-$TOOLCHAIN/bin/ccache $TOOLCHAIN/lib/gcc-or1k-linux/bin/or1k-buildroot-linux-musl-gcc "\$@"
+${TOOLCHAIN}/bin/ccache ${TOOLCHAIN}/lib/gcc-or1k-linux/bin/or1k-buildroot-linux-musl-gcc "\$@"
 EOF
 
   chmod +x "${PKG_GCC_PREFIX}gcc"
@@ -29,7 +29,7 @@ EOF
   rm -f "${PKG_GCC_PREFIX}g++"
 cat > "${PKG_GCC_PREFIX}g++" << EOF
 #!/bin/sh
-$TOOLCHAIN/bin/ccache $TOOLCHAIN/lib/gcc-or1k-linux/bin/or1k-buildroot-linux-musl-g++ "\$@"
+${TOOLCHAIN}/bin/ccache ${TOOLCHAIN}/lib/gcc-or1k-linux/bin/or1k-buildroot-linux-musl-g++ "\$@"
 EOF
 
   chmod +x "${PKG_GCC_PREFIX}g++"
diff --git a/packages/lang/gcc/package.mk b/packages/lang/gcc/package.mk
index ece284298e..77f049c553 100644
--- a/packages/lang/gcc/package.mk
+++ b/packages/lang/gcc/package.mk
@@ -7,19 +7,19 @@ PKG_VERSION="10.2.0"
 PKG_SHA256="b8dd4368bb9c7f0b98188317ee0254dd8cc99d1e3a18d0ff146c855fe16c1d8c"
 PKG_LICENSE="GPL"
 PKG_SITE="http://gcc.gnu.org/"
-PKG_URL="http://ftpmirror.gnu.org/gcc/$PKG_NAME-$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_URL="http://ftpmirror.gnu.org/gcc/${PKG_NAME}-${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.xz"
 PKG_DEPENDS_BOOTSTRAP="ccache:host autoconf:host binutils:host gmp:host mpfr:host mpc:host zstd:host"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_DEPENDS_HOST="ccache:host autoconf:host binutils:host gmp:host mpfr:host mpc:host zstd:host glibc"
 PKG_DEPENDS_INIT="toolchain"
 PKG_LONGDESC="This package contains the GNU Compiler Collection."
 
-GCC_COMMON_CONFIGURE_OPTS="--target=$TARGET_NAME \
-                           --with-sysroot=$SYSROOT_PREFIX \
-                           --with-gmp=$TOOLCHAIN \
-                           --with-mpfr=$TOOLCHAIN \
-                           --with-mpc=$TOOLCHAIN \
-                           --with-zstd=$TOOLCHAIN \
+GCC_COMMON_CONFIGURE_OPTS="--target=${TARGET_NAME} \
+                           --with-sysroot=${SYSROOT_PREFIX} \
+                           --with-gmp=${TOOLCHAIN} \
+                           --with-mpfr=${TOOLCHAIN} \
+                           --with-mpc=${TOOLCHAIN} \
+                           --with-zstd=${TOOLCHAIN} \
                            --with-gnu-as \
                            --with-gnu-ld \
                            --enable-plugin \
@@ -43,7 +43,7 @@ GCC_COMMON_CONFIGURE_OPTS="--target=$TARGET_NAME \
                            --disable-libssp \
                            --enable-__cxa_atexit"
 
-PKG_CONFIGURE_OPTS_BOOTSTRAP="$GCC_COMMON_CONFIGURE_OPTS \
+PKG_CONFIGURE_OPTS_BOOTSTRAP="${GCC_COMMON_CONFIGURE_OPTS} \
                               --enable-languages=c \
                               --disable-libsanitizer \
                               --enable-cloog-backend=isl \
@@ -52,9 +52,9 @@ PKG_CONFIGURE_OPTS_BOOTSTRAP="$GCC_COMMON_CONFIGURE_OPTS \
                               --without-headers \
                               --with-newlib \
                               --disable-decimal-float \
-                              $GCC_OPTS"
+                              ${GCC_OPTS}"
 
-PKG_CONFIGURE_OPTS_HOST="$GCC_COMMON_CONFIGURE_OPTS \
+PKG_CONFIGURE_OPTS_HOST="${GCC_COMMON_CONFIGURE_OPTS} \
                          --enable-languages=c,c++ \
                          --enable-decimal-float \
                          --enable-tls \
@@ -66,7 +66,7 @@ PKG_CONFIGURE_OPTS_HOST="$GCC_COMMON_CONFIGURE_OPTS \
                          --disable-libstdcxx-pch \
                          --enable-libstdcxx-time \
                          --enable-clocale=gnu \
-                         $GCC_OPTS"
+                         ${GCC_OPTS}"
 
 pre_configure_host() {
   unset CPP
@@ -74,20 +74,20 @@ pre_configure_host() {
 
 post_make_host() {
   # fix wrong link
-  rm -rf $TARGET_NAME/libgcc/libgcc_s.so
-  ln -sf libgcc_s.so.1 $TARGET_NAME/libgcc/libgcc_s.so
+  rm -rf ${TARGET_NAME}/libgcc/libgcc_s.so
+  ln -sf libgcc_s.so.1 ${TARGET_NAME}/libgcc/libgcc_s.so
 
   if [ ! "${BUILD_WITH_DEBUG}" = "yes" ]; then
-    ${TARGET_PREFIX}strip $TARGET_NAME/libgcc/libgcc_s.so*
-    ${TARGET_PREFIX}strip $TARGET_NAME/libstdc++-v3/src/.libs/libstdc++.so*
+    ${TARGET_PREFIX}strip ${TARGET_NAME}/libgcc/libgcc_s.so*
+    ${TARGET_PREFIX}strip ${TARGET_NAME}/libstdc++-v3/src/.libs/libstdc++.so*
   fi
 }
 
 post_makeinstall_host() {
-  cp -PR $TARGET_NAME/libstdc++-v3/src/.libs/libstdc++.so* $SYSROOT_PREFIX/usr/lib
+  cp -PR ${TARGET_NAME}/libstdc++-v3/src/.libs/libstdc++.so* ${SYSROOT_PREFIX}/usr/lib
 
-  GCC_VERSION=`$TOOLCHAIN/bin/${TARGET_NAME}-gcc -dumpversion`
-  DATE="0501`echo $GCC_VERSION | sed 's/\./0/g'`"
+  GCC_VERSION=$(${TOOLCHAIN}/bin/${TARGET_NAME}-gcc -dumpversion)
+  DATE="0501$(echo ${GCC_VERSION} | sed 's/\./0/g')"
   CROSS_CC=${TARGET_PREFIX}gcc-${GCC_VERSION}
   CROSS_CXX=${TARGET_PREFIX}g++-${GCC_VERSION}
 
@@ -95,29 +95,29 @@ post_makeinstall_host() {
 
 cat > ${TARGET_PREFIX}gcc <<EOF
 #!/bin/sh
-$TOOLCHAIN/bin/ccache $CROSS_CC "\$@"
+${TOOLCHAIN}/bin/ccache ${CROSS_CC} "\$@"
 EOF
 
   chmod +x ${TARGET_PREFIX}gcc
 
   # To avoid cache trashing
-  touch -c -t $DATE $CROSS_CC
+  touch -c -t ${DATE} ${CROSS_CC}
 
-  [ ! -f "$CROSS_CXX" ] && mv ${TARGET_PREFIX}g++ $CROSS_CXX
+  [ ! -f "${CROSS_CXX}" ] && mv ${TARGET_PREFIX}g++ ${CROSS_CXX}
 
 cat > ${TARGET_PREFIX}g++ <<EOF
 #!/bin/sh
-$TOOLCHAIN/bin/ccache $CROSS_CXX "\$@"
+${TOOLCHAIN}/bin/ccache ${CROSS_CXX} "\$@"
 EOF
 
   chmod +x ${TARGET_PREFIX}g++
 
   # To avoid cache trashing
-  touch -c -t $DATE $CROSS_CXX
+  touch -c -t ${DATE} ${CROSS_CXX}
 
   # install lto plugin for binutils
-  mkdir -p $TOOLCHAIN/lib/bfd-plugins
-    ln -sf ../gcc/$TARGET_NAME/$GCC_VERSION/liblto_plugin.so $TOOLCHAIN/lib/bfd-plugins
+  mkdir -p ${TOOLCHAIN}/lib/bfd-plugins
+    ln -sf ../gcc/${TARGET_NAME}/${GCC_VERSION}/liblto_plugin.so ${TOOLCHAIN}/lib/bfd-plugins
 }
 
 configure_target() {
@@ -129,9 +129,9 @@ make_target() {
 }
 
 makeinstall_target() {
-  mkdir -p $INSTALL/usr/lib
-    cp -P $PKG_BUILD/.$HOST_NAME/$TARGET_NAME/libgcc/libgcc_s.so* $INSTALL/usr/lib
-    cp -P $PKG_BUILD/.$HOST_NAME/$TARGET_NAME/libstdc++-v3/src/.libs/libstdc++.so* $INSTALL/usr/lib
+  mkdir -p ${INSTALL}/usr/lib
+    cp -P ${PKG_BUILD}/.${HOST_NAME}/${TARGET_NAME}/libgcc/libgcc_s.so* ${INSTALL}/usr/lib
+    cp -P ${PKG_BUILD}/.${HOST_NAME}/${TARGET_NAME}/libstdc++-v3/src/.libs/libstdc++.so* ${INSTALL}/usr/lib
 }
 
 configure_init() {
@@ -143,6 +143,6 @@ make_init() {
 }
 
 makeinstall_init() {
-  mkdir -p $INSTALL/usr/lib
-    cp -P $PKG_BUILD/.$HOST_NAME/$TARGET_NAME/libgcc/libgcc_s.so* $INSTALL/usr/lib
+  mkdir -p ${INSTALL}/usr/lib
+    cp -P ${PKG_BUILD}/.${HOST_NAME}/${TARGET_NAME}/libgcc/libgcc_s.so* ${INSTALL}/usr/lib
 }
diff --git a/packages/lang/llvm/package.mk b/packages/lang/llvm/package.mk
index 34706ed1c5..21189e226a 100644
--- a/packages/lang/llvm/package.mk
+++ b/packages/lang/llvm/package.mk
@@ -43,31 +43,31 @@ PKG_CMAKE_OPTS_COMMON="-DCMAKE_BUILD_TYPE=MinSizeRel \
                        -DLLVM_ENABLE_Z3_SOLVER=OFF"
 
 pre_configure_host() {
-  CXXFLAGS+=" -DLLVM_CONFIG_EXEC_PREFIX=\\\"$SYSROOT_PREFIX/usr\\\""
-  PKG_CMAKE_OPTS_HOST="$PKG_CMAKE_OPTS_COMMON"
+  CXXFLAGS+=" -DLLVM_CONFIG_EXEC_PREFIX=\\\"${SYSROOT_PREFIX}/usr\\\""
+  PKG_CMAKE_OPTS_HOST="${PKG_CMAKE_OPTS_COMMON}"
 }
 
 pre_configure_target() {
-  PKG_CMAKE_OPTS_TARGET="$PKG_CMAKE_OPTS_COMMON \
-                         -DCMAKE_C_FLAGS="$CFLAGS" \
-                         -DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-                         -DLLVM_TARGET_ARCH="$TARGET_ARCH" \
-                         -DLLVM_TABLEGEN=$TOOLCHAIN/bin/llvm-tblgen"
+  PKG_CMAKE_OPTS_TARGET="${PKG_CMAKE_OPTS_COMMON} \
+                         -DCMAKE_C_FLAGS="${CFLAGS}" \
+                         -DCMAKE_CXX_FLAGS="${CXXFLAGS}" \
+                         -DLLVM_TARGET_ARCH="${TARGET_ARCH}" \
+                         -DLLVM_TABLEGEN=${TOOLCHAIN}/bin/llvm-tblgen"
 }
 
 make_host() {
-  ninja $NINJA_OPTS llvm-config llvm-tblgen
+  ninja ${NINJA_OPTS} llvm-config llvm-tblgen
 }
 
 makeinstall_host() {
-  cp -a lib/libLLVM-*.so $TOOLCHAIN/lib
-  cp -a bin/llvm-config $TOOLCHAIN/bin/llvm-config-host
-  cp -a bin/llvm-tblgen $TOOLCHAIN/bin
+  cp -a lib/libLLVM-*.so ${TOOLCHAIN}/lib
+  cp -a bin/llvm-config ${TOOLCHAIN}/bin/llvm-config-host
+  cp -a bin/llvm-tblgen ${TOOLCHAIN}/bin
 }
 
 post_makeinstall_target() {
-  rm -rf $INSTALL/usr/bin
-  rm -rf $INSTALL/usr/lib/LLVMHello.so
-  rm -rf $INSTALL/usr/lib/libLTO.so
-  rm -rf $INSTALL/usr/share
+  rm -rf ${INSTALL}/usr/bin
+  rm -rf ${INSTALL}/usr/lib/LLVMHello.so
+  rm -rf ${INSTALL}/usr/lib/libLTO.so
+  rm -rf ${INSTALL}/usr/share
 }