lang: automated code cleanup

Signed-off-by: Ian Leonard <antonlacon@gmail.com>
This commit is contained in:
Ian Leonard 2021-01-19 19:33:55 +00:00
parent dc28cd2250
commit 3087041cd0
7 changed files with 92 additions and 92 deletions

View File

@ -7,7 +7,7 @@ PKG_VERSION="3.8.7"
PKG_SHA256="ddcc1df16bb5b87aa42ec5d20a5b902f2d088caa269b28e01590f97a798ec50a" PKG_SHA256="ddcc1df16bb5b87aa42ec5d20a5b902f2d088caa269b28e01590f97a798ec50a"
PKG_LICENSE="OSS" PKG_LICENSE="OSS"
PKG_SITE="http://www.python.org/" 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_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_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." 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() { pre_configure_host() {
export PYTHON_MODULES_INCLUDE="$HOST_INCDIR" export PYTHON_MODULES_INCLUDE="${HOST_INCDIR}"
export PYTHON_MODULES_LIB="$HOST_LIBDIR" export PYTHON_MODULES_LIB="${HOST_LIBDIR}"
export DISABLED_EXTENSIONS="readline _curses _curses_panel $PKG_PY_DISABLED_MODULES" export DISABLED_EXTENSIONS="readline _curses _curses_panel ${PKG_PY_DISABLED_MODULES}"
} }
post_make_host() { post_make_host() {
# python distutils per default adds -L$LIBDIR when linking binary extensions # 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') sed -e "s|^ 'LIBDIR':.*| 'LIBDIR': '/usr/lib',|g" -i $(find ${PKG_BUILD}/.${HOST_NAME} -not -path '*/__pycache__/*' -name '_sysconfigdata__*.py')
} }
post_makeinstall_host() { 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/smtpd.py*
rm -f $TOOLCHAIN/bin/pyvenv rm -f ${TOOLCHAIN}/bin/pyvenv
rm -f $TOOLCHAIN/bin/pydoc* 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() { pre_configure_target() {
export PYTHON_MODULES_INCLUDE="$TARGET_INCDIR" export PYTHON_MODULES_INCLUDE="${TARGET_INCDIR}"
export PYTHON_MODULES_LIB="$TARGET_LIBDIR" export PYTHON_MODULES_LIB="${TARGET_LIBDIR}"
export DISABLED_EXTENSIONS="$PKG_PY_DISABLED_MODULES" export DISABLED_EXTENSIONS="${PKG_PY_DISABLED_MODULES}"
} }
post_makeinstall_target() { 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 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 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/pyvenv
rm -rf $INSTALL/usr/bin/python*-config rm -rf ${INSTALL}/usr/bin/python*-config
rm -rf $INSTALL/usr/bin/smtpd.py $INSTALL/usr/bin/smtpd.py.* 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 # strip
chmod u+w $INSTALL/usr/lib/libpython*.so.* chmod u+w ${INSTALL}/usr/lib/libpython*.so.*
debug_strip $INSTALL/usr debug_strip ${INSTALL}/usr
} }

View File

