jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-28 13:16:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

mysql: fix intertwined vars and funcs

Browse Source
This commit is contained in:
MilhouseVH 2018-12-29 23:53:34 +00:00
parent 27ef17ff2d
commit 972a11cbe0
1 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
packages/databases/mysql/package.mk
View File

@ -11,15 +11,6 @@ PKG_DEPENDS_HOST="toolchain zlib:host"
PKG_DEPENDS_TARGET="toolchain zlib ncurses openssl boost mysql:host" PKG_DEPENDS_TARGET="toolchain zlib ncurses openssl boost mysql:host"
PKG_LONGDESC="A SQL database server." PKG_LONGDESC="A SQL database server."
post_unpack() {
sed -i 's|GET_TARGET_PROPERTY(LIBMYSQL_OS_OUTPUT_NAME libmysql OUTPUT_NAME)|SET(LIBMYSQL_OS_OUTPUT_NAME "mysqlclient")|' $PKG_BUILD/scripts/CMakeLists.txt
sed -i "s|COMMAND comp_err|COMMAND $TOOLCHAIN/bin/comp_err|" $PKG_BUILD/extra/CMakeLists.txt
sed -i "s|COMMAND comp_sql|COMMAND $TOOLCHAIN/bin/comp_sql|" $PKG_BUILD/scripts/CMakeLists.txt
sed -i "s|COMMAND gen_lex_hash|COMMAND $TOOLCHAIN/bin/gen_lex_hash|" $PKG_BUILD/sql/CMakeLists.txt
sed -i '/^IF(NOT BOOST_MINOR_VERSION.*$/,/^ENDIF()$/d' $PKG_BUILD/cmake/boost.cmake
}
PKG_CMAKE_OPTS_HOST="-DCMAKE_BUILD_TYPE=Release \ PKG_CMAKE_OPTS_HOST="-DCMAKE_BUILD_TYPE=Release \
-DSTACK_DIRECTION=-1 \ -DSTACK_DIRECTION=-1 \
-DHAVE_LLVM_LIBCPP_EXITCODE=0 \ -DHAVE_LLVM_LIBCPP_EXITCODE=0 \
@ -37,23 +28,6 @@ PKG_CMAKE_OPTS_HOST="-DCMAKE_BUILD_TYPE=Release \
-DWITH_UNIT_TESTS=OFF \ -DWITH_UNIT_TESTS=OFF \
-DWITH_ZLIB=bundled" -DWITH_ZLIB=bundled"
make_host() {
ninja comp_err
ninja gen_lex_hash
ninja comp_sql
}
post_make_host() {
# needed so the binary isn't built for target
cp scripts/comp_sql ../scripts/comp_sql
}
makeinstall_host() {
cp -P extra/comp_err $TOOLCHAIN/bin
cp -P sql/gen_lex_hash $TOOLCHAIN/bin
cp -P scripts/comp_sql $TOOLCHAIN/bin
}
PKG_CMAKE_OPTS_TARGET="-DINSTALL_INCLUDEDIR=include/mysql \ PKG_CMAKE_OPTS_TARGET="-DINSTALL_INCLUDEDIR=include/mysql \
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \
-DFEATURE_SET=classic \ -DFEATURE_SET=classic \
@ -75,6 +49,32 @@ PKG_CMAKE_OPTS_TARGET="-DINSTALL_INCLUDEDIR=include/mysql \
-DSTACK_DIRECTION=1 \ -DSTACK_DIRECTION=1 \
-DHAVE_LLVM_LIBCPP=1" -DHAVE_LLVM_LIBCPP=1"
post_unpack() {
sed -i 's|GET_TARGET_PROPERTY(LIBMYSQL_OS_OUTPUT_NAME libmysql OUTPUT_NAME)|SET(LIBMYSQL_OS_OUTPUT_NAME "mysqlclient")|' $PKG_BUILD/scripts/CMakeLists.txt
sed -i "s|COMMAND comp_err|COMMAND $TOOLCHAIN/bin/comp_err|" $PKG_BUILD/extra/CMakeLists.txt
sed -i "s|COMMAND comp_sql|COMMAND $TOOLCHAIN/bin/comp_sql|" $PKG_BUILD/scripts/CMakeLists.txt
sed -i "s|COMMAND gen_lex_hash|COMMAND $TOOLCHAIN/bin/gen_lex_hash|" $PKG_BUILD/sql/CMakeLists.txt
sed -i '/^IF(NOT BOOST_MINOR_VERSION.*$/,/^ENDIF()$/d' $PKG_BUILD/cmake/boost.cmake
}
make_host() {
ninja comp_err
ninja gen_lex_hash
ninja comp_sql
}
post_make_host() {
# needed so the binary isn't built for target
cp scripts/comp_sql ../scripts/comp_sql
}
makeinstall_host() {
cp -P extra/comp_err $TOOLCHAIN/bin
cp -P sql/gen_lex_hash $TOOLCHAIN/bin
cp -P scripts/comp_sql $TOOLCHAIN/bin
}
post_makeinstall_target() { post_makeinstall_target() {
sed -i "s|pkgincludedir=.*|pkgincludedir=\'$SYSROOT_PREFIX/usr/include/mysql\'|" scripts/mysql_config sed -i "s|pkgincludedir=.*|pkgincludedir=\'$SYSROOT_PREFIX/usr/include/mysql\'|" scripts/mysql_config
sed -i "s|pkglibdir=.*|pkglibdir=\'$SYSROOT_PREFIX/usr/lib/mysql\'|" scripts/mysql_config sed -i "s|pkglibdir=.*|pkglibdir=\'$SYSROOT_PREFIX/usr/lib/mysql\'|" scripts/mysql_config