@ -12,16 +12,16 @@ PKG_LONGDESC="ARM Aarch64 GNU Linux Binary Toolchain"
PKG_TOOLCHAIN="manual" PKG_TOOLCHAIN="manual"
makeinstall_host() { makeinstall_host() {
mkdir -p $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 cp -a * ${TOOLCHAIN}/lib/gcc-arm-aarch64-none-elf
# wrap gcc and g++ with ccache like in gcc package.mk # 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" cp "${PKG_GCC_PREFIX}gcc" "${PKG_GCC_PREFIX}gcc.real"
cat > "${PKG_GCC_PREFIX}gcc" << EOF cat > "${PKG_GCC_PREFIX}gcc" << EOF
#!/bin/sh #!/bin/sh
$TOOLCHAIN/bin/ccache ${PKG_GCC_PREFIX}gcc.real "\$@" ${TOOLCHAIN}/bin/ccache ${PKG_GCC_PREFIX}gcc.real "\$@"
EOF EOF
chmod +x "${PKG_GCC_PREFIX}gcc" chmod +x "${PKG_GCC_PREFIX}gcc"
@ -29,7 +29,7 @@ EOF
cp "${PKG_GCC_PREFIX}g++" "${PKG_GCC_PREFIX}g++.real" cp "${PKG_GCC_PREFIX}g++" "${PKG_GCC_PREFIX}g++.real"
cat > "${PKG_GCC_PREFIX}g++" << EOF cat > "${PKG_GCC_PREFIX}g++" << EOF
#!/bin/sh #!/bin/sh
$TOOLCHAIN/bin/ccache ${PKG_GCC_PREFIX}g++.real "\$@" ${TOOLCHAIN}/bin/ccache ${PKG_GCC_PREFIX}g++.real "\$@"
EOF EOF
chmod +x "${PKG_GCC_PREFIX}g++" chmod +x "${PKG_GCC_PREFIX}g++"

View File

@ -12,16 +12,16 @@ PKG_LONGDESC="ARM Aarch64 GNU Linux Binary Toolchain"
PKG_TOOLCHAIN="manual" PKG_TOOLCHAIN="manual"
makeinstall_host() { makeinstall_host() {
mkdir -p $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 cp -a * ${TOOLCHAIN}/lib/gcc-arm-aarch64-none-linux-gnu
# wrap gcc and g++ with ccache like in gcc package.mk # 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" cp "${PKG_GCC_PREFIX}gcc" "${PKG_GCC_PREFIX}gcc.real"
cat > "${PKG_GCC_PREFIX}gcc" << EOF cat > "${PKG_GCC_PREFIX}gcc" << EOF
#!/bin/sh #!/bin/sh
$TOOLCHAIN/bin/ccache ${PKG_GCC_PREFIX}gcc.real "\$@" ${TOOLCHAIN}/bin/ccache ${PKG_GCC_PREFIX}gcc.real "\$@"
EOF EOF
chmod +x "${PKG_GCC_PREFIX}gcc" chmod +x "${PKG_GCC_PREFIX}gcc"
@ -29,7 +29,7 @@ EOF
cp "${PKG_GCC_PREFIX}g++" "${PKG_GCC_PREFIX}g++.real" cp "${PKG_GCC_PREFIX}g++" "${PKG_GCC_PREFIX}g++.real"
cat > "${PKG_GCC_PREFIX}g++" << EOF cat > "${PKG_GCC_PREFIX}g++" << EOF
#!/bin/sh #!/bin/sh
$TOOLCHAIN/bin/ccache ${PKG_GCC_PREFIX}g++.real "\$@" ${TOOLCHAIN}/bin/ccache ${PKG_GCC_PREFIX}g++.real "\$@"
EOF EOF
chmod +x "${PKG_GCC_PREFIX}g++" chmod +x "${PKG_GCC_PREFIX}g++"

View File

@ -12,16 +12,16 @@ PKG_LONGDESC="ARM AArch32 GNU Linux Binary Toolchain"
PKG_TOOLCHAIN="manual" PKG_TOOLCHAIN="manual"
makeinstall_host() { makeinstall_host() {
mkdir -p $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 cp -a * ${TOOLCHAIN}/lib/gcc-arm-arm-none-linux-gnueabihf
# wrap gcc and g++ with ccache like in gcc package.mk # 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" cp "${PKG_GCC_PREFIX}gcc" "${PKG_GCC_PREFIX}gcc.real"
cat > "${PKG_GCC_PREFIX}gcc" << EOF cat > "${PKG_GCC_PREFIX}gcc" << EOF
#!/bin/sh #!/bin/sh
$TOOLCHAIN/bin/ccache ${PKG_GCC_PREFIX}gcc.real "\$@" ${TOOLCHAIN}/bin/ccache ${PKG_GCC_PREFIX}gcc.real "\$@"
EOF EOF
chmod +x "${PKG_GCC_PREFIX}gcc" chmod +x "${PKG_GCC_PREFIX}gcc"
@ -29,7 +29,7 @@ EOF
cp "${PKG_GCC_PREFIX}g++" "${PKG_GCC_PREFIX}g++.real" cp "${PKG_GCC_PREFIX}g++" "${PKG_GCC_PREFIX}g++.real"
cat > "${PKG_GCC_PREFIX}g++" << EOF cat > "${PKG_GCC_PREFIX}g++" << EOF
#!/bin/sh #!/bin/sh
$TOOLCHAIN/bin/ccache ${PKG_GCC_PREFIX}g++.real "\$@" ${TOOLCHAIN}/bin/ccache ${PKG_GCC_PREFIX}g++.real "\$@"
EOF EOF
chmod +x "${PKG_GCC_PREFIX}g++" chmod +x "${PKG_GCC_PREFIX}g++"

View File

@ -12,16 +12,16 @@ PKG_LONGDESC="OpenRISC 1000 GNU Linux Binary Toolchain"
PKG_TOOLCHAIN="manual" PKG_TOOLCHAIN="manual"
makeinstall_host() { makeinstall_host() {
mkdir -p $TOOLCHAIN/lib/gcc-or1k-linux/ mkdir -p ${TOOLCHAIN}/lib/gcc-or1k-linux/
cp -a * $TOOLCHAIN/lib/gcc-or1k-linux cp -a * ${TOOLCHAIN}/lib/gcc-or1k-linux
# wrap gcc and g++ with ccache like in gcc package.mk # 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" rm -f "${PKG_GCC_PREFIX}gcc"
cat > "${PKG_GCC_PREFIX}gcc" << EOF cat > "${PKG_GCC_PREFIX}gcc" << EOF
#!/bin/sh #!/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 EOF
chmod +x "${PKG_GCC_PREFIX}gcc" chmod +x "${PKG_GCC_PREFIX}gcc"
@ -29,7 +29,7 @@ EOF
rm -f "${PKG_GCC_PREFIX}g++" rm -f "${PKG_GCC_PREFIX}g++"
cat > "${PKG_GCC_PREFIX}g++" << EOF cat > "${PKG_GCC_PREFIX}g++" << EOF
#!/bin/sh #!/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 EOF
chmod +x "${PKG_GCC_PREFIX}g++" chmod +x "${PKG_GCC_PREFIX}g++"

View File

@ -7,19 +7,19 @@ PKG_VERSION="10.2.0"
PKG_SHA256="b8dd4368bb9c7f0b98188317ee0254dd8cc99d1e3a18d0ff146c855fe16c1d8c" PKG_SHA256="b8dd4368bb9c7f0b98188317ee0254dd8cc99d1e3a18d0ff146c855fe16c1d8c"
PKG_LICENSE="GPL" PKG_LICENSE="GPL"
PKG_SITE="http://gcc.gnu.org/" 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_BOOTSTRAP="ccache:host autoconf:host binutils:host gmp:host mpfr:host mpc:host zstd:host"
PKG_DEPENDS_TARGET="toolchain" PKG_DEPENDS_TARGET="toolchain"
PKG_DEPENDS_HOST="ccache:host autoconf:host binutils:host gmp:host mpfr:host mpc:host zstd:host glibc" PKG_DEPENDS_HOST="ccache:host autoconf:host binutils:host gmp:host mpfr:host mpc:host zstd:host glibc"
PKG_DEPENDS_INIT="toolchain" PKG_DEPENDS_INIT="toolchain"
PKG_LONGDESC="This package contains the GNU Compiler Collection." PKG_LONGDESC="This package contains the GNU Compiler Collection."
GCC_COMMON_CONFIGURE_OPTS="--target=$TARGET_NAME \ GCC_COMMON_CONFIGURE_OPTS="--target=${TARGET_NAME} \
--with-sysroot=$SYSROOT_PREFIX \ --with-sysroot=${SYSROOT_PREFIX} \
--with-gmp=$TOOLCHAIN \ --with-gmp=${TOOLCHAIN} \
--with-mpfr=$TOOLCHAIN \ --with-mpfr=${TOOLCHAIN} \
--with-mpc=$TOOLCHAIN \ --with-mpc=${TOOLCHAIN} \
--with-zstd=$TOOLCHAIN \ --with-zstd=${TOOLCHAIN} \
--with-gnu-as \ --with-gnu-as \
--with-gnu-ld \ --with-gnu-ld \
--enable-plugin \ --enable-plugin \
@ -43,7 +43,7 @@ GCC_COMMON_CONFIGURE_OPTS="--target=$TARGET_NAME \
--disable-libssp \ --disable-libssp \
--enable-__cxa_atexit" --enable-__cxa_atexit"
PKG_CONFIGURE_OPTS_BOOTSTRAP="$GCC_COMMON_CONFIGURE_OPTS \ PKG_CONFIGURE_OPTS_BOOTSTRAP="${GCC_COMMON_CONFIGURE_OPTS} \
--enable-languages=c \ --enable-languages=c \
--disable-libsanitizer \ --disable-libsanitizer \
--enable-cloog-backend=isl \ --enable-cloog-backend=isl \
@ -52,9 +52,9 @@ PKG_CONFIGURE_OPTS_BOOTSTRAP="$GCC_COMMON_CONFIGURE_OPTS \
--without-headers \ --without-headers \
--with-newlib \ --with-newlib \
--disable-decimal-float \ --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-languages=c,c++ \
--enable-decimal-float \ --enable-decimal-float \
--enable-tls \ --enable-tls \
@ -66,7 +66,7 @@ PKG_CONFIGURE_OPTS_HOST="$GCC_COMMON_CONFIGURE_OPTS \
--disable-libstdcxx-pch \ --disable-libstdcxx-pch \
--enable-libstdcxx-time \ --enable-libstdcxx-time \
--enable-clocale=gnu \ --enable-clocale=gnu \
$GCC_OPTS" ${GCC_OPTS}"
pre_configure_host() { pre_configure_host() {
unset CPP unset CPP
@ -74,20 +74,20 @@ pre_configure_host() {
post_make_host() { post_make_host() {
# fix wrong link # fix wrong link
rm -rf $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 ln -sf libgcc_s.so.1 ${TARGET_NAME}/libgcc/libgcc_s.so
if [ ! "${BUILD_WITH_DEBUG}" = "yes" ]; then if [ ! "${BUILD_WITH_DEBUG}" = "yes" ]; then
${TARGET_PREFIX}strip $TARGET_NAME/libgcc/libgcc_s.so* ${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}/libstdc++-v3/src/.libs/libstdc++.so*
fi fi
} }
post_makeinstall_host() { 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` GCC_VERSION=$(${TOOLCHAIN}/bin/${TARGET_NAME}-gcc -dumpversion)
DATE="0501`echo $GCC_VERSION | sed 's/\./0/g'`" DATE="0501$(echo ${GCC_VERSION} | sed 's/\./0/g')"
CROSS_CC=${TARGET_PREFIX}gcc-${GCC_VERSION} CROSS_CC=${TARGET_PREFIX}gcc-${GCC_VERSION}
CROSS_CXX=${TARGET_PREFIX}g++-${GCC_VERSION} CROSS_CXX=${TARGET_PREFIX}g++-${GCC_VERSION}
@ -95,29 +95,29 @@ post_makeinstall_host() {
cat > ${TARGET_PREFIX}gcc <<EOF cat > ${TARGET_PREFIX}gcc <<EOF
#!/bin/sh #!/bin/sh
$TOOLCHAIN/bin/ccache $CROSS_CC "\$@" ${TOOLCHAIN}/bin/ccache ${CROSS_CC} "\$@"
EOF EOF
chmod +x ${TARGET_PREFIX}gcc chmod +x ${TARGET_PREFIX}gcc
# To avoid cache trashing # 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 cat > ${TARGET_PREFIX}g++ <<EOF
#!/bin/sh #!/bin/sh
$TOOLCHAIN/bin/ccache $CROSS_CXX "\$@" ${TOOLCHAIN}/bin/ccache ${CROSS_CXX} "\$@"
EOF EOF
chmod +x ${TARGET_PREFIX}g++ chmod +x ${TARGET_PREFIX}g++
# To avoid cache trashing # To avoid cache trashing
touch -c -t $DATE $CROSS_CXX touch -c -t ${DATE} ${CROSS_CXX}
# install lto plugin for binutils # install lto plugin for binutils
mkdir -p $TOOLCHAIN/lib/bfd-plugins mkdir -p ${TOOLCHAIN}/lib/bfd-plugins
ln -sf ../gcc/$TARGET_NAME/$GCC_VERSION/liblto_plugin.so $TOOLCHAIN/lib/bfd-plugins ln -sf ../gcc/${TARGET_NAME}/${GCC_VERSION}/liblto_plugin.so ${TOOLCHAIN}/lib/bfd-plugins
} }
configure_target() { configure_target() {
@ -129,9 +129,9 @@ make_target() {
} }
makeinstall_target() { makeinstall_target() {
mkdir -p $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}/libgcc/libgcc_s.so* ${INSTALL}/usr/lib
cp -P $PKG_BUILD/.$HOST_NAME/$TARGET_NAME/libstdc++-v3/src/.libs/libstdc++.so* $INSTALL/usr/lib cp -P ${PKG_BUILD}/.${HOST_NAME}/${TARGET_NAME}/libstdc++-v3/src/.libs/libstdc++.so* ${INSTALL}/usr/lib
} }
configure_init() { configure_init() {
@ -143,6 +143,6 @@ make_init() {
} }
makeinstall_init() { makeinstall_init() {
mkdir -p $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}/libgcc/libgcc_s.so* ${INSTALL}/usr/lib
} }

View File

@ -43,31 +43,31 @@ PKG_CMAKE_OPTS_COMMON="-DCMAKE_BUILD_TYPE=MinSizeRel \
-DLLVM_ENABLE_Z3_SOLVER=OFF" -DLLVM_ENABLE_Z3_SOLVER=OFF"
pre_configure_host() { pre_configure_host() {
CXXFLAGS+=" -DLLVM_CONFIG_EXEC_PREFIX=\\\"$SYSROOT_PREFIX/usr\\\"" CXXFLAGS+=" -DLLVM_CONFIG_EXEC_PREFIX=\\\"${SYSROOT_PREFIX}/usr\\\""
PKG_CMAKE_OPTS_HOST="$PKG_CMAKE_OPTS_COMMON" PKG_CMAKE_OPTS_HOST="${PKG_CMAKE_OPTS_COMMON}"
} }
pre_configure_target() { pre_configure_target() {
PKG_CMAKE_OPTS_TARGET="$PKG_CMAKE_OPTS_COMMON \ PKG_CMAKE_OPTS_TARGET="${PKG_CMAKE_OPTS_COMMON} \
-DCMAKE_C_FLAGS="$CFLAGS" \ -DCMAKE_C_FLAGS="${CFLAGS}" \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_CXX_FLAGS="${CXXFLAGS}" \
-DLLVM_TARGET_ARCH="$TARGET_ARCH" \ -DLLVM_TARGET_ARCH="${TARGET_ARCH}" \
-DLLVM_TABLEGEN=$TOOLCHAIN/bin/llvm-tblgen" -DLLVM_TABLEGEN=${TOOLCHAIN}/bin/llvm-tblgen"
} }
make_host() { make_host() {
ninja $NINJA_OPTS llvm-config llvm-tblgen ninja ${NINJA_OPTS} llvm-config llvm-tblgen
} }
makeinstall_host() { makeinstall_host() {
cp -a lib/libLLVM-*.so $TOOLCHAIN/lib cp -a lib/libLLVM-*.so ${TOOLCHAIN}/lib
cp -a bin/llvm-config $TOOLCHAIN/bin/llvm-config-host cp -a bin/llvm-config ${TOOLCHAIN}/bin/llvm-config-host
cp -a bin/llvm-tblgen $TOOLCHAIN/bin cp -a bin/llvm-tblgen ${TOOLCHAIN}/bin
} }
post_makeinstall_target() { post_makeinstall_target() {
rm -rf $INSTALL/usr/bin rm -rf ${INSTALL}/usr/bin
rm -rf $INSTALL/usr/lib/LLVMHello.so rm -rf ${INSTALL}/usr/lib/LLVMHello.so
rm -rf $INSTALL/usr/lib/libLTO.so rm -rf ${INSTALL}/usr/lib/libLTO.so
rm -rf $INSTALL/usr/share rm -rf ${INSTALL}/usr/share
} }