From ccb0683056ae18524ada03c90add7147d3a9051d Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH 001/141] config/functions: rework setup_toolchain, add cmake configuration Signed-off-by: Stephan Raue --- config/functions | 135 +++++++++++++++++++++++++++-------------------- config/path | 6 +-- 2 files changed, 79 insertions(+), 62 deletions(-) diff --git a/config/functions b/config/functions index 228feeb359..371f5e2cb5 100644 --- a/config/functions +++ b/config/functions @@ -1,62 +1,81 @@ setup_toolchain() { - if [ "$1" = target ]; then - export DESTIMAGE="target" - - unset CPP - - export CC=$TARGET_CC - export CXX=$TARGET_CXX - export LD=$TARGET_LD - export AS=$TARGET_AS - export AR=$TARGET_AR - export NM=$TARGET_NM - export RANLIB=$TARGET_RANLIB - export OBJCOPY=$TARGET_OBJCOPY - export OBJDUMP=$TARGET_OBJDUMP - export STRIP=$TARGET_STRIP - export CPPFLAGS="$TARGET_CPPFLAGS" - export CFLAGS="$TARGET_CFLAGS" - export CXXFLAGS="$TARGET_CXXFLAGS" - export LDFLAGS="$TARGET_LDFLAGS" - export PKG_CONFIG_PATH="$TARGET_PKG_CONFIG_PATH" - export PKG_CONFIG_LIBDIR="$TARGET_PKG_CONFIG_LIBDIR" - export PKG_CONFIG_SYSROOT_DIR="$TARGET_PKG_CONFIG_SYSROOT_DIR" - - # set python defaults - export _python_sysroot="$SYSROOT_PREFIX" - export _python_prefix=/usr - export _python_exec_prefix=/usr - - # set CMAKE configfile for target - export CMAKE_CONF=$ROOT/$TOOLCHAIN/etc/cmake-$TARGET_NAME.conf - - elif [ "$1" = host ]; then - export DESTIMAGE="host" - - unset CPP - - export AWK=$HOST_AWK - export CC=$HOST_CC - export CXX=$HOST_CXX - export LD=$HOST_LD - export AS=$HOST_AS - export AR=$HOST_AR - export NM=$HOST_NM - export RANLIB=$HOST_RANLIB - export OBJCOPY=$HOST_OBJCOPY - export STRIP=$HOST_STRIP - export CPPFLAGS="$HOST_CPPFLAGS" - export CFLAGS="$HOST_CFLAGS" - export CXXFLAGS="$HOST_CXXFLAGS" - export LDFLAGS="$HOST_LDFLAGS" - export PKG_CONFIG_PATH="$HOST_PKG_CONFIG_PATH" - export PKG_CONFIG_LIBDIR="$HOST_PKG_CONFIG_LIBDIR" - export PKG_CONFIG_SYSROOT_DIR="$HOST_PKG_CONFIG_SYSROOT_DIR" - - # set CMAKE configfile for host - export CMAKE_CONF=$ROOT/$TOOLCHAIN/etc/cmake-$HOST_NAME.conf - - fi + case "$1" in + target) + export DESTIMAGE="target" + export CC="$TARGET_CC" + export CXX="$TARGET_CXX" + export CPP="$TARGET_CPP" + export LD="$TARGET_LD" + export AS="$TARGET_AS" + export AR="$TARGET_AR" + export NM="$TARGET_NM" + export RANLIB=$TARGET_RANLIB + export OBJCOPY=$TARGET_OBJCOPY + export OBJDUMP=$TARGET_OBJDUMP + export STRIP=$TARGET_STRIP + export CPPFLAGS="$TARGET_CPPFLAGS" + export CFLAGS="$TARGET_CFLAGS" + export CXXFLAGS="$TARGET_CXXFLAGS" + export LDFLAGS="$TARGET_LDFLAGS" + export PKG_CONFIG_PATH="$TARGET_PKG_CONFIG_PATH" + export PKG_CONFIG_LIBDIR="$TARGET_PKG_CONFIG_LIBDIR" + export PKG_CONFIG_SYSROOT_DIR="$TARGET_PKG_CONFIG_SYSROOT_DIR" + export CMAKE_CONF=$ROOT/$TOOLCHAIN/etc/cmake-$TARGET_NAME.conf + export CMAKE="cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF -DCMAKE_INSTALL_PREFIX=/usr" + if [ ! -f $CMAKE_CONF ] ; then + mkdir -p $ROOT/$TOOLCHAIN/etc + echo "SET(CMAKE_SYSTEM_NAME Linux)" >> $CMAKE_CONF + echo "SET(CMAKE_SYSTEM_VERSION 1)" >> $CMAKE_CONF + echo "SET(CMAKE_SYSTEM_PROCESSOR $TARGET_ARCH)" >> $CMAKE_CONF + echo "SET(CMAKE_C_COMPILER $CC)" >> $CMAKE_CONF + echo "SET(CMAKE_CXX_COMPILER $CXX)" >> $CMAKE_CONF + echo "SET(CMAKE_CPP_COMPILER $CPP)" >> $CMAKE_CONF + echo "SET(CMAKE_FIND_ROOT_PATH $SYSROOT_PREFIX)" >> $CMAKE_CONF + echo "SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)" >> $CMAKE_CONF + echo "SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)" >> $CMAKE_CONF + echo "SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)" >> $CMAKE_CONF + fi + export _python_sysroot="$SYSROOT_PREFIX" + export _python_prefix=/usr + export _python_exec_prefix=/usr + ;; + host) + export DESTIMAGE="host" + export AWK=$HOST_AWK + export CC="$HOST_CC" + export CXX="$HOST_CXX" + export CPP="$HOST_CPP" + export LD="$HOST_LD" + export AS="$HOST_AS" + export AR="$HOST_AR" + export NM="$HOST_NM" + export RANLIB="$HOST_RANLIB" + export OBJCOPY="$HOST_OBJCOPY" + export STRIP="$HOST_STRIP" + export CPPFLAGS="$HOST_CPPFLAGS" + export CFLAGS="$HOST_CFLAGS" + export CXXFLAGS="$HOST_CXXFLAGS" + export LDFLAGS="$HOST_LDFLAGS" + export PKG_CONFIG_PATH="$HOST_PKG_CONFIG_PATH" + export PKG_CONFIG_LIBDIR="$HOST_PKG_CONFIG_LIBDIR" + export PKG_CONFIG_SYSROOT_DIR="$HOST_PKG_CONFIG_SYSROOT_DIR" + export CMAKE_CONF=$ROOT/$TOOLCHAIN/etc/cmake-$HOST_NAME.conf + export CMAKE="cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF -DCMAKE_INSTALL_PREFIX=$ROOT/$TOOLCHAIN" + if [ ! -f $CMAKE_CONF ] ; then + mkdir -p $TOOLCHAIN/etc + echo "SET(CMAKE_SYSTEM_NAME Linux)" >> $CMAKE_CONF + echo "SET(CMAKE_SYSTEM_VERSION 1)" >> $CMAKE_CONF + echo "SET(CMAKE_C_COMPILER $CC)" >> $CMAKE_CONF + echo "SET(CMAKE_CXX_COMPILER $CXX)" >> $CMAKE_CONF + echo "SET(CMAKE_CPP_COMPILER $CXX)" >> $CMAKE_CONF + echo "SET(CMAKE_AR $AR)" >> $CMAKE_CONF # hum? + echo "SET(CMAKE_FIND_ROOT_PATH $ROOT/$TOOLCHAIN)" >> $CMAKE_CONF + echo "SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM BOTH)" >> $CMAKE_CONF + echo "SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY BOTH)" >> $CMAKE_CONF + echo "SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE BOTH)" >> $CMAKE_CONF + fi + ;; + esac } kernel_path() { diff --git a/config/path b/config/path index 40f9f30b01..ba85b70a76 100644 --- a/config/path +++ b/config/path @@ -168,10 +168,9 @@ XORG_PATH_DRIVERS=/usr/lib/xorg/modules/drivers TOOLCHAIN_LANGUAGES=c [ "$TOOLCHAIN_CXX" = yes ] && TOOLCHAIN_LANGUAGES=${TOOLCHAIN_LANGUAGES},c++ -unset TARGET_CPP - TARGET_CC=${TARGET_PREFIX}gcc TARGET_CXX=${TARGET_PREFIX}g++ +TARGET_CPP=${TARGET_PREFIX}cpp TARGET_LD=${TARGET_PREFIX}ld TARGET_AS=${TARGET_PREFIX}as TARGET_AR=${TARGET_PREFIX}ar @@ -187,11 +186,10 @@ TARGET_PKG_CONFIG_PATH="" TARGET_PKG_CONFIG_LIBDIR="$SYSROOT_PREFIX/usr/lib/pkgconfig:$SYSROOT_PREFIX/usr/share/pkgconfig" TARGET_PKG_CONFIG_SYSROOT_DIR="$SYSROOT_PREFIX" -unset HOST_CPP - HOST_AWK=gawk HOST_CC=$ROOT/$TOOLCHAIN/bin/host-gcc HOST_CXX=$ROOT/$TOOLCHAIN/bin/host-g++ +HOST_CPP=cpp HOST_LD=ld HOST_AS=as HOST_AR=ar From 564fb3e4b3d1b6133e06ef3bef4088f96a84b4e8 Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH 002/141] config/functions: cache ar assignment --- config/functions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/functions b/config/functions index 371f5e2cb5..fdfbc8c869 100644 --- a/config/functions +++ b/config/functions @@ -68,7 +68,7 @@ setup_toolchain() { echo "SET(CMAKE_C_COMPILER $CC)" >> $CMAKE_CONF echo "SET(CMAKE_CXX_COMPILER $CXX)" >> $CMAKE_CONF echo "SET(CMAKE_CPP_COMPILER $CXX)" >> $CMAKE_CONF - echo "SET(CMAKE_AR $AR)" >> $CMAKE_CONF # hum? + echo "SET(CMAKE_AR $AR CACHE FILEPATH "Archiver")" >> $CMAKE_CONF # hum? echo "SET(CMAKE_FIND_ROOT_PATH $ROOT/$TOOLCHAIN)" >> $CMAKE_CONF echo "SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM BOTH)" >> $CMAKE_CONF echo "SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY BOTH)" >> $CMAKE_CONF From 734003bbeb6b5d5bfc4c27f946d3905b33e879f1 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH 003/141] config/functions: add support for 'setup_toolchain() init' and 'setup_toolchain() bootstrap' Signed-off-by: Stephan Raue --- config/functions | 4 ++-- scripts/build | 6 +----- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/config/functions b/config/functions index fdfbc8c869..a8ec026efe 100644 --- a/config/functions +++ b/config/functions @@ -1,6 +1,6 @@ setup_toolchain() { case "$1" in - target) + target|init) export DESTIMAGE="target" export CC="$TARGET_CC" export CXX="$TARGET_CXX" @@ -39,7 +39,7 @@ setup_toolchain() { export _python_prefix=/usr export _python_exec_prefix=/usr ;; - host) + host|bootstrap) export DESTIMAGE="host" export AWK=$HOST_AWK export CC="$HOST_CC" diff --git a/scripts/build b/scripts/build index 78579c4856..a7684d6a0a 100755 --- a/scripts/build +++ b/scripts/build @@ -66,11 +66,7 @@ fi if [ ! -f $STAMP ]; then rm -f $STAMP - if [ "$TARGET" = "bootstrap" -o "$TARGET" = "init" ]; then - setup_toolchain target - else - setup_toolchain $TARGET - fi + setup_toolchain $TARGET # unset functions unset -f pre_build_target From 433ab98027032d88b093d5b800e6eb04798dbde7 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH 004/141] config/path: remove $TOOLCHAIN_LANGUAGES and $TOOLCHAIN_CXX Signed-off-by: Stephan Raue --- config/functions | 7 ------- config/options | 3 --- config/path | 3 --- packages/lang/gcc/package.mk | 2 +- 4 files changed, 1 insertion(+), 14 deletions(-) diff --git a/config/functions b/config/functions index a8ec026efe..5ba8e8cd37 100644 --- a/config/functions +++ b/config/functions @@ -131,13 +131,6 @@ require_eglibc() { fi } -require_cxx() { - if [ "$TOOLCHAIN_CXX" != yes ]; then - echo "$1 requires C++ toolchain support, aborting." - exit 1 - fi -} - add_user() { # Usage: add_user "username" "password" "userid" "groupid" "description" "home" "shell" mkdir -p ${INSTALL}/etc diff --git a/config/options b/config/options index 5be882292b..2d86042a94 100644 --- a/config/options +++ b/config/options @@ -62,9 +62,6 @@ fi # If you have ccache installed, take care that LOCAL_CXX don't point to it LOCAL_CXX=`which g++` -# Support C++ in toolchain - TOOLCHAIN_CXX="yes" - # verbose compilation mode (yes/no) VERBOSE="yes" diff --git a/config/path b/config/path index ba85b70a76..e4f68ec081 100644 --- a/config/path +++ b/config/path @@ -165,9 +165,6 @@ XORG_PATH_RGB=/usr/lib/X11/rgb XORG_PATH_MODULES=/usr/lib/xorg/modules XORG_PATH_DRIVERS=/usr/lib/xorg/modules/drivers -TOOLCHAIN_LANGUAGES=c -[ "$TOOLCHAIN_CXX" = yes ] && TOOLCHAIN_LANGUAGES=${TOOLCHAIN_LANGUAGES},c++ - TARGET_CC=${TARGET_PREFIX}gcc TARGET_CXX=${TARGET_PREFIX}g++ TARGET_CPP=${TARGET_PREFIX}cpp diff --git a/packages/lang/gcc/package.mk b/packages/lang/gcc/package.mk index a8c4098916..a8ba329581 100644 --- a/packages/lang/gcc/package.mk +++ b/packages/lang/gcc/package.mk @@ -79,7 +79,7 @@ PKG_CONFIGURE_OPTS_HOST="--target=$TARGET_NAME \ --with-mpc=$ROOT/$TOOLCHAIN \ --without-ppl \ --without-cloog \ - --enable-languages=${TOOLCHAIN_LANGUAGES} \ + --enable-languages=c,c++ \ --with-gnu-as \ --with-gnu-ld \ --enable-__cxa_atexit \ From 322f4339a96df9e15a00eccbfe41f02f38636e67 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH 005/141] config/path: move some variables to config/functions and cleanup Signed-off-by: Stephan Raue --- config/functions | 73 +++++++++++++++++++++++++++++------------------- config/path | 32 --------------------- 2 files changed, 45 insertions(+), 60 deletions(-) diff --git a/config/functions b/config/functions index 5ba8e8cd37..44cb8818a9 100644 --- a/config/functions +++ b/config/functions @@ -2,24 +2,24 @@ setup_toolchain() { case "$1" in target|init) export DESTIMAGE="target" - export CC="$TARGET_CC" - export CXX="$TARGET_CXX" - export CPP="$TARGET_CPP" - export LD="$TARGET_LD" - export AS="$TARGET_AS" - export AR="$TARGET_AR" - export NM="$TARGET_NM" - export RANLIB=$TARGET_RANLIB - export OBJCOPY=$TARGET_OBJCOPY - export OBJDUMP=$TARGET_OBJDUMP - export STRIP=$TARGET_STRIP + export CC="${TARGET_PREFIX}gcc" + export CXX="${TARGET_PREFIX}g++" + export CPP="${TARGET_PREFIX}cpp" + export LD="${TARGET_PREFIX}ld" + export AS="${TARGET_PREFIX}as" + export AR="${TARGET_PREFIX}ar" + export NM="${TARGET_PREFIX}nm" + export RANLIB="${TARGET_PREFIX}ranlib" + export OBJCOPY="${TARGET_PREFIX}objcopy" + export OBJDUMP="${TARGET_PREFIX}objdump" + export STRIP="${TARGET_PREFIX}strip" export CPPFLAGS="$TARGET_CPPFLAGS" export CFLAGS="$TARGET_CFLAGS" export CXXFLAGS="$TARGET_CXXFLAGS" export LDFLAGS="$TARGET_LDFLAGS" - export PKG_CONFIG_PATH="$TARGET_PKG_CONFIG_PATH" - export PKG_CONFIG_LIBDIR="$TARGET_PKG_CONFIG_LIBDIR" - export PKG_CONFIG_SYSROOT_DIR="$TARGET_PKG_CONFIG_SYSROOT_DIR" + export PKG_CONFIG_PATH="" + export PKG_CONFIG_LIBDIR="$SYSROOT_PREFIX/usr/lib/pkgconfig:$SYSROOT_PREFIX/usr/share/pkgconfig" + export PKG_CONFIG_SYSROOT_DIR="$SYSROOT_PREFIX" export CMAKE_CONF=$ROOT/$TOOLCHAIN/etc/cmake-$TARGET_NAME.conf export CMAKE="cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF -DCMAKE_INSTALL_PREFIX=/usr" if [ ! -f $CMAKE_CONF ] ; then @@ -35,30 +35,39 @@ setup_toolchain() { echo "SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)" >> $CMAKE_CONF echo "SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)" >> $CMAKE_CONF fi + export HOST_CC="$ROOT/$TOOLCHAIN/bin/host-gcc" + export HOST_CXX="$ROOT/$TOOLCHAIN/bin/host-g++" + export HOSTCC="$HOST_CC" + export HOSTCXX="$HOST_CXX" + export CC_FOR_BUILD="$HOST_CC" + export CXX_FOR_BUILD="$HOST_CXX" + export BUILD_CC="$HOST_CC" + export BUILD_CXX="$HOST_CXX" export _python_sysroot="$SYSROOT_PREFIX" export _python_prefix=/usr export _python_exec_prefix=/usr ;; host|bootstrap) export DESTIMAGE="host" - export AWK=$HOST_AWK - export CC="$HOST_CC" - export CXX="$HOST_CXX" - export CPP="$HOST_CPP" - export LD="$HOST_LD" - export AS="$HOST_AS" - export AR="$HOST_AR" - export NM="$HOST_NM" - export RANLIB="$HOST_RANLIB" - export OBJCOPY="$HOST_OBJCOPY" - export STRIP="$HOST_STRIP" + export AWK="gawk" + export CC="$ROOT/$TOOLCHAIN/bin/host-gcc" + export CXX="$ROOT/$TOOLCHAIN/bin/host-g++" + export CPP="cpp" + export LD="ld" + export AS="as" + export AR="ar" + export NM="nm" + export RANLIB="ranlib" + export OBJCOPY="objcopy" + export OBJDUMP="objdump" + export STRIP="strip" export CPPFLAGS="$HOST_CPPFLAGS" export CFLAGS="$HOST_CFLAGS" export CXXFLAGS="$HOST_CXXFLAGS" export LDFLAGS="$HOST_LDFLAGS" - export PKG_CONFIG_PATH="$HOST_PKG_CONFIG_PATH" - export PKG_CONFIG_LIBDIR="$HOST_PKG_CONFIG_LIBDIR" - export PKG_CONFIG_SYSROOT_DIR="$HOST_PKG_CONFIG_SYSROOT_DIR" + export PKG_CONFIG_PATH="" + export PKG_CONFIG_LIBDIR="$ROOT/$TOOLCHAIN/lib/pkgconfig:$ROOT/$TOOLCHAIN/share/pkgconfig" + export PKG_CONFIG_SYSROOT_DIR="" export CMAKE_CONF=$ROOT/$TOOLCHAIN/etc/cmake-$HOST_NAME.conf export CMAKE="cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF -DCMAKE_INSTALL_PREFIX=$ROOT/$TOOLCHAIN" if [ ! -f $CMAKE_CONF ] ; then @@ -74,6 +83,14 @@ setup_toolchain() { echo "SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY BOTH)" >> $CMAKE_CONF echo "SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE BOTH)" >> $CMAKE_CONF fi + export HOST_CC="$HOST_CC" + export HOST_CXX="$HOST_CXX" + export HOSTCC="$HOST_CC" + export HOSTCXX="$HOST_CXX" + export CC_FOR_BUILD="$HOST_CC" + export CXX_FOR_BUILD="$HOST_CXX" + export BUILD_CC="$HOST_CC" + export BUILD_CXX="$HOST_CXX" ;; esac } diff --git a/config/path b/config/path index e4f68ec081..9fe9e715f5 100644 --- a/config/path +++ b/config/path @@ -165,40 +165,8 @@ XORG_PATH_RGB=/usr/lib/X11/rgb XORG_PATH_MODULES=/usr/lib/xorg/modules XORG_PATH_DRIVERS=/usr/lib/xorg/modules/drivers -TARGET_CC=${TARGET_PREFIX}gcc -TARGET_CXX=${TARGET_PREFIX}g++ -TARGET_CPP=${TARGET_PREFIX}cpp -TARGET_LD=${TARGET_PREFIX}ld -TARGET_AS=${TARGET_PREFIX}as -TARGET_AR=${TARGET_PREFIX}ar -TARGET_NM=${TARGET_PREFIX}nm -TARGET_RANLIB=${TARGET_PREFIX}ranlib -TARGET_OBJCOPY=${TARGET_PREFIX}objcopy -TARGET_OBJDUMP=${TARGET_PREFIX}objdump -TARGET_STRIP=${TARGET_PREFIX}strip - . config/optimize -TARGET_PKG_CONFIG_PATH="" -TARGET_PKG_CONFIG_LIBDIR="$SYSROOT_PREFIX/usr/lib/pkgconfig:$SYSROOT_PREFIX/usr/share/pkgconfig" -TARGET_PKG_CONFIG_SYSROOT_DIR="$SYSROOT_PREFIX" - -HOST_AWK=gawk -HOST_CC=$ROOT/$TOOLCHAIN/bin/host-gcc -HOST_CXX=$ROOT/$TOOLCHAIN/bin/host-g++ -HOST_CPP=cpp -HOST_LD=ld -HOST_AS=as -HOST_AR=ar -HOST_NM=nm -HOST_RANLIB=ranlib -HOST_OBJCOPY=objcopy -HOST_STRIP=strip - -HOST_PKG_CONFIG_PATH="" -HOST_PKG_CONFIG_LIBDIR="$ROOT/$TOOLCHAIN/lib/pkgconfig:$ROOT/$TOOLCHAIN/share/pkgconfig" -HOST_PKG_CONFIG_SYSROOT_DIR="" - if [ -z "$CCACHE_DIR" ]; then export CCACHE_DIR=$ROOT/.ccache/$PROJECT.$TARGET_ARCH-$OS_VERSION fi From bc1419e886dfc77732c6c5fc31045d6b03a0adfa Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH 006/141] scripts/build: reuse $TARGET_CONFIGURE_OPTS for $INIT_CONFIGURE_OPTS and $HOST_CONFIGURE_OPTS for $BOOTSTRAP_CONFIGURE_OPTS, rename $TARGET_NAME-init and $HOST_NAME-, cosmetics Signed-off-by: Stephan Raue --- scripts/build | 36 +++++++----------------------------- 1 file changed, 7 insertions(+), 29 deletions(-) diff --git a/scripts/build b/scripts/build index a7684d6a0a..6341c88b14 100755 --- a/scripts/build +++ b/scripts/build @@ -114,7 +114,6 @@ if [ ! -f $STAMP ]; then unset -f post_makeinstall_bootstrap # configure TARGET build defaults - unset -v TARGET_CONFIGURE_OPTS TARGET_CONFIGURE_OPTS="--host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ @@ -127,7 +126,6 @@ if [ ! -f $STAMP ]; then --enable-shared" # configure HOST build defaults - unset -v HOST_CONFIGURE_OPTS HOST_CONFIGURE_OPTS="--host=$HOST_NAME \ --build=$HOST_NAME \ --prefix=$ROOT/$TOOLCHAIN \ @@ -140,30 +138,10 @@ if [ ! -f $STAMP ]; then --enable-shared" # configure INIT build defaults - unset -v INIT_CONFIGURE_OPTS - INIT_CONFIGURE_OPTS="--host=$TARGET_NAME \ - --build=$HOST_NAME \ - --prefix=/usr \ - --bindir=/usr/bin \ - --sbindir=/usr/sbin \ - --sysconfdir=/etc \ - --libexecdir=/usr/lib \ - --localstatedir=/var \ - --disable-static \ - --enable-shared" + INIT_CONFIGURE_OPTS="$TARGET_CONFIGURE_OPTS" # configure BOOTSTRAP build defaults - unset -v BOOTSTRAP_CONFIGURE_OPTS - BOOTSTRAP_CONFIGURE_OPTS="--host=$TARGET_NAME \ - --build=$HOST_NAME \ - --prefix=/usr \ - --bindir=/usr/bin \ - --sbindir=/usr/sbin \ - --sysconfdir=/etc \ - --libexecdir=/usr/lib \ - --localstatedir=/var \ - --disable-static \ - --enable-shared" + BOOTSTRAP_CONFIGURE_OPTS="$HOST_CONFIGURE_OPTS" # include buildfile . $PKG_DIR/package.mk @@ -246,13 +224,13 @@ if [ ! -f $STAMP ]; then fi elif [ "$TARGET" = "init" ]; then if [ -f "$PKG_CONFIGURE_SCRIPT" -o -f "$PKG_CMAKE_SCRIPT" ]; then - mkdir -p .$TARGET_NAME-init - cd .$TARGET_NAME-init + mkdir -p .$TARGET_NAME-$TARGET + cd .$TARGET_NAME-$TARGET fi elif [ "$TARGET" = "bootstrap" ]; then if [ -f "$PKG_CONFIGURE_SCRIPT" -o -f "$PKG_CMAKE_SCRIPT" ]; then - mkdir -p .$TARGET_NAME-bootstrap - cd .$TARGET_NAME-bootstrap + mkdir -p .$HOST_NAME-$TARGET + cd .$HOST_NAME-$TARGET fi fi @@ -313,7 +291,7 @@ if [ ! -f $STAMP ]; then elif [ "$TARGET" = "init" ]; then make install DESTDIR=$INSTALL $PKG_MAKEINSTALL_OPTS_INIT elif [ "$TARGET" = "bootstrap" ]; then - $MAKEINSTALL $PKG_MAKEINSTALL_OPTS_BOOTSTRAP + make install $PKG_MAKEINSTALL_OPTS_BOOTSTRAP fi fi if [ "$(type -t post_makeinstall_$TARGET)" = "function" ]; then From aca0869cf4aa8efa83ddd71b0fbbef359d37fabf Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH 007/141] scripts/build: add support to automatically build cmake projects if cmake is supported, add support for $PKG_CMAKE_OPTS_(TARGET|HOST|INIT|BOOTSTRAP) Signed-off-by: Stephan Raue --- scripts/build | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/scripts/build b/scripts/build index 6341c88b14..0c7d9a1398 100755 --- a/scripts/build +++ b/scripts/build @@ -125,6 +125,9 @@ if [ ! -f $STAMP ]; then --disable-static \ --enable-shared" + TARGET_CMAKE_OPTS="-DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \ + -DCMAKE_INSTALL_PREFIX=/usr" + # configure HOST build defaults HOST_CONFIGURE_OPTS="--host=$HOST_NAME \ --build=$HOST_NAME \ @@ -137,11 +140,16 @@ if [ ! -f $STAMP ]; then --disable-static \ --enable-shared" + HOST_CMAKE_OPTS="-DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \ + -DCMAKE_INSTALL_PREFIX=$ROOT/$TOOLCHAIN" + # configure INIT build defaults INIT_CONFIGURE_OPTS="$TARGET_CONFIGURE_OPTS" + INIT_CMAKE_OPTS="$TARGET_CMAKE_OPTS" # configure BOOTSTRAP build defaults BOOTSTRAP_CONFIGURE_OPTS="$HOST_CONFIGURE_OPTS" + BOOTSTRAP_CMAKE_OPTS="$HOST_CMAKE_OPTS" # include buildfile . $PKG_DIR/package.mk @@ -240,6 +248,16 @@ if [ ! -f $STAMP ]; then fi if [ "$(type -t configure_$TARGET)" = "function" ]; then configure_$TARGET + elif [ -f "$PKG_CMAKE_SCRIPT" -a ! "$PKG_USE_CMAKE" = "no" ]; then + if [ "$TARGET" = "target" ]; then + cmake $TARGET_CMAKE_OPTS $PKG_CMAKE_OPTS_TARGET $(dirname $PKG_CMAKE_SCRIPT) + elif [ "$TARGET" = "host" ]; then + cmake $HOST_CMAKE_OPTS $PKG_CMAKE_OPTS_HOST $(dirname $PKG_CMAKE_SCRIPT) + elif [ "$TARGET" = "init" ]; then + cmake $INIT_CMAKE_OPTS $PKG_CMAKE_OPTS_INIT $(dirname $PKG_CMAKE_SCRIPT) + elif [ "$TARGET" = "bootstrap" ]; then + cmake $BOOTSTRAP_CMAKE_OPTS $PKG_CMAKE_OPTS_BOOTSTRAP $(dirname $PKG_CMAKE_SCRIPT) + fi elif [ -f "$PKG_CONFIGURE_SCRIPT" ]; then if [ "$TARGET" = "target" ]; then $PKG_CONFIGURE_SCRIPT $TARGET_CONFIGURE_OPTS $PKG_CONFIGURE_OPTS_TARGET From 4e7c8d7e7c5217a88c80df6cf4f13cc40bf18be9 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH 008/141] cmake: remove creating cmake configfiles here (moved to setup_toolchain() ) Signed-off-by: Stephan Raue --- packages/devel/cmake/package.mk | 51 --------------------------------- 1 file changed, 51 deletions(-) diff --git a/packages/devel/cmake/package.mk b/packages/devel/cmake/package.mk index 01b92286d3..ef5b435298 100644 --- a/packages/devel/cmake/package.mk +++ b/packages/devel/cmake/package.mk @@ -42,54 +42,3 @@ configure_host() { -DCMAKE_USE_OPENSSL=ON \ -DBUILD_CursesDialog=0 } - -post_makeinstall_host() { - mkdir -p $ROOT/$TOOLCHAIN/etc - - cat >$ROOT/$TOOLCHAIN/etc/cmake-$TARGET_NAME.conf <$ROOT/$TOOLCHAIN/etc/cmake-$HOST_NAME.conf < Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH 009/141] gcc: simplyfing Signed-off-by: Stephan Raue --- packages/lang/gcc/package.mk | 110 +++++++++++++---------------------- 1 file changed, 40 insertions(+), 70 deletions(-) diff --git a/packages/lang/gcc/package.mk b/packages/lang/gcc/package.mk index a8ba329581..352311af3a 100644 --- a/packages/lang/gcc/package.mk +++ b/packages/lang/gcc/package.mk @@ -34,68 +34,48 @@ PKG_LONGDESC="This package contains the GNU Compiler Collection. It includes com PKG_IS_ADDON="no" PKG_AUTORECONF="no" -BOOTSTRAP_CONFIGURE_OPTS="--host=$HOST_NAME \ - --build=$HOST_NAME \ - --target=$TARGET_NAME \ - --prefix=$ROOT/$TOOLCHAIN \ - --with-sysroot=$SYSROOT_PREFIX \ - --with-gmp=$ROOT/$TOOLCHAIN \ - --with-mpfr=$ROOT/$TOOLCHAIN \ - --with-mpc=$ROOT/$TOOLCHAIN \ - --without-ppl \ - --without-cloog \ - --with-gnu-as \ - --with-gnu-ld \ - --enable-languages=c \ - --disable-__cxa_atexit \ - --disable-libada \ - --disable-libmudflap \ - --disable-libatomic \ - --disable-libitm \ - --disable-libsanitizer \ - --enable-gold \ - --enable-ld=default \ - --enable-plugin \ - --enable-lto \ - --disable-libquadmath \ - --disable-libssp \ - --disable-libgomp \ - --enable-cloog-backend=isl \ - --disable-shared \ - --disable-multilib \ - --disable-threads \ - --without-headers \ - --with-newlib \ - --disable-decimal-float \ - $GCC_OPTS \ - --disable-nls \ - --enable-checking=release \ - --with-default-libstdcxx-abi=gcc4-compatible" +GCC_COMMON_CONFIGURE_OPTS="--target=$TARGET_NAME \ + --with-sysroot=$SYSROOT_PREFIX \ + --with-gmp=$ROOT/$TOOLCHAIN \ + --with-mpfr=$ROOT/$TOOLCHAIN \ + --with-mpc=$ROOT/$TOOLCHAIN \ + --with-gnu-as \ + --with-gnu-ld \ + --enable-plugin \ + --enable-lto \ + --enable-gold \ + --enable-ld=default \ + --disable-multilib \ + --disable-nls \ + --enable-checking=release \ + --with-default-libstdcxx-abi=gcc4-compatible \ + --without-ppl \ + --without-cloog \ + --disable-libada \ + --disable-libmudflap \ + --disable-libatomic \ + --disable-libitm \ + --disable-libquadmath \ + --disable-libgomp \ + --disable-libmpx" -PKG_CONFIGURE_OPTS_HOST="--target=$TARGET_NAME \ - --with-sysroot=$SYSROOT_PREFIX \ - --with-gmp=$ROOT/$TOOLCHAIN \ - --with-mpfr=$ROOT/$TOOLCHAIN \ - --with-mpc=$ROOT/$TOOLCHAIN \ - --without-ppl \ - --without-cloog \ +PKG_CONFIGURE_OPTS_BOOTSTRAP="$GCC_COMMON_CONFIGURE_OPTS \ + --enable-languages=c \ + --disable-__cxa_atexit \ + --disable-libsanitizer \ + --disable-libssp \ + --enable-cloog-backend=isl \ + --disable-shared \ + --disable-threads \ + --without-headers \ + --with-newlib \ + --disable-decimal-float \ + $GCC_OPTS" + +PKG_CONFIGURE_OPTS_HOST="$GCC_COMMON_CONFIGURE_OPTS \ --enable-languages=c,c++ \ - --with-gnu-as \ - --with-gnu-ld \ --enable-__cxa_atexit \ - --disable-libada \ --enable-decimal-float \ - --disable-libmudflap \ - --disable-libssp \ - --disable-multilib \ - --disable-libatomic \ - --disable-libitm \ - --enable-gold \ - --enable-ld=default \ - --enable-plugin \ - --enable-lto \ - --disable-libquadmath \ - --disable-libgomp \ --enable-tls \ --enable-shared \ --disable-static \ @@ -105,21 +85,11 @@ PKG_CONFIGURE_OPTS_HOST="--target=$TARGET_NAME \ --disable-libstdcxx-pch \ --enable-libstdcxx-time \ --enable-clocale=gnu \ - $GCC_OPTS \ - --disable-nls \ - --enable-checking=release \ - --with-default-libstdcxx-abi=gcc4-compatible" + $GCC_OPTS" pre_configure_host() { export CXXFLAGS="$CXXFLAGS -std=gnu++98" -} - -pre_configure_bootstrap() { - setup_toolchain host -} - -makeinstall_bootstrap() { - make install + unset CPP } post_make_host() { From 6c55ec91f5c50d37f889b3421a90c7824bde1981 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH 010/141] bzip2: dont use $TARGET_* variables Signed-off-by: Stephan Raue --- packages/compress/bzip2/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/compress/bzip2/package.mk b/packages/compress/bzip2/package.mk index 2fa7bdc6a4..a215fc4d0a 100644 --- a/packages/compress/bzip2/package.mk +++ b/packages/compress/bzip2/package.mk @@ -58,7 +58,7 @@ pre_make_target() { } make_target() { - make -f Makefile-libbz2_so CC=$TARGET_CC CFLAGS="$CFLAGS -fPIC -DPIC" + make -f Makefile-libbz2_so CC=$CC CFLAGS="$CFLAGS -fPIC -DPIC" } post_make_target() { From 2564214d4c45163744e46aa84342a88148a829b0 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH 011/141] unzip: dont use $TARGET_* variables Signed-off-by: Stephan Raue --- packages/compress/unzip/package.mk | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/packages/compress/unzip/package.mk b/packages/compress/unzip/package.mk index 7788e89fc3..591f3a0a1a 100644 --- a/packages/compress/unzip/package.mk +++ b/packages/compress/unzip/package.mk @@ -34,11 +34,8 @@ PKG_IS_ADDON="no" PKG_AUTORECONF="no" make_target() { - make CC=$TARGET_CC \ - RANLIB=$TARGET_RANLIB \ - AR=$TARGET_AR \ - STRIP=$TARGET_STRIP \ - -f unix/Makefile generic LOCAL_UNZIP="$CFLAGS" + make CC=$CC RANLIB=$RANLIB AR=$AR STRIP=$STRIP \ + -f unix/Makefile generic LOCAL_UNZIP="$CFLAGS" } makeinstall_target() { From d30c34870557b3fcf3a2de7e5ae67e762ead5b3b Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH 012/141] zip: dont use $TARGET_* variables Signed-off-by: Stephan Raue --- packages/compress/zip/package.mk | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/packages/compress/zip/package.mk b/packages/compress/zip/package.mk index 1c9474a78c..b5c33edfdb 100644 --- a/packages/compress/zip/package.mk +++ b/packages/compress/zip/package.mk @@ -34,12 +34,7 @@ PKG_IS_ADDON="no" PKG_AUTORECONF="no" make_target() { - make CC=$TARGET_CC \ - CPP=${TARGET_PREFIX}cpp \ - RANLIB=$TARGET_RANLIB \ - AR=$TARGET_AR \ - STRIP=$TARGET_STRIP \ - LOCAL_ZIP="$TARGET_CFLAGS" \ + make CC=$CC CPP=$CPP RANLIB=$RANLIB AR=$AR STRIP=$STRIP LOCAL_ZIP="$CFLAGS" \ -f unix/Makefile generic } From dad241a6f4830022b59dfb823d16894d4f4cf09f Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH 013/141] boost: dont use $TARGET_* variables Signed-off-by: Stephan Raue --- packages/devel/boost/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/devel/boost/package.mk b/packages/devel/boost/package.mk index 9e90bccba6..6517ec7752 100644 --- a/packages/devel/boost/package.mk +++ b/packages/devel/boost/package.mk @@ -55,7 +55,7 @@ configure_target() { --with-bjam=$ROOT/$TOOLCHAIN/bin/bjam \ --with-python=$ROOT/$TOOLCHAIN/bin/python \ - echo "using gcc : `$TARGET_CC -v 2>&1 | tail -n 1 |awk '{print $3}'` : $TARGET_CC : \"$CFLAGS\" \"$LDFLAGS\" ;" \ + echo "using gcc : `$CC -v 2>&1 | tail -n 1 |awk '{print $3}'` : $CC : \"$CFLAGS\" \"$LDFLAGS\" ;" \ > tools/build/src/user-config.jam } From bb83eb3d13abd7fe7105983b435d0f22089a37a9 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH 014/141] libcap: dont use $TARGET_* variables Signed-off-by: Stephan Raue --- packages/devel/libcap/package.mk | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/devel/libcap/package.mk b/packages/devel/libcap/package.mk index 8b049e925f..debd9bb78f 100644 --- a/packages/devel/libcap/package.mk +++ b/packages/devel/libcap/package.mk @@ -44,9 +44,9 @@ post_unpack() { make_host() { cd $ROOT/$PKG_BUILD/.$HOST_NAME - make CC=$HOST_CC \ - AR=$HOST_AR \ - RANLIB=$HOST_RANLIB \ + make CC=$CC \ + AR=$AR \ + RANLIB=$RANLIB \ CFLAGS="$HOST_CFLAGS" \ BUILD_CC=$HOST_CC \ BUILD_CFLAGS="$HOST_CFLAGS -I$ROOT/$PKG_BUILD/libcap/include" \ @@ -57,9 +57,9 @@ make_host() { make_target() { cd $ROOT/$PKG_BUILD/.$TARGET_NAME - make CC=$TARGET_CC \ - AR=$TARGET_AR \ - RANLIB=$TARGET_RANLIB \ + make CC=$CC \ + AR=$AR \ + RANLIB=$RANLIB \ CFLAGS="$TARGET_CFLAGS" \ BUILD_CC=$HOST_CC \ BUILD_CFLAGS="$HOST_CFLAGS -I$ROOT/$PKG_BUILD/libcap/include" \ From 573bab45cc2ab39efe8a4ec4b2921f7a76f0617a Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH 015/141] Python: dont use $TARGET_* variables Signed-off-by: Stephan Raue --- packages/lang/Python/package.mk | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/packages/lang/Python/package.mk b/packages/lang/Python/package.mk index bc5e35cf8d..c633835ef7 100644 --- a/packages/lang/Python/package.mk +++ b/packages/lang/Python/package.mk @@ -93,22 +93,20 @@ pre_configure_target() { } make_target() { - make -j1 CC="$TARGET_CC" LDFLAGS="$TARGET_LDFLAGS -L." \ + make -j1 CC="$CC" LDFLAGS="$TARGET_LDFLAGS -L." \ PYTHON_DISABLE_MODULES="$PY_DISABLED_MODULES" \ PYTHON_MODULES_INCLUDE="$TARGET_INCDIR" \ PYTHON_MODULES_LIB="$TARGET_LIBDIR" } makeinstall_target() { - make -j1 CC="$TARGET_CC" \ - DESTDIR=$SYSROOT_PREFIX \ + make -j1 CC="$CC" DESTDIR=$SYSROOT_PREFIX \ PYTHON_DISABLE_MODULES="$PY_DISABLED_MODULES" \ PYTHON_MODULES_INCLUDE="$TARGET_INCDIR" \ PYTHON_MODULES_LIB="$TARGET_LIBDIR" \ install - make -j1 CC="$TARGET_CC" \ - DESTDIR=$INSTALL \ + make -j1 CC="$CC" DESTDIR=$INSTALL \ PYTHON_DISABLE_MODULES="$PY_DISABLED_MODULES" \ PYTHON_MODULES_INCLUDE="$TARGET_INCDIR" \ PYTHON_MODULES_LIB="$TARGET_LIBDIR" \ From 619c008bee4b4f45dcecb96e6d20ee6376c27db5 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH 016/141] openssh: dont use $TARGET_* variables Signed-off-by: Stephan Raue --- packages/network/openssh/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/network/openssh/package.mk b/packages/network/openssh/package.mk index 267972c396..c151f2a30b 100644 --- a/packages/network/openssh/package.mk +++ b/packages/network/openssh/package.mk @@ -50,7 +50,7 @@ PKG_CONFIGURE_OPTS_TARGET="--sysconfdir=/etc/ssh \ --without-pam" pre_configure_target() { - export LD="$TARGET_CC" + export LD="$CC" export LDFLAGS="$TARGET_CFLAGS $TARGET_LDFLAGS" } From 800995675add7cffe9c61e3461542f8403e328dc Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH 017/141] irserver: dont use $TARGET_* variables Signed-off-by: Stephan Raue --- packages/sysutils/irserver/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/sysutils/irserver/package.mk b/packages/sysutils/irserver/package.mk index d89ace661d..f321c1c6c8 100644 --- a/packages/sysutils/irserver/package.mk +++ b/packages/sysutils/irserver/package.mk @@ -39,7 +39,7 @@ elif [ "$TARGET_ARCH" = "arm" ]; then fi make_target() { - make CC=$TARGET_CC CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" $IRSERVER_BIN + make CC=$CC CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" $IRSERVER_BIN $STRIP $IRSERVER_BIN } From b97c526648b6b4405b43f5ee6f83bd15feaaca83 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH 018/141] gcc: dont use $TARGET_* variables Signed-off-by: Stephan Raue --- packages/lang/gcc/package.mk | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/packages/lang/gcc/package.mk b/packages/lang/gcc/package.mk index 352311af3a..064b461d99 100644 --- a/packages/lang/gcc/package.mk +++ b/packages/lang/gcc/package.mk @@ -98,8 +98,8 @@ post_make_host() { ln -sf libgcc_s.so.1 $TARGET_NAME/libgcc/libgcc_s.so if [ ! "$DEBUG" = yes ]; then - $TARGET_STRIP $TARGET_NAME/libgcc/libgcc_s.so* - $TARGET_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 } @@ -108,29 +108,29 @@ post_makeinstall_host() { GCC_VERSION=`$ROOT/$TOOLCHAIN/bin/${TARGET_NAME}-gcc -dumpversion` DATE="0501`echo $GCC_VERSION | sed 's/\([0-9]\)/0\1/g' | sed 's/\.//g'`" - CROSS_CC=$TARGET_CC-$GCC_VERSION - CROSS_CXX=$TARGET_CXX-$GCC_VERSION + CROSS_CC=${TARGET_PREFIX}gcc-${GCC_VERSION} + CROSS_CXX=${TARGET_PREFIX}g++-${GCC_VERSION} - rm -f $TARGET_CC + rm -f ${TARGET_PREFIX}gcc -cat > $TARGET_CC < ${TARGET_PREFIX}gcc < $TARGET_CXX < ${TARGET_PREFIX}g++ < Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH 019/141] linux: dont use $HOST_C* variables Signed-off-by: Stephan Raue --- packages/linux/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/linux/package.mk b/packages/linux/package.mk index 8bdb7cec12..f7d73cd761 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -90,8 +90,8 @@ post_patch() { KERNEL_CFG_FILE=$PKG_DIR/config/$PKG_NAME.$TARGET_ARCH.conf fi - sed -i -e "s|^HOSTCC[[:space:]]*=.*$|HOSTCC = $HOST_CC|" \ - -e "s|^HOSTCXX[[:space:]]*=.*$|HOSTCXX = $HOST_CXX|" \ + sed -i -e "s|^HOSTCC[[:space:]]*=.*$|HOSTCC = $ROOT/$TOOLCHAIN/bin/host-gcc|" \ + -e "s|^HOSTCXX[[:space:]]*=.*$|HOSTCXX = $ROOT/$TOOLCHAIN/bin/host-g++|" \ -e "s|^ARCH[[:space:]]*?=.*$|ARCH = $TARGET_KERNEL_ARCH|" \ -e "s|^CROSS_COMPILE[[:space:]]*?=.*$|CROSS_COMPILE = $TARGET_PREFIX|" \ $PKG_BUILD/Makefile From 31aef4178aced1fdcc672288695a2aa18dbc7730 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH 020/141] libcap: cleanup Signed-off-by: Stephan Raue --- packages/devel/libcap/package.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/devel/libcap/package.mk b/packages/devel/libcap/package.mk index debd9bb78f..f1d5c4e97c 100644 --- a/packages/devel/libcap/package.mk +++ b/packages/devel/libcap/package.mk @@ -48,7 +48,6 @@ make_host() { AR=$AR \ RANLIB=$RANLIB \ CFLAGS="$HOST_CFLAGS" \ - BUILD_CC=$HOST_CC \ BUILD_CFLAGS="$HOST_CFLAGS -I$ROOT/$PKG_BUILD/libcap/include" \ PAM_CAP=no \ lib=/lib \ From 16c3b47e15543842abd53d3e359ba256b5066ea8 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH 021/141] ccache: dont use $HOST_C* variables Signed-off-by: Stephan Raue --- packages/devel/ccache/package.mk | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/packages/devel/ccache/package.mk b/packages/devel/ccache/package.mk index 06c34e16c1..cc6be64a69 100644 --- a/packages/devel/ccache/package.mk +++ b/packages/devel/ccache/package.mk @@ -33,6 +33,7 @@ PKG_IS_ADDON="no" PKG_AUTORECONF="no" export CC=$LOCAL_CC +export CXX=$LOCAL_CXX PKG_CONFIGURE_OPTS_HOST="--with-bundled-zlib" @@ -40,17 +41,17 @@ post_makeinstall_host() { # setup ccache $ROOT/$TOOLCHAIN/bin/ccache --max-size=$CCACHE_CACHE_SIZE - cat > $HOST_CC < $ROOT/$TOOLCHAIN/bin/host-gcc < $HOST_CXX < $ROOT/$TOOLCHAIN/bin/host-g++ < Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH 022/141] adsp.basic: simplyfing cmake configuration Signed-off-by: Stephan Raue --- .../kodi-binary-addons/adsp.basic/package.mk | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/packages/mediacenter/kodi-binary-addons/adsp.basic/package.mk b/packages/mediacenter/kodi-binary-addons/adsp.basic/package.mk index cbf6ae0cee..9eb580882e 100644 --- a/packages/mediacenter/kodi-binary-addons/adsp.basic/package.mk +++ b/packages/mediacenter/kodi-binary-addons/adsp.basic/package.mk @@ -33,15 +33,8 @@ PKG_AUTORECONF="no" PKG_IS_ADDON="yes" PKG_ADDON_TYPE="kodi.adsp" -configure_target() { - cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \ - -DFLAC_INCLUDE_DIRS=$SYSROOT_PREFIX/usr/include \ - -DOGG_INCLUDE_DIRS=$SYSROOT_PREFIX/usr/include \ - .. -} +PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ + -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ From 7aa9f7e3a46826231d6e08c42e775a82d0226125 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH 023/141] adsp.biquad.filters: simplyfing cmake configuration Signed-off-by: Stephan Raue --- .../kodi-binary-addons/adsp.biquad.filters/package.mk | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/packages/mediacenter/kodi-binary-addons/adsp.biquad.filters/package.mk b/packages/mediacenter/kodi-binary-addons/adsp.biquad.filters/package.mk index 4bd1db390b..fbb28c837c 100644 --- a/packages/mediacenter/kodi-binary-addons/adsp.biquad.filters/package.mk +++ b/packages/mediacenter/kodi-binary-addons/adsp.biquad.filters/package.mk @@ -33,15 +33,8 @@ PKG_AUTORECONF="no" PKG_IS_ADDON="yes" PKG_ADDON_TYPE="kodi.adsp" -configure_target() { - cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \ - -DFLAC_INCLUDE_DIRS=$SYSROOT_PREFIX/usr/include \ - -DOGG_INCLUDE_DIRS=$SYSROOT_PREFIX/usr/include \ - .. -} +PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ + -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ From 0b030e18cf58f17a4c554811df0550cf0191dd48 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH 024/141] adsp.freesurround: simplyfing cmake configuration Signed-off-by: Stephan Raue --- .../kodi-binary-addons/adsp.freesurround/package.mk | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/packages/mediacenter/kodi-binary-addons/adsp.freesurround/package.mk b/packages/mediacenter/kodi-binary-addons/adsp.freesurround/package.mk index a6d78a9ef5..be2cbbef1a 100644 --- a/packages/mediacenter/kodi-binary-addons/adsp.freesurround/package.mk +++ b/packages/mediacenter/kodi-binary-addons/adsp.freesurround/package.mk @@ -33,15 +33,8 @@ PKG_AUTORECONF="no" PKG_IS_ADDON="yes" PKG_ADDON_TYPE="kodi.adsp" -configure_target() { - cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \ - -DFLAC_INCLUDE_DIRS=$SYSROOT_PREFIX/usr/include \ - -DOGG_INCLUDE_DIRS=$SYSROOT_PREFIX/usr/include \ - .. -} +PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ + -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ From 073fc38ff8e3c55c3d3dbdb9a83619be71fc79b3 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH 025/141] audiodecoder.2sf: simplyfing cmake configuration Signed-off-by: Stephan Raue --- .../kodi-binary-addons/audiodecoder.2sf/package.mk | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/packages/mediacenter/kodi-binary-addons/audiodecoder.2sf/package.mk b/packages/mediacenter/kodi-binary-addons/audiodecoder.2sf/package.mk index 860612cae0..1f9b82bcc2 100644 --- a/packages/mediacenter/kodi-binary-addons/audiodecoder.2sf/package.mk +++ b/packages/mediacenter/kodi-binary-addons/audiodecoder.2sf/package.mk @@ -33,13 +33,8 @@ PKG_AUTORECONF="no" PKG_IS_ADDON="yes" PKG_ADDON_TYPE="kodi.audiodecoder" -configure_target() { - cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \ - .. -} +PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ + -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ From fbf82f374b9c13134def270cdf590ce6a2b06983 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH 026/141] audiodecoder.asap: simplyfing cmake configuration Signed-off-by: Stephan Raue --- .../kodi-binary-addons/audiodecoder.asap/package.mk | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/packages/mediacenter/kodi-binary-addons/audiodecoder.asap/package.mk b/packages/mediacenter/kodi-binary-addons/audiodecoder.asap/package.mk index 0273fdf0fa..661070b286 100644 --- a/packages/mediacenter/kodi-binary-addons/audiodecoder.asap/package.mk +++ b/packages/mediacenter/kodi-binary-addons/audiodecoder.asap/package.mk @@ -33,13 +33,8 @@ PKG_AUTORECONF="no" PKG_IS_ADDON="yes" PKG_ADDON_TYPE="kodi.audiodecoder" -configure_target() { - cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \ - .. -} +PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ + -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ From 91aa769f29b5756ecff2d51d7b57fc211af542c1 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH 027/141] audiodecoder.dumb: simplyfing cmake configuration Signed-off-by: Stephan Raue --- .../kodi-binary-addons/audiodecoder.dumb/package.mk | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/packages/mediacenter/kodi-binary-addons/audiodecoder.dumb/package.mk b/packages/mediacenter/kodi-binary-addons/audiodecoder.dumb/package.mk index f75de56ec7..c30258eaba 100644 --- a/packages/mediacenter/kodi-binary-addons/audiodecoder.dumb/package.mk +++ b/packages/mediacenter/kodi-binary-addons/audiodecoder.dumb/package.mk @@ -33,13 +33,8 @@ PKG_AUTORECONF="no" PKG_IS_ADDON="yes" PKG_ADDON_TYPE="kodi.audiodecoder" -configure_target() { - cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \ - .. -} +PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ + -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ From bc759f7501a2a73ef81bfc64700fca10d76aecc7 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH 028/141] audiodecoder.fluidsynth: simplyfing cmake configuration Signed-off-by: Stephan Raue --- .../audiodecoder.fluidsynth/package.mk | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/packages/mediacenter/kodi-binary-addons/audiodecoder.fluidsynth/package.mk b/packages/mediacenter/kodi-binary-addons/audiodecoder.fluidsynth/package.mk index ed0553e32a..c0441161c2 100644 --- a/packages/mediacenter/kodi-binary-addons/audiodecoder.fluidsynth/package.mk +++ b/packages/mediacenter/kodi-binary-addons/audiodecoder.fluidsynth/package.mk @@ -33,13 +33,8 @@ PKG_AUTORECONF="no" PKG_IS_ADDON="yes" PKG_ADDON_TYPE="kodi.audiodecoder" -configure_target() { - cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \ - .. -} +PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ + -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ From e64c0e0c5f80bf1963e59694b12e403a73e1f0cb Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH 029/141] audiodecoder.gme: simplyfing cmake configuration Signed-off-by: Stephan Raue --- .../kodi-binary-addons/audiodecoder.gme/package.mk | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/packages/mediacenter/kodi-binary-addons/audiodecoder.gme/package.mk b/packages/mediacenter/kodi-binary-addons/audiodecoder.gme/package.mk index 40d8f78174..b7154f66a4 100644 --- a/packages/mediacenter/kodi-binary-addons/audiodecoder.gme/package.mk +++ b/packages/mediacenter/kodi-binary-addons/audiodecoder.gme/package.mk @@ -33,13 +33,8 @@ PKG_AUTORECONF="no" PKG_IS_ADDON="yes" PKG_ADDON_TYPE="kodi.audiodecoder" -configure_target() { - cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \ - .. -} +PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ + -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ From 7c3c4749e446e8999790eb2b1b0efae30dfc16ce Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH 030/141] audiodecoder.gsf: simplyfing cmake configuration Signed-off-by: Stephan Raue --- .../kodi-binary-addons/audiodecoder.gsf/package.mk | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/packages/mediacenter/kodi-binary-addons/audiodecoder.gsf/package.mk b/packages/mediacenter/kodi-binary-addons/audiodecoder.gsf/package.mk index 7596107854..52cc64faf0 100644 --- a/packages/mediacenter/kodi-binary-addons/audiodecoder.gsf/package.mk +++ b/packages/mediacenter/kodi-binary-addons/audiodecoder.gsf/package.mk @@ -33,13 +33,8 @@ PKG_AUTORECONF="no" PKG_IS_ADDON="yes" PKG_ADDON_TYPE="kodi.audiodecoder" -configure_target() { - cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \ - .. -} +PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ + -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ From 150d8c798cbe265605003d5513aa5448235292ce Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH 031/141] audiodecoder.modplug: simplyfing cmake configuration Signed-off-by: Stephan Raue --- .../kodi-binary-addons/audiodecoder.modplug/package.mk | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/packages/mediacenter/kodi-binary-addons/audiodecoder.modplug/package.mk b/packages/mediacenter/kodi-binary-addons/audiodecoder.modplug/package.mk index ec135f03dd..fb132aae49 100644 --- a/packages/mediacenter/kodi-binary-addons/audiodecoder.modplug/package.mk +++ b/packages/mediacenter/kodi-binary-addons/audiodecoder.modplug/package.mk @@ -33,13 +33,8 @@ PKG_AUTORECONF="no" PKG_IS_ADDON="yes" PKG_ADDON_TYPE="kodi.audiodecoder" -configure_target() { - cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \ - .. -} +PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ + -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ From dd2eef348130b4d6f2507ece31021ec756a9677d Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH 032/141] audiodecoder.ncsf: simplyfing cmake configuration Signed-off-by: Stephan Raue --- .../kodi-binary-addons/audiodecoder.ncsf/package.mk | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/packages/mediacenter/kodi-binary-addons/audiodecoder.ncsf/package.mk b/packages/mediacenter/kodi-binary-addons/audiodecoder.ncsf/package.mk index 03e4aaca4a..5f7a9f4765 100644 --- a/packages/mediacenter/kodi-binary-addons/audiodecoder.ncsf/package.mk +++ b/packages/mediacenter/kodi-binary-addons/audiodecoder.ncsf/package.mk @@ -33,13 +33,8 @@ PKG_AUTORECONF="no" PKG_IS_ADDON="yes" PKG_ADDON_TYPE="kodi.audiodecoder" -configure_target() { - cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \ - .. -} +PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ + -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ From 52a852a9f65e38cfa0d90b2da510defd50043866 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH 033/141] audiodecoder.nosefart: simplyfing cmake configuration Signed-off-by: Stephan Raue --- .../kodi-binary-addons/audiodecoder.nosefart/package.mk | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/packages/mediacenter/kodi-binary-addons/audiodecoder.nosefart/package.mk b/packages/mediacenter/kodi-binary-addons/audiodecoder.nosefart/package.mk index e2ebc3d28b..27041ad26e 100644 --- a/packages/mediacenter/kodi-binary-addons/audiodecoder.nosefart/package.mk +++ b/packages/mediacenter/kodi-binary-addons/audiodecoder.nosefart/package.mk @@ -33,13 +33,8 @@ PKG_AUTORECONF="no" PKG_IS_ADDON="yes" PKG_ADDON_TYPE="kodi.audiodecoder" -configure_target() { - cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \ - .. -} +PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ + -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ From 01347b4d3ce668ad8cd272e7ed77829873dae4f4 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH 034/141] audiodecoder.openmpt: simplyfing cmake configuration Signed-off-by: Stephan Raue --- .../kodi-binary-addons/audiodecoder.openmpt/package.mk | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/packages/mediacenter/kodi-binary-addons/audiodecoder.openmpt/package.mk b/packages/mediacenter/kodi-binary-addons/audiodecoder.openmpt/package.mk index 3aec6ac4ce..d29f126fba 100644 --- a/packages/mediacenter/kodi-binary-addons/audiodecoder.openmpt/package.mk +++ b/packages/mediacenter/kodi-binary-addons/audiodecoder.openmpt/package.mk @@ -33,13 +33,8 @@ PKG_AUTORECONF="no" PKG_IS_ADDON="yes" PKG_ADDON_TYPE="kodi.audiodecoder" -configure_target() { - cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \ - .. -} +PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ + -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ From f074e13eb76da18a8d901edb51e20eddbce1b3f3 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH 035/141] audiodecoder.organya: simplyfing cmake configuration Signed-off-by: Stephan Raue --- .../kodi-binary-addons/audiodecoder.organya/package.mk | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/packages/mediacenter/kodi-binary-addons/audiodecoder.organya/package.mk b/packages/mediacenter/kodi-binary-addons/audiodecoder.organya/package.mk index 3609f59259..d0133524e5 100644 --- a/packages/mediacenter/kodi-binary-addons/audiodecoder.organya/package.mk +++ b/packages/mediacenter/kodi-binary-addons/audiodecoder.organya/package.mk @@ -33,13 +33,8 @@ PKG_AUTORECONF="no" PKG_IS_ADDON="yes" PKG_ADDON_TYPE="kodi.audiodecoder" -configure_target() { - cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \ - .. -} +PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ + -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ From 77a98c90f0968e5806b23ca1ff8812fa2a06fe5a Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH 036/141] audiodecoder.qsf: simplyfing cmake configuration Signed-off-by: Stephan Raue --- .../kodi-binary-addons/audiodecoder.qsf/package.mk | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/packages/mediacenter/kodi-binary-addons/audiodecoder.qsf/package.mk b/packages/mediacenter/kodi-binary-addons/audiodecoder.qsf/package.mk index 38fb5f2e8f..cd07e32832 100644 --- a/packages/mediacenter/kodi-binary-addons/audiodecoder.qsf/package.mk +++ b/packages/mediacenter/kodi-binary-addons/audiodecoder.qsf/package.mk @@ -33,13 +33,8 @@ PKG_AUTORECONF="no" PKG_IS_ADDON="yes" PKG_ADDON_TYPE="kodi.audiodecoder" -configure_target() { - cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \ - .. -} +PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ + -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ From 125eb2cbdd2c9b072529fdd7d87aff2f43e27486 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH 037/141] audiodecoder.sidplay: simplyfing cmake configuration Signed-off-by: Stephan Raue --- .../audiodecoder.sidplay/package.mk | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/packages/mediacenter/kodi-binary-addons/audiodecoder.sidplay/package.mk b/packages/mediacenter/kodi-binary-addons/audiodecoder.sidplay/package.mk index 2bdc472b69..0ccad2b3d5 100644 --- a/packages/mediacenter/kodi-binary-addons/audiodecoder.sidplay/package.mk +++ b/packages/mediacenter/kodi-binary-addons/audiodecoder.sidplay/package.mk @@ -33,14 +33,9 @@ PKG_AUTORECONF="no" PKG_IS_ADDON="yes" PKG_ADDON_TYPE="kodi.audiodecoder" -configure_target() { - cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \ - -DSIDPLAY2_LIBRARIES=$SYSROOT_PREFIX/usr/lib \ - .. -} +PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ + -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \ + -DSIDPLAY2_LIBRARIES=$SYSROOT_PREFIX/usr/lib" addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ From 16d225639d65d41c48d2e4641a9c87e6c2102342 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH 038/141] audiodecoder.snesapu: simplyfing cmake configuration Signed-off-by: Stephan Raue --- .../kodi-binary-addons/audiodecoder.snesapu/package.mk | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/packages/mediacenter/kodi-binary-addons/audiodecoder.snesapu/package.mk b/packages/mediacenter/kodi-binary-addons/audiodecoder.snesapu/package.mk index deeab10378..a25854bab1 100644 --- a/packages/mediacenter/kodi-binary-addons/audiodecoder.snesapu/package.mk +++ b/packages/mediacenter/kodi-binary-addons/audiodecoder.snesapu/package.mk @@ -33,13 +33,8 @@ PKG_AUTORECONF="no" PKG_IS_ADDON="yes" PKG_ADDON_TYPE="kodi.audiodecoder" -configure_target() { - cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \ - .. -} +PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ + -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ From 7046d9ff6871440a922adff1ccf7511f16e61c53 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH 039/141] audiodecoder.ssf: simplyfing cmake configuration Signed-off-by: Stephan Raue --- .../kodi-binary-addons/audiodecoder.ssf/package.mk | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/packages/mediacenter/kodi-binary-addons/audiodecoder.ssf/package.mk b/packages/mediacenter/kodi-binary-addons/audiodecoder.ssf/package.mk index 6be538da5c..f23abf3c62 100644 --- a/packages/mediacenter/kodi-binary-addons/audiodecoder.ssf/package.mk +++ b/packages/mediacenter/kodi-binary-addons/audiodecoder.ssf/package.mk @@ -33,13 +33,8 @@ PKG_AUTORECONF="no" PKG_IS_ADDON="yes" PKG_ADDON_TYPE="kodi.audiodecoder" -configure_target() { - cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \ - .. -} +PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ + -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ From ff3005010c69b8ee47688ea1e58543a5edb5ffd3 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH 040/141] audiodecoder.stsound: simplyfing cmake configuration Signed-off-by: Stephan Raue --- .../kodi-binary-addons/audiodecoder.stsound/package.mk | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/packages/mediacenter/kodi-binary-addons/audiodecoder.stsound/package.mk b/packages/mediacenter/kodi-binary-addons/audiodecoder.stsound/package.mk index 489131cd1f..76463b1a53 100644 --- a/packages/mediacenter/kodi-binary-addons/audiodecoder.stsound/package.mk +++ b/packages/mediacenter/kodi-binary-addons/audiodecoder.stsound/package.mk @@ -33,13 +33,8 @@ PKG_AUTORECONF="no" PKG_IS_ADDON="yes" PKG_ADDON_TYPE="kodi.audiodecoder" -configure_target() { - cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \ - .. -} +PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ + -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ From b7d846923eef29780edae8d2ddad977629b33abe Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH 041/141] audiodecoder.timidity: simplyfing cmake configuration Signed-off-by: Stephan Raue --- .../kodi-binary-addons/audiodecoder.timidity/package.mk | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/packages/mediacenter/kodi-binary-addons/audiodecoder.timidity/package.mk b/packages/mediacenter/kodi-binary-addons/audiodecoder.timidity/package.mk index ee88d29c98..b814aedff8 100644 --- a/packages/mediacenter/kodi-binary-addons/audiodecoder.timidity/package.mk +++ b/packages/mediacenter/kodi-binary-addons/audiodecoder.timidity/package.mk @@ -33,13 +33,8 @@ PKG_AUTORECONF="no" PKG_IS_ADDON="yes" PKG_ADDON_TYPE="kodi.audiodecoder" -configure_target() { - cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \ - .. -} +PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ + -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ From a70f0a43a74b6ab9ec30939065cc2abdaa9ed8d6 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH 042/141] audiodecoder.upse: simplyfing cmake configuration Signed-off-by: Stephan Raue --- .../kodi-binary-addons/audiodecoder.upse/package.mk | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/packages/mediacenter/kodi-binary-addons/audiodecoder.upse/package.mk b/packages/mediacenter/kodi-binary-addons/audiodecoder.upse/package.mk index 485aa29400..8cdbf31dee 100644 --- a/packages/mediacenter/kodi-binary-addons/audiodecoder.upse/package.mk +++ b/packages/mediacenter/kodi-binary-addons/audiodecoder.upse/package.mk @@ -33,13 +33,8 @@ PKG_AUTORECONF="no" PKG_IS_ADDON="yes" PKG_ADDON_TYPE="kodi.audiodecoder" -configure_target() { - cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \ - .. -} +PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ + -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ From 487fde9f7173bb43ca6c1614e17fcb1c5ea2098c Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH 043/141] audiodecoder.usf: simplyfing cmake configuration Signed-off-by: Stephan Raue --- .../kodi-binary-addons/audiodecoder.usf/package.mk | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/packages/mediacenter/kodi-binary-addons/audiodecoder.usf/package.mk b/packages/mediacenter/kodi-binary-addons/audiodecoder.usf/package.mk index a8174831d6..f1d99f6a9f 100644 --- a/packages/mediacenter/kodi-binary-addons/audiodecoder.usf/package.mk +++ b/packages/mediacenter/kodi-binary-addons/audiodecoder.usf/package.mk @@ -34,13 +34,8 @@ PKG_IS_ADDON="yes" PKG_ADDON_TYPE="kodi.audiodecoder" PKG_ADDON_PROJECTS="Generic Nvidia_Legacy RPi2 imx6 WeTek_Play" -configure_target() { - cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \ - .. -} +PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ + -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ From e32a8c67f11b505c91e2b53c98127f32156d52ce Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH 044/141] audiodecoder.vgmstream: simplyfing cmake configuration Signed-off-by: Stephan Raue --- .../kodi-binary-addons/audiodecoder.vgmstream/package.mk | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/packages/mediacenter/kodi-binary-addons/audiodecoder.vgmstream/package.mk b/packages/mediacenter/kodi-binary-addons/audiodecoder.vgmstream/package.mk index 50b96aaad8..7772814c4a 100644 --- a/packages/mediacenter/kodi-binary-addons/audiodecoder.vgmstream/package.mk +++ b/packages/mediacenter/kodi-binary-addons/audiodecoder.vgmstream/package.mk @@ -33,13 +33,8 @@ PKG_AUTORECONF="no" PKG_IS_ADDON="yes" PKG_ADDON_TYPE="kodi.audiodecoder" -configure_target() { - cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \ - .. -} +PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ + -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ From 6681c5090ab611d06750b358d0f9edac14c54db1 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH 045/141] audiodecoder.wsr: simplyfing cmake configuration Signed-off-by: Stephan Raue --- .../kodi-binary-addons/audiodecoder.wsr/package.mk | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/packages/mediacenter/kodi-binary-addons/audiodecoder.wsr/package.mk b/packages/mediacenter/kodi-binary-addons/audiodecoder.wsr/package.mk index 5a84795945..a8d8570fcc 100644 --- a/packages/mediacenter/kodi-binary-addons/audiodecoder.wsr/package.mk +++ b/packages/mediacenter/kodi-binary-addons/audiodecoder.wsr/package.mk @@ -33,13 +33,8 @@ PKG_AUTORECONF="no" PKG_IS_ADDON="yes" PKG_ADDON_TYPE="kodi.audiodecoder" -configure_target() { - cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \ - .. -} +PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ + -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ From 4c572537d9fbd617e3059944ca77ae7bfaeae2e5 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH 046/141] audioencoder.flac: simplyfing cmake configuration Signed-off-by: Stephan Raue --- .../kodi-binary-addons/audioencoder.flac/package.mk | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/packages/mediacenter/kodi-binary-addons/audioencoder.flac/package.mk b/packages/mediacenter/kodi-binary-addons/audioencoder.flac/package.mk index 8dfaa07a40..75fd2bc758 100644 --- a/packages/mediacenter/kodi-binary-addons/audioencoder.flac/package.mk +++ b/packages/mediacenter/kodi-binary-addons/audioencoder.flac/package.mk @@ -33,15 +33,10 @@ PKG_AUTORECONF="no" PKG_IS_ADDON="yes" PKG_ADDON_TYPE="xbmc.audioencoder" -configure_target() { - cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \ - -DFLAC_INCLUDE_DIRS=$SYSROOT_PREFIX/usr/include \ - -DOGG_INCLUDE_DIRS=$SYSROOT_PREFIX/usr/include \ - .. -} +PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ + -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \ + -DFLAC_INCLUDE_DIRS=$SYSROOT_PREFIX/usr/include \ + -DOGG_INCLUDE_DIRS=$SYSROOT_PREFIX/usr/include" addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ From ec15ea1f7837e87b746be508c5d5380fb4451687 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH 047/141] audioencoder.lame: simplyfing cmake configuration Signed-off-by: Stephan Raue --- .../kodi-binary-addons/audioencoder.lame/package.mk | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/packages/mediacenter/kodi-binary-addons/audioencoder.lame/package.mk b/packages/mediacenter/kodi-binary-addons/audioencoder.lame/package.mk index 83e3ef0226..d3ea8fa47d 100644 --- a/packages/mediacenter/kodi-binary-addons/audioencoder.lame/package.mk +++ b/packages/mediacenter/kodi-binary-addons/audioencoder.lame/package.mk @@ -33,14 +33,9 @@ PKG_AUTORECONF="no" PKG_IS_ADDON="yes" PKG_ADDON_TYPE="xbmc.audioencoder" -configure_target() { - cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \ - -DLAME_INCLUDE_DIRS=$SYSROOT_PREFIX/usr/include \ - .. -} +PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ + -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \ + -DLAME_INCLUDE_DIRS=$SYSROOT_PREFIX/usr/include" addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ From 55ff0ef43d7170aeca4ea4e6cd2d1a5c51ee9c76 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH 048/141] audioencoder.vorbis: simplyfing cmake configuration Signed-off-by: Stephan Raue --- .../audioencoder.vorbis/package.mk | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/packages/mediacenter/kodi-binary-addons/audioencoder.vorbis/package.mk b/packages/mediacenter/kodi-binary-addons/audioencoder.vorbis/package.mk index 57123c4f94..4b64651571 100644 --- a/packages/mediacenter/kodi-binary-addons/audioencoder.vorbis/package.mk +++ b/packages/mediacenter/kodi-binary-addons/audioencoder.vorbis/package.mk @@ -33,16 +33,11 @@ PKG_AUTORECONF="no" PKG_IS_ADDON="yes" PKG_ADDON_TYPE="xbmc.audioencoder" -configure_target() { - cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \ - -DOGG_INCLUDE_DIRS=$SYSROOT_PREFIX/usr/include \ - -DVORBIS_INCLUDE_DIRS=$SYSROOT_PREFIX/usr/include \ - -DVORBISENC_INCLUDE_DIRS=$SYSROOT_PREFIX/usr/include \ - .. -} +PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ + -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \ + -DOGG_INCLUDE_DIRS=$SYSROOT_PREFIX/usr/include \ + -DVORBIS_INCLUDE_DIRS=$SYSROOT_PREFIX/usr/include \ + -DVORBISENC_INCLUDE_DIRS=$SYSROOT_PREFIX/usr/include" addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ From 250bf6a0ff3ebb2b337a67fbfc1625c3739f947a Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH 049/141] audioencoder.wav: simplyfing cmake configuration Signed-off-by: Stephan Raue --- .../kodi-binary-addons/audioencoder.wav/package.mk | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/packages/mediacenter/kodi-binary-addons/audioencoder.wav/package.mk b/packages/mediacenter/kodi-binary-addons/audioencoder.wav/package.mk index 88d95c3dd9..6b19f00685 100644 --- a/packages/mediacenter/kodi-binary-addons/audioencoder.wav/package.mk +++ b/packages/mediacenter/kodi-binary-addons/audioencoder.wav/package.mk @@ -33,13 +33,8 @@ PKG_AUTORECONF="no" PKG_IS_ADDON="yes" PKG_ADDON_TYPE="xbmc.audioencoder" -configure_target() { - cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \ - .. -} +PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ + -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ From 16f7259e163089edb47c8b95f691f507b3bab5f2 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH 050/141] inputstream.mpd: simplyfing cmake configuration Signed-off-by: Stephan Raue --- .../kodi-binary-addons/inputstream.mpd/package.mk | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/packages/mediacenter/kodi-binary-addons/inputstream.mpd/package.mk b/packages/mediacenter/kodi-binary-addons/inputstream.mpd/package.mk index df00dcaabc..106e0d80c0 100644 --- a/packages/mediacenter/kodi-binary-addons/inputstream.mpd/package.mk +++ b/packages/mediacenter/kodi-binary-addons/inputstream.mpd/package.mk @@ -28,13 +28,8 @@ PKG_LONGDESC="inputstream.mpd" PKG_IS_ADDON="yes" -configure_target() { - cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \ - .. -} +PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ + -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" post_makeinstall_target() { mkdir -p wv && cd wv From 2742e1089c8cee77fbabbbb8c613c30423ada183 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH 051/141] inputstream.rtmp: simplyfing cmake configuration Signed-off-by: Stephan Raue --- .../kodi-binary-addons/inputstream.rtmp/package.mk | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/packages/mediacenter/kodi-binary-addons/inputstream.rtmp/package.mk b/packages/mediacenter/kodi-binary-addons/inputstream.rtmp/package.mk index c8819bd704..cbdb5d3e33 100644 --- a/packages/mediacenter/kodi-binary-addons/inputstream.rtmp/package.mk +++ b/packages/mediacenter/kodi-binary-addons/inputstream.rtmp/package.mk @@ -28,13 +28,8 @@ PKG_LONGDESC="inputstream.rtmp" PKG_IS_ADDON="yes" -configure_target() { - cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \ - .. -} +PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ + -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ From 857ff685cba83bca4602f09f7c1ff6c71afc25ff Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH 052/141] inputstream.smoothstream: simplyfing cmake configuration Signed-off-by: Stephan Raue --- .../inputstream.smoothstream/package.mk | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/packages/mediacenter/kodi-binary-addons/inputstream.smoothstream/package.mk b/packages/mediacenter/kodi-binary-addons/inputstream.smoothstream/package.mk index d78751d5d3..c5d9c913c0 100644 --- a/packages/mediacenter/kodi-binary-addons/inputstream.smoothstream/package.mk +++ b/packages/mediacenter/kodi-binary-addons/inputstream.smoothstream/package.mk @@ -28,13 +28,8 @@ PKG_LONGDESC="inputstream.smoothstream" PKG_IS_ADDON="yes" -configure_target() { - cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \ - .. -} +PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ + -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ From 41743099a2611264a9e717bfe18cdacabdcc4804 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH 053/141] peripheral.joystick: simplyfing cmake configuration Signed-off-by: Stephan Raue --- .../kodi-binary-addons/peripheral.joystick/package.mk | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/packages/mediacenter/kodi-binary-addons/peripheral.joystick/package.mk b/packages/mediacenter/kodi-binary-addons/peripheral.joystick/package.mk index 8d9d37564c..fc773a77db 100644 --- a/packages/mediacenter/kodi-binary-addons/peripheral.joystick/package.mk +++ b/packages/mediacenter/kodi-binary-addons/peripheral.joystick/package.mk @@ -33,13 +33,8 @@ PKG_AUTORECONF="no" PKG_IS_ADDON="yes" PKG_ADDON_TYPE="kodi.peripheral" -configure_target() { - cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \ - .. -} +PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ + -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ From cfb343fbf118d8abf5a3238f4ab045f42fcfdb7d Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH 054/141] pvr.argustv: simplyfing cmake configuration Signed-off-by: Stephan Raue --- .../kodi-binary-addons/pvr.argustv/package.mk | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/packages/mediacenter/kodi-binary-addons/pvr.argustv/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.argustv/package.mk index a9d8ea4b88..bd0321097a 100644 --- a/packages/mediacenter/kodi-binary-addons/pvr.argustv/package.mk +++ b/packages/mediacenter/kodi-binary-addons/pvr.argustv/package.mk @@ -37,13 +37,8 @@ pre_configure_target() { CXXFLAGS="$CXXFLAGS -Wno-narrowing" } -configure_target() { - cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \ - .. -} +PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ + -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ From 000e05dc038753a910fec4897830ae0144f9bc16 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH 055/141] pvr.demo: simplyfing cmake configuration Signed-off-by: Stephan Raue --- .../mediacenter/kodi-binary-addons/pvr.demo/package.mk | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/packages/mediacenter/kodi-binary-addons/pvr.demo/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.demo/package.mk index 8650a7aaaa..cce124b57f 100644 --- a/packages/mediacenter/kodi-binary-addons/pvr.demo/package.mk +++ b/packages/mediacenter/kodi-binary-addons/pvr.demo/package.mk @@ -33,13 +33,8 @@ PKG_AUTORECONF="no" PKG_IS_ADDON="yes" PKG_ADDON_TYPE="xbmc.pvrclient" -configure_target() { - cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \ - .. -} +PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ + -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ From 5f7ac0bd6f10ddeb18a9e5864d4fd96e66d63d07 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH 056/141] pvr.dvblink: simplyfing cmake configuration Signed-off-by: Stephan Raue --- .../kodi-binary-addons/pvr.dvblink/package.mk | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/packages/mediacenter/kodi-binary-addons/pvr.dvblink/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.dvblink/package.mk index bad265b98e..9900b84c9f 100644 --- a/packages/mediacenter/kodi-binary-addons/pvr.dvblink/package.mk +++ b/packages/mediacenter/kodi-binary-addons/pvr.dvblink/package.mk @@ -33,13 +33,8 @@ PKG_AUTORECONF="no" PKG_IS_ADDON="yes" PKG_ADDON_TYPE="xbmc.pvrclient" -configure_target() { - cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \ - .. -} +PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ + -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ From 122b72fe19a4a9a605c0c3c18113348824fbe45d Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH 057/141] pvr.dvbviewer: simplyfing cmake configuration Signed-off-by: Stephan Raue --- .../kodi-binary-addons/pvr.dvbviewer/package.mk | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/packages/mediacenter/kodi-binary-addons/pvr.dvbviewer/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.dvbviewer/package.mk index c0d4d9c812..83da7992ce 100644 --- a/packages/mediacenter/kodi-binary-addons/pvr.dvbviewer/package.mk +++ b/packages/mediacenter/kodi-binary-addons/pvr.dvbviewer/package.mk @@ -33,13 +33,8 @@ PKG_AUTORECONF="no" PKG_IS_ADDON="yes" PKG_ADDON_TYPE="xbmc.pvrclient" -configure_target() { - cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \ - .. -} +PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ + -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ From 3a4cb364dc25212cdebfaffd7409e8a197626277 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH 058/141] pvr.filmon: simplyfing cmake configuration Signed-off-by: Stephan Raue --- .../mediacenter/kodi-binary-addons/pvr.filmon/package.mk | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/packages/mediacenter/kodi-binary-addons/pvr.filmon/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.filmon/package.mk index 7ced351e63..0d23ed3e82 100644 --- a/packages/mediacenter/kodi-binary-addons/pvr.filmon/package.mk +++ b/packages/mediacenter/kodi-binary-addons/pvr.filmon/package.mk @@ -33,13 +33,8 @@ PKG_AUTORECONF="no" PKG_IS_ADDON="yes" PKG_ADDON_TYPE="xbmc.pvrclient" -configure_target() { - cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \ - .. -} +PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ + -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ From 7f4fbfdf797e423c8ef5188f6e0397d0c32c06e7 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH 059/141] pvr.hdhomerun: simplyfing cmake configuration Signed-off-by: Stephan Raue --- .../kodi-binary-addons/pvr.hdhomerun/package.mk | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/packages/mediacenter/kodi-binary-addons/pvr.hdhomerun/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.hdhomerun/package.mk index ee189e3c72..e15969ad9f 100644 --- a/packages/mediacenter/kodi-binary-addons/pvr.hdhomerun/package.mk +++ b/packages/mediacenter/kodi-binary-addons/pvr.hdhomerun/package.mk @@ -33,15 +33,10 @@ PKG_AUTORECONF="no" PKG_IS_ADDON="yes" PKG_ADDON_TYPE="xbmc.pvrclient" -configure_target() { - cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \ - -DHDHOMERUN_LIBRARIES=$SYSROOT_PREFIX/usr/lib/libhdhomerun.so \ - -DHDHOMERUN_INCLUDE_DIRS=$SYSROOT_PREFIX/usr/include/hdhomerun \ - .. -} +PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ + -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \ + -DHDHOMERUN_LIBRARIES=$SYSROOT_PREFIX/usr/lib/libhdhomerun.so \ + -DHDHOMERUN_INCLUDE_DIRS=$SYSROOT_PREFIX/usr/include/hdhomerun" addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ From 21e5356a59f3d38c2236aeacbdfd2528cffd532a Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH 060/141] pvr.hts: simplyfing cmake configuration Signed-off-by: Stephan Raue --- .../mediacenter/kodi-binary-addons/pvr.hts/package.mk | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/packages/mediacenter/kodi-binary-addons/pvr.hts/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.hts/package.mk index a2eb7f73c7..89765b56af 100644 --- a/packages/mediacenter/kodi-binary-addons/pvr.hts/package.mk +++ b/packages/mediacenter/kodi-binary-addons/pvr.hts/package.mk @@ -33,13 +33,8 @@ PKG_AUTORECONF="no" PKG_IS_ADDON="yes" PKG_ADDON_TYPE="xbmc.pvrclient" -configure_target() { - cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \ - .. -} +PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ + -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ From 41e824933362a142151d8a049d7f26647adb7c6c Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH 061/141] pvr.iptvsimple: simplyfing cmake configuration Signed-off-by: Stephan Raue --- .../kodi-binary-addons/pvr.iptvsimple/package.mk | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/packages/mediacenter/kodi-binary-addons/pvr.iptvsimple/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.iptvsimple/package.mk index cdcc9f5def..f8a4761f60 100644 --- a/packages/mediacenter/kodi-binary-addons/pvr.iptvsimple/package.mk +++ b/packages/mediacenter/kodi-binary-addons/pvr.iptvsimple/package.mk @@ -33,13 +33,8 @@ PKG_AUTORECONF="no" PKG_IS_ADDON="yes" PKG_ADDON_TYPE="xbmc.pvrclient" -configure_target() { - cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \ - .. -} +PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ + -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ From cd7def208353dd644c922c57a5625ac82650fb5c Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH 062/141] pvr.mediaportal.tvserver: simplyfing cmake configuration Signed-off-by: Stephan Raue --- .../pvr.mediaportal.tvserver/package.mk | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/packages/mediacenter/kodi-binary-addons/pvr.mediaportal.tvserver/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.mediaportal.tvserver/package.mk index 52730b22df..a7cd696c9e 100644 --- a/packages/mediacenter/kodi-binary-addons/pvr.mediaportal.tvserver/package.mk +++ b/packages/mediacenter/kodi-binary-addons/pvr.mediaportal.tvserver/package.mk @@ -37,13 +37,8 @@ pre_configure_target() { CXXFLAGS="$CXXFLAGS -Wno-narrowing" } -configure_target() { - cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \ - .. -} +PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ + -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ From 9eb6c0302d55f79bd5e9b5d61edd27863ee97566 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH 063/141] pvr.mythtv: simplyfing cmake configuration Signed-off-by: Stephan Raue --- .../mediacenter/kodi-binary-addons/pvr.mythtv/package.mk | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/packages/mediacenter/kodi-binary-addons/pvr.mythtv/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.mythtv/package.mk index 21f0fce0e6..c9160305a5 100644 --- a/packages/mediacenter/kodi-binary-addons/pvr.mythtv/package.mk +++ b/packages/mediacenter/kodi-binary-addons/pvr.mythtv/package.mk @@ -33,13 +33,8 @@ PKG_AUTORECONF="no" PKG_IS_ADDON="yes" PKG_ADDON_TYPE="xbmc.pvrclient" -configure_target() { - cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \ - .. -} +PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ + -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ From df585157134a1f6a897c6ef4dd430c13955e437a Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH 064/141] pvr.nextpvr: simplyfing cmake configuration Signed-off-by: Stephan Raue --- .../kodi-binary-addons/pvr.nextpvr/package.mk | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/packages/mediacenter/kodi-binary-addons/pvr.nextpvr/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.nextpvr/package.mk index 4e5a046b47..c74aa09863 100644 --- a/packages/mediacenter/kodi-binary-addons/pvr.nextpvr/package.mk +++ b/packages/mediacenter/kodi-binary-addons/pvr.nextpvr/package.mk @@ -37,13 +37,8 @@ pre_configure_target() { CXXFLAGS="$CXXFLAGS -Wno-narrowing" } -configure_target() { - cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \ - .. -} +PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ + -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ From 0122a42a52bad10c3db62bf08bb35269110297e1 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH 065/141] pvr.njoy: simplyfing cmake configuration Signed-off-by: Stephan Raue --- .../mediacenter/kodi-binary-addons/pvr.njoy/package.mk | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/packages/mediacenter/kodi-binary-addons/pvr.njoy/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.njoy/package.mk index 9e9e789073..01428a6aa4 100644 --- a/packages/mediacenter/kodi-binary-addons/pvr.njoy/package.mk +++ b/packages/mediacenter/kodi-binary-addons/pvr.njoy/package.mk @@ -33,13 +33,8 @@ PKG_AUTORECONF="no" PKG_IS_ADDON="yes" PKG_ADDON_TYPE="xbmc.pvrclient" -configure_target() { - cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \ - .. -} +PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ + -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ From e7bdd1985b82f1b4973c4fb7a1f121723e79743d Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH 066/141] pvr.pctv: simplyfing cmake configuration Signed-off-by: Stephan Raue --- .../mediacenter/kodi-binary-addons/pvr.pctv/package.mk | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/packages/mediacenter/kodi-binary-addons/pvr.pctv/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.pctv/package.mk index ceb533db70..62a03564ed 100644 --- a/packages/mediacenter/kodi-binary-addons/pvr.pctv/package.mk +++ b/packages/mediacenter/kodi-binary-addons/pvr.pctv/package.mk @@ -33,13 +33,8 @@ PKG_AUTORECONF="no" PKG_IS_ADDON="yes" PKG_ADDON_TYPE="xbmc.pvrclient" -configure_target() { - cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \ - .. -} +PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ + -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ From 08b385aa347dfe91fe947bee3e52a1b5f4c458b9 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH 067/141] pvr.stalker: simplyfing cmake configuration Signed-off-by: Stephan Raue --- .../kodi-binary-addons/pvr.stalker/package.mk | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/packages/mediacenter/kodi-binary-addons/pvr.stalker/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.stalker/package.mk index c4751d14ea..94499caae3 100644 --- a/packages/mediacenter/kodi-binary-addons/pvr.stalker/package.mk +++ b/packages/mediacenter/kodi-binary-addons/pvr.stalker/package.mk @@ -33,13 +33,8 @@ PKG_AUTORECONF="no" PKG_IS_ADDON="yes" PKG_ADDON_TYPE="xbmc.pvrclient" -configure_target() { - cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \ - .. -} +PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ + -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ From 9016a911d1346e19bf2644dd44ad3c3134ee3461 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH 068/141] pvr.vbox: simplyfing cmake configuration Signed-off-by: Stephan Raue --- .../mediacenter/kodi-binary-addons/pvr.vbox/package.mk | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/packages/mediacenter/kodi-binary-addons/pvr.vbox/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.vbox/package.mk index c7b7e85172..fab487afe5 100644 --- a/packages/mediacenter/kodi-binary-addons/pvr.vbox/package.mk +++ b/packages/mediacenter/kodi-binary-addons/pvr.vbox/package.mk @@ -33,13 +33,8 @@ PKG_AUTORECONF="no" PKG_IS_ADDON="yes" PKG_ADDON_TYPE="xbmc.pvrclient" -configure_target() { - cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \ - .. -} +PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ + -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ From ef67e48eaeab59afca27713fb894d9f410283d24 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH 069/141] pvr.vdr.vnsi: simplyfing cmake configuration Signed-off-by: Stephan Raue --- .../kodi-binary-addons/pvr.vdr.vnsi/package.mk | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/packages/mediacenter/kodi-binary-addons/pvr.vdr.vnsi/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.vdr.vnsi/package.mk index 972b5f1a50..aef1066598 100644 --- a/packages/mediacenter/kodi-binary-addons/pvr.vdr.vnsi/package.mk +++ b/packages/mediacenter/kodi-binary-addons/pvr.vdr.vnsi/package.mk @@ -33,13 +33,8 @@ PKG_AUTORECONF="no" PKG_IS_ADDON="yes" PKG_ADDON_TYPE="xbmc.pvrclient" -configure_target() { - cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \ - .. -} +PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ + -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ From 31390b753bbc9041a0a9d1197c0409ef368cdc1b Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH 070/141] pvr.vuplus: simplyfing cmake configuration Signed-off-by: Stephan Raue --- .../mediacenter/kodi-binary-addons/pvr.vuplus/package.mk | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/packages/mediacenter/kodi-binary-addons/pvr.vuplus/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.vuplus/package.mk index ed52de19e4..7983e72a37 100644 --- a/packages/mediacenter/kodi-binary-addons/pvr.vuplus/package.mk +++ b/packages/mediacenter/kodi-binary-addons/pvr.vuplus/package.mk @@ -33,13 +33,8 @@ PKG_AUTORECONF="no" PKG_IS_ADDON="yes" PKG_ADDON_TYPE="xbmc.pvrclient" -configure_target() { - cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \ - .. -} +PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ + -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ From f687bc307e6087efd9d67e13a5409f1984b2437e Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH 071/141] pvr.wmc: simplyfing cmake configuration Signed-off-by: Stephan Raue --- .../mediacenter/kodi-binary-addons/pvr.wmc/package.mk | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/packages/mediacenter/kodi-binary-addons/pvr.wmc/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.wmc/package.mk index a1c5ea566d..c3f5789bd4 100644 --- a/packages/mediacenter/kodi-binary-addons/pvr.wmc/package.mk +++ b/packages/mediacenter/kodi-binary-addons/pvr.wmc/package.mk @@ -33,13 +33,8 @@ PKG_AUTORECONF="no" PKG_IS_ADDON="yes" PKG_ADDON_TYPE="xbmc.pvrclient" -configure_target() { - cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \ - .. -} +PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ + -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ From 5d014bcf713af157bfad5a906d3fbb475c4bac66 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH 072/141] screensaver.asteroids: simplyfing cmake configuration Signed-off-by: Stephan Raue --- .../kodi-binary-addons/screensaver.asteroids/package.mk | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/packages/mediacenter/kodi-binary-addons/screensaver.asteroids/package.mk b/packages/mediacenter/kodi-binary-addons/screensaver.asteroids/package.mk index 3ccaf3bfee..c3a5fd2583 100644 --- a/packages/mediacenter/kodi-binary-addons/screensaver.asteroids/package.mk +++ b/packages/mediacenter/kodi-binary-addons/screensaver.asteroids/package.mk @@ -37,13 +37,8 @@ if [ "$OPENGL" = "no" ] ; then exit 0 fi -configure_target() { - cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \ - .. -} +PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ + -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ From 1e23bc049ad39111c32cd9d3852ebaf144d30680 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH 073/141] screensaver.asterwave: simplyfing cmake configuration Signed-off-by: Stephan Raue --- .../kodi-binary-addons/screensaver.asterwave/package.mk | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/packages/mediacenter/kodi-binary-addons/screensaver.asterwave/package.mk b/packages/mediacenter/kodi-binary-addons/screensaver.asterwave/package.mk index 34f62ebf25..ab9edf10ea 100644 --- a/packages/mediacenter/kodi-binary-addons/screensaver.asterwave/package.mk +++ b/packages/mediacenter/kodi-binary-addons/screensaver.asterwave/package.mk @@ -37,13 +37,8 @@ if [ "$OPENGL" = "no" ] ; then exit 0 fi -configure_target() { - cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \ - .. -} +PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ + -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ From 215b75a6d2040a7cb133cf908ce42224a070c220 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH 074/141] screensaver.biogenesis: simplyfing cmake configuration Signed-off-by: Stephan Raue --- .../kodi-binary-addons/screensaver.biogenesis/package.mk | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/packages/mediacenter/kodi-binary-addons/screensaver.biogenesis/package.mk b/packages/mediacenter/kodi-binary-addons/screensaver.biogenesis/package.mk index d4b7bdaec9..27b653e485 100644 --- a/packages/mediacenter/kodi-binary-addons/screensaver.biogenesis/package.mk +++ b/packages/mediacenter/kodi-binary-addons/screensaver.biogenesis/package.mk @@ -37,13 +37,8 @@ if [ "$OPENGL" = "no" ] ; then exit 0 fi -configure_target() { - cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \ - .. -} +PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ + -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ From c9e94f3756e4c184dc86fb3675ba724e37043736 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH 075/141] screensaver.cpblobs: simplyfing cmake configuration Signed-off-by: Stephan Raue --- .../kodi-binary-addons/screensaver.cpblobs/package.mk | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/packages/mediacenter/kodi-binary-addons/screensaver.cpblobs/package.mk b/packages/mediacenter/kodi-binary-addons/screensaver.cpblobs/package.mk index 90b009ad25..8d83f60732 100644 --- a/packages/mediacenter/kodi-binary-addons/screensaver.cpblobs/package.mk +++ b/packages/mediacenter/kodi-binary-addons/screensaver.cpblobs/package.mk @@ -37,13 +37,8 @@ if [ "$OPENGL" = "no" ] ; then exit 0 fi -configure_target() { - cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \ - .. -} +PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ + -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ From dc4fc13e53da92a40114257d0e701ec34affe22b Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH 076/141] screensaver.greynetic: simplyfing cmake configuration Signed-off-by: Stephan Raue --- .../kodi-binary-addons/screensaver.greynetic/package.mk | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/packages/mediacenter/kodi-binary-addons/screensaver.greynetic/package.mk b/packages/mediacenter/kodi-binary-addons/screensaver.greynetic/package.mk index b999624675..90ec11e36f 100644 --- a/packages/mediacenter/kodi-binary-addons/screensaver.greynetic/package.mk +++ b/packages/mediacenter/kodi-binary-addons/screensaver.greynetic/package.mk @@ -37,13 +37,8 @@ if [ "$OPENGL" = "no" ] ; then exit 0 fi -configure_target() { - cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \ - .. -} +PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ + -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ From f0d6c7e8a200d6472af557f90d513eabd16d12da Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH 077/141] screensaver.matrixtrails: simplyfing cmake configuration Signed-off-by: Stephan Raue --- .../screensaver.matrixtrails/package.mk | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/packages/mediacenter/kodi-binary-addons/screensaver.matrixtrails/package.mk b/packages/mediacenter/kodi-binary-addons/screensaver.matrixtrails/package.mk index 98d46d010e..a81ec0652e 100644 --- a/packages/mediacenter/kodi-binary-addons/screensaver.matrixtrails/package.mk +++ b/packages/mediacenter/kodi-binary-addons/screensaver.matrixtrails/package.mk @@ -37,13 +37,8 @@ if [ "$OPENGL" = "no" ] ; then exit 0 fi -configure_target() { - cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \ - .. -} +PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ + -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ From c9b0a1f7f1bc0d37faea9390cdd721170e38e3ef Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH 078/141] screensaver.pingpong: simplyfing cmake configuration Signed-off-by: Stephan Raue --- .../kodi-binary-addons/screensaver.pingpong/package.mk | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/packages/mediacenter/kodi-binary-addons/screensaver.pingpong/package.mk b/packages/mediacenter/kodi-binary-addons/screensaver.pingpong/package.mk index d513424118..0a730f8482 100644 --- a/packages/mediacenter/kodi-binary-addons/screensaver.pingpong/package.mk +++ b/packages/mediacenter/kodi-binary-addons/screensaver.pingpong/package.mk @@ -37,13 +37,8 @@ if [ "$OPENGL" = "no" ] ; then exit 0 fi -configure_target() { - cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \ - .. -} +PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ + -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ From acbc8253bc17ac89673a95c5f9125fe79df3a664 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH 079/141] screensaver.pyro: simplyfing cmake configuration Signed-off-by: Stephan Raue --- .../kodi-binary-addons/screensaver.pyro/package.mk | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/packages/mediacenter/kodi-binary-addons/screensaver.pyro/package.mk b/packages/mediacenter/kodi-binary-addons/screensaver.pyro/package.mk index 7a266964be..d545367d59 100644 --- a/packages/mediacenter/kodi-binary-addons/screensaver.pyro/package.mk +++ b/packages/mediacenter/kodi-binary-addons/screensaver.pyro/package.mk @@ -37,13 +37,8 @@ if [ "$OPENGL" = "no" ] ; then exit 0 fi -configure_target() { - cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \ - .. -} +PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ + -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ From c1b53ca534958e28d036b9e429282ad370f7dc57 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH 080/141] screensaver.shadertoy: simplyfing cmake configuration Signed-off-by: Stephan Raue --- .../screensaver.shadertoy/package.mk | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/packages/mediacenter/kodi-binary-addons/screensaver.shadertoy/package.mk b/packages/mediacenter/kodi-binary-addons/screensaver.shadertoy/package.mk index e161523fed..84a14d8243 100644 --- a/packages/mediacenter/kodi-binary-addons/screensaver.shadertoy/package.mk +++ b/packages/mediacenter/kodi-binary-addons/screensaver.shadertoy/package.mk @@ -43,8 +43,11 @@ if [ "$OPENGLES_SUPPORT" = yes ]; then PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET $OPENGLES" fi -configure_target() { - if [ "$KODIPLAYER_DRIVER" = bcm2835-driver ]; then +PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ + -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" + +pre_configure_target() { + if [ "$KODIPLAYER_DRIVER" = bcm2835-firmware ]; then BCM2835_INCLUDES="-I$SYSROOT_PREFIX/usr/include/interface/vcos/pthreads/ \ -I$SYSROOT_PREFIX/usr/include/interface/vmcs_host/linux" export CFLAGS="$CFLAGS $BCM2835_INCLUDES" @@ -53,12 +56,6 @@ configure_target() { export CFLAGS="$CFLAGS -DLINUX -DEGL_API_FB" export CXXFLAGS="$CXXFLAGS -DLINUX -DEGL_API_FB" fi - - cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \ - .. } addon() { From a73a7a81d22d81eb9c5c5389f3c6c94516827382 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH 081/141] screensavers.rsxs: simplyfing cmake configuration Signed-off-by: Stephan Raue --- .../kodi-binary-addons/screensavers.rsxs/package.mk | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/packages/mediacenter/kodi-binary-addons/screensavers.rsxs/package.mk b/packages/mediacenter/kodi-binary-addons/screensavers.rsxs/package.mk index 63bce13cee..5cbfb98f45 100644 --- a/packages/mediacenter/kodi-binary-addons/screensavers.rsxs/package.mk +++ b/packages/mediacenter/kodi-binary-addons/screensavers.rsxs/package.mk @@ -37,13 +37,8 @@ if [ "$OPENGL" = "no" ] ; then exit 0 fi -configure_target() { - cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \ - .. -} +PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ + -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" addon() { for _ADDON in $PKG_BUILD/.install_pkg/usr/share/kodi/addons/* ; do From f2d000b8619a1a491a762eaebc7964a45828124f Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH 082/141] screensaver.stars: simplyfing cmake configuration Signed-off-by: Stephan Raue --- .../kodi-binary-addons/screensaver.stars/package.mk | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/packages/mediacenter/kodi-binary-addons/screensaver.stars/package.mk b/packages/mediacenter/kodi-binary-addons/screensaver.stars/package.mk index a4b2a268d0..f0332f1daa 100644 --- a/packages/mediacenter/kodi-binary-addons/screensaver.stars/package.mk +++ b/packages/mediacenter/kodi-binary-addons/screensaver.stars/package.mk @@ -37,13 +37,8 @@ if [ "$OPENGL" = "no" ] ; then exit 0 fi -configure_target() { - cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \ - .. -} +PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ + -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ From 2ca39e227c7810461dde65636e5787bbd8b37475 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH 083/141] visualization.fishbmc: simplyfing cmake configuration Signed-off-by: Stephan Raue --- .../kodi-binary-addons/visualization.fishbmc/package.mk | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/packages/mediacenter/kodi-binary-addons/visualization.fishbmc/package.mk b/packages/mediacenter/kodi-binary-addons/visualization.fishbmc/package.mk index 3bf037f866..60d30f5485 100644 --- a/packages/mediacenter/kodi-binary-addons/visualization.fishbmc/package.mk +++ b/packages/mediacenter/kodi-binary-addons/visualization.fishbmc/package.mk @@ -37,13 +37,8 @@ if [ "$OPENGL" = "no" ] ; then exit 0 fi -configure_target() { - cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \ - .. -} +PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ + -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ From 968e818c004ad38add73d63d5a7a38b5b5aae0b6 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH 084/141] visualization.goom: simplyfing cmake configuration Signed-off-by: Stephan Raue --- .../kodi-binary-addons/visualization.goom/package.mk | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/packages/mediacenter/kodi-binary-addons/visualization.goom/package.mk b/packages/mediacenter/kodi-binary-addons/visualization.goom/package.mk index d7aa48a3e0..f5b70ed6ce 100644 --- a/packages/mediacenter/kodi-binary-addons/visualization.goom/package.mk +++ b/packages/mediacenter/kodi-binary-addons/visualization.goom/package.mk @@ -37,13 +37,8 @@ if [ "$OPENGL" = "no" ] ; then exit 0 fi -configure_target() { - cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \ - .. -} +PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ + -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ From 79e4b55b8b04630300a214aa0a882b825daf7e1f Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH 085/141] visualization.projectm: simplyfing cmake configuration Signed-off-by: Stephan Raue --- .../visualization.projectm/package.mk | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/packages/mediacenter/kodi-binary-addons/visualization.projectm/package.mk b/packages/mediacenter/kodi-binary-addons/visualization.projectm/package.mk index ecb250e0c1..64d0bc8db5 100644 --- a/packages/mediacenter/kodi-binary-addons/visualization.projectm/package.mk +++ b/packages/mediacenter/kodi-binary-addons/visualization.projectm/package.mk @@ -37,18 +37,13 @@ if [ "$OPENGL" = "no" ] ; then exit 0 fi +PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ + -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" + pre_configure_target() { export LDFLAGS=`echo $LDFLAGS | sed -e "s|-Wl,--as-needed||"` } -configure_target() { - cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \ - .. -} - addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ cp -R $PKG_BUILD/.install_pkg/usr/share/kodi/addons/$PKG_NAME/* $ADDON_BUILD/$PKG_ADDON_ID/ From 753b06f1334f6eb0416f207ea65eecea25d2ca91 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH 086/141] visualization.shadertoy: simplyfing cmake configuration Signed-off-by: Stephan Raue --- .../visualization.shadertoy/package.mk | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/packages/mediacenter/kodi-binary-addons/visualization.shadertoy/package.mk b/packages/mediacenter/kodi-binary-addons/visualization.shadertoy/package.mk index 312d55cc39..4057ad2576 100644 --- a/packages/mediacenter/kodi-binary-addons/visualization.shadertoy/package.mk +++ b/packages/mediacenter/kodi-binary-addons/visualization.shadertoy/package.mk @@ -43,8 +43,11 @@ if [ "$OPENGLES_SUPPORT" = yes ]; then PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET $OPENGLES" fi -configure_target() { - if [ "$KODIPLAYER_DRIVER" = bcm2835-driver ]; then +PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ + -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" + +pre_configure_target() { + if [ "$KODIPLAYER_DRIVER" = bcm2835-firmware ]; then BCM2835_INCLUDES="-I$SYSROOT_PREFIX/usr/include/interface/vcos/pthreads/ \ -I$SYSROOT_PREFIX/usr/include/interface/vmcs_host/linux" export CFLAGS="$CFLAGS $BCM2835_INCLUDES" @@ -53,12 +56,6 @@ configure_target() { export CFLAGS="$CFLAGS -DLINUX -DEGL_API_FB" export CXXFLAGS="$CXXFLAGS -DLINUX -DEGL_API_FB" fi - - cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \ - .. } addon() { From 86f6084d85ffefc59a657058e31aca8f2bc6b2ce Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH 087/141] visualization.spectrum: simplyfing cmake configuration Signed-off-by: Stephan Raue --- .../kodi-binary-addons/visualization.spectrum/package.mk | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/packages/mediacenter/kodi-binary-addons/visualization.spectrum/package.mk b/packages/mediacenter/kodi-binary-addons/visualization.spectrum/package.mk index 9659fdb497..89d6f042bd 100644 --- a/packages/mediacenter/kodi-binary-addons/visualization.spectrum/package.mk +++ b/packages/mediacenter/kodi-binary-addons/visualization.spectrum/package.mk @@ -33,13 +33,8 @@ PKG_AUTORECONF="no" PKG_IS_ADDON="yes" PKG_ADDON_TYPE="xbmc.player.musicviz" -configure_target() { - cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \ - .. -} +PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ + -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ From 0b2e1220df5a437860f4f92d9f9b18e02e15148f Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH 088/141] visualization.vsxu: simplyfing cmake configuration Signed-off-by: Stephan Raue --- .../kodi-binary-addons/visualization.vsxu/package.mk | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/packages/mediacenter/kodi-binary-addons/visualization.vsxu/package.mk b/packages/mediacenter/kodi-binary-addons/visualization.vsxu/package.mk index 72c5f248bb..b762be0b5d 100644 --- a/packages/mediacenter/kodi-binary-addons/visualization.vsxu/package.mk +++ b/packages/mediacenter/kodi-binary-addons/visualization.vsxu/package.mk @@ -33,13 +33,8 @@ PKG_AUTORECONF="no" PKG_IS_ADDON="yes" PKG_ADDON_TYPE="xbmc.player.musicviz" -configure_target() { - cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \ - .. -} +PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ + -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ From 78ee7172aded6259a217b8f281548eac55ab5218 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH 089/141] visualization.waveform: simplyfing cmake configuration Signed-off-by: Stephan Raue --- .../kodi-binary-addons/visualization.waveform/package.mk | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/packages/mediacenter/kodi-binary-addons/visualization.waveform/package.mk b/packages/mediacenter/kodi-binary-addons/visualization.waveform/package.mk index 5b7070bc8a..b0eae6de3e 100644 --- a/packages/mediacenter/kodi-binary-addons/visualization.waveform/package.mk +++ b/packages/mediacenter/kodi-binary-addons/visualization.waveform/package.mk @@ -33,13 +33,8 @@ PKG_AUTORECONF="no" PKG_IS_ADDON="yes" PKG_ADDON_TYPE="xbmc.player.musicviz" -configure_target() { - cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \ - .. -} +PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ + -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ From 8c9f01a86fcfc55cc5643c1f62f10429214b8171 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH 090/141] asplib: simplyfing cmake configuration Signed-off-by: Stephan Raue --- packages/audio/asplib/package.mk | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/packages/audio/asplib/package.mk b/packages/audio/asplib/package.mk index e3cc452492..90e6f9c3fe 100644 --- a/packages/audio/asplib/package.mk +++ b/packages/audio/asplib/package.mk @@ -32,9 +32,4 @@ PKG_LONGDESC="asplib is a small and lightweight C++ library for digital signal p PKG_IS_ADDON="no" PKG_AUTORECONF="no" -configure_target() { - cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \ - -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_SHARED_LIBS=0 \ - -DCMAKE_CXX_FLAGS="$CXXFLAGS -DTARGET_LINUX" \ - .. -} +CXXFLAGS="$CXXFLAGS -DTARGET_LINUX" From 22d76434035fe6621d152891bc4e9a3962a4e84b Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH 091/141] fluidsynth: simplyfing cmake configuration Signed-off-by: Stephan Raue --- packages/audio/fluidsynth/package.mk | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/packages/audio/fluidsynth/package.mk b/packages/audio/fluidsynth/package.mk index 1c8134163a..19413b1a21 100644 --- a/packages/audio/fluidsynth/package.mk +++ b/packages/audio/fluidsynth/package.mk @@ -32,12 +32,7 @@ PKG_LONGDESC="FluidSynth renders midi music files as raw audio data, for playing PKG_IS_ADDON="no" PKG_AUTORECONF="no" -configure_target() { - cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DBUILD_SHARED_LIBS=0 \ - -Denable-readline=0 \ - -Denable-pulseaudio=0 \ - -Denable-libsndfile=0 \ - .. -} +PKG_CMAKE_OPTS_TARGET="-DBUILD_SHARED_LIBS=0 \ + -Denable-readline=0 \ + -Denable-pulseaudio=0 \ + -Denable-libsndfile=0" From d2282e48192758a58587bf1054a524a172ac886c Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH 092/141] libprojectM: simplyfing cmake configuration Signed-off-by: Stephan Raue --- packages/graphics/libprojectM/package.mk | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/packages/graphics/libprojectM/package.mk b/packages/graphics/libprojectM/package.mk index 146f71a1b0..f927b4a4ea 100644 --- a/packages/graphics/libprojectM/package.mk +++ b/packages/graphics/libprojectM/package.mk @@ -32,10 +32,5 @@ PKG_LONGDESC="libprojectM:" PKG_IS_ADDON="no" PKG_AUTORECONF="no" -configure_target() { - cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \ - -DBUILD_PROJECTM_STATIC=1 \ - .. -} +PKG_CMAKE_OPTS_TARGET="-DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \ + -DBUILD_PROJECTM_STATIC=1" \ No newline at end of file From e376580d7e16409880808d0d939e32b8ce8a00f2 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH 093/141] ftgl: simplyfing cmake configuration Signed-off-by: Stephan Raue --- packages/graphics/ftgl/package.mk | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/packages/graphics/ftgl/package.mk b/packages/graphics/ftgl/package.mk index 0b68f0ab3e..fe4f6f4947 100644 --- a/packages/graphics/ftgl/package.mk +++ b/packages/graphics/ftgl/package.mk @@ -32,8 +32,4 @@ PKG_LONGDESC="ftgl:" PKG_IS_ADDON="no" PKG_AUTORECONF="no" -configure_target() { - cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \ - -DOUTPUT_DIR=$SYSROOT_PREFIX/usr \ - .. -} +PKG_CMAKE_OPTS_TARGET="-DOUTPUT_DIR=$SYSROOT_PREFIX/usr" From ec348969866ebfc0bc9300fce3efc2f65bf017db Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH 094/141] vsxu: simplyfing cmake configuration Signed-off-by: Stephan Raue --- packages/graphics/vsxu/package.mk | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/packages/graphics/vsxu/package.mk b/packages/graphics/vsxu/package.mk index 6c5842c558..6ac3716718 100644 --- a/packages/graphics/vsxu/package.mk +++ b/packages/graphics/vsxu/package.mk @@ -35,19 +35,14 @@ PKG_AUTORECONF="no" export LDFLAGS="$LDFLAGS -lX11" -configure_target() { - cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_LIBDIR=/usr/lib \ - -DCMAKE_INSTALL_LIBDIR_NOARCH=/usr/lib \ - -DCMAKE_INSTALL_PREFIX_TOOLCHAIN=$SYSROOT_PREFIX/usr \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \ - -DBUILD_SHARED_LIBS=0 \ - -DVSXU_STATIC=1 \ - -DCMAKE_POSITION_INDEPENDENT_CODE=1 \ - -DCMAKE_CXX_FLAGS="-I$SYSROOT_PREFIX/usr/include/freetype2" \ - .. -} +PKG_CMAKE_OPTS_TARGET="-DCMAKE_INSTALL_LIBDIR=/usr/lib \ + -DCMAKE_INSTALL_LIBDIR_NOARCH=/usr/lib \ + -DCMAKE_INSTALL_PREFIX_TOOLCHAIN=$SYSROOT_PREFIX/usr \ + -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \ + -DBUILD_SHARED_LIBS=0 \ + -DVSXU_STATIC=1 \ + -DCMAKE_POSITION_INDEPENDENT_CODE=1 \ + -DCMAKE_CXX_FLAGS=-I$SYSROOT_PREFIX/usr/include/freetype2" post_makeinstall_target() { mkdir -p $SYSROOT_PREFIX/usr/lib/vsxu From dbedd752a265595d7aacb4e40ee4faba9e60d72f Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH 095/141] jsoncpp: simplyfing cmake configuration Signed-off-by: Stephan Raue --- packages/textproc/jsoncpp/package.mk | 6 ------ 1 file changed, 6 deletions(-) diff --git a/packages/textproc/jsoncpp/package.mk b/packages/textproc/jsoncpp/package.mk index 7ba9dfe0c0..f7a498732e 100644 --- a/packages/textproc/jsoncpp/package.mk +++ b/packages/textproc/jsoncpp/package.mk @@ -39,9 +39,3 @@ pre_configure_target() { pre_build_target() { cp $PKG_DIR/config/CMakeLists.txt $ROOT/$PKG_BUILD } - -configure_target() { - cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \ - -DCMAKE_INSTALL_PREFIX=/usr \ - .. -} From e4ba0ab931b06686fe36a6a648303b92cc1410d6 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH 096/141] tinyxml2: simplyfing cmake configuration Signed-off-by: Stephan Raue --- packages/textproc/tinyxml2/package.mk | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/packages/textproc/tinyxml2/package.mk b/packages/textproc/tinyxml2/package.mk index 04dc2bf138..c9dfb2dd91 100644 --- a/packages/textproc/tinyxml2/package.mk +++ b/packages/textproc/tinyxml2/package.mk @@ -32,17 +32,12 @@ PKG_LONGDESC="TinyXML2 is a simple, small, C++ XML parser that can be easily int PKG_IS_ADDON="no" PKG_AUTORECONF="no" +PKG_CMAKE_OPTS_TARGET="-DBUILD_SHARED_LIBS=off -DBUILD_STATIC_LIBS=on" + pre_configure_target() { export CFLAGS="$CFLAGS -fPIC" } -configure_target() { - cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DBUILD_SHARED_LIBS=off \ - .. -} - post_makeinstall_target() { rm -rf $INSTALL/usr } From 9ebc33a6f0445e7563f79dcf524b9b3e7ef661c9 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH 097/141] soxr: simplyfing cmake configuration Signed-off-by: Stephan Raue --- packages/audio/soxr/package.mk | 23 ++++------------------- 1 file changed, 4 insertions(+), 19 deletions(-) diff --git a/packages/audio/soxr/package.mk b/packages/audio/soxr/package.mk index cbd7460bff..76e811e908 100644 --- a/packages/audio/soxr/package.mk +++ b/packages/audio/soxr/package.mk @@ -33,22 +33,7 @@ PKG_LONGDESC="The SoX Resampler library performs one-dimensional sample-rate con PKG_IS_ADDON="no" PKG_AUTORECONF="no" -# package specific configure options -configure_target() { - cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DHAVE_WORDS_BIGENDIAN_EXITCODE=1 \ - -DBUILD_TESTS=0 \ - -DBUILD_EXAMPLES=1 \ - -DBUILD_SHARED_LIBS=OFF .. -} - -#post_makeinstall_target() { -# rm -rf $INSTALL/usr/bin -# # pkgconf hack -# $SED "s:\(['=\" ]\)/usr:\\1$SYSROOT_PREFIX/usr:g" $SYSROOT_PREFIX/usr/bin/taglib-config -# $SED "s:\([':\" ]\)-I/usr:\\1-I$SYSROOT_PREFIX/usr:g" $SYSROOT_PREFIX/usr/lib/pkgconfig/taglib.pc -# $SED "s:\([':\" ]\)-L/usr:\\1-L$SYSROOT_PREFIX/usr:g" $SYSROOT_PREFIX/usr/lib/pkgconfig/taglib.pc -# $SED "s:\([':\" ]\)-I/usr:\\1-I$SYSROOT_PREFIX/usr:g" $SYSROOT_PREFIX/usr/lib/pkgconfig/taglib_c.pc -# $SED "s:\([':\" ]\)-L/usr:\\1-L$SYSROOT_PREFIX/usr:g" $SYSROOT_PREFIX/usr/lib/pkgconfig/taglib_c.pc -#} +PKG_CMAKE_OPTS_TARGET="-DHAVE_WORDS_BIGENDIAN_EXITCODE=1 \ + -DBUILD_TESTS=0 \ + -DBUILD_EXAMPLES=1 \ + -DBUILD_SHARED_LIBS=OFF" From 4fb0f25424cc2e9535b4ad4735adbf81ccb039ac Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH 098/141] taglib: simplyfing cmake configuration Signed-off-by: Stephan Raue --- packages/audio/taglib/package.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/audio/taglib/package.mk b/packages/audio/taglib/package.mk index a5b71aefe8..e260282f76 100644 --- a/packages/audio/taglib/package.mk +++ b/packages/audio/taglib/package.mk @@ -32,10 +32,10 @@ PKG_LONGDESC="TagLib is a library for reading and editing the meta-data of sever PKG_IS_ADDON="no" PKG_AUTORECONF="no" -# package specific configure options -configure_target() { - cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF -DCMAKE_INSTALL_PREFIX=/usr -DENABLE_STATIC=1 .. -} +PKG_CMAKE_OPTS_TARGET="-DCMAKE_BUILD_TYPE=Release \ + -DBUILD_SHARED_LIBS=OFF \ + -DWITH_MP4=ON \ + -DWITH_ASF=ON" post_makeinstall_target() { rm -rf $INSTALL/usr/bin From 6bdee1406652d252e6265176882fe33ef74c69ec Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH 099/141] json-c: prevent from building with cmake configuration Signed-off-by: Stephan Raue --- packages/devel/json-c/package.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/devel/json-c/package.mk b/packages/devel/json-c/package.mk index 0285bb0f19..a6a79a5a96 100644 --- a/packages/devel/json-c/package.mk +++ b/packages/devel/json-c/package.mk @@ -31,6 +31,7 @@ PKG_SHORTDESC="json-c" PKG_LONGDESC="JSON-C implements a reference counting object model that allows you to easily construct JSON objects in C, output them as JSON formatted strings and parse JSON formatted strings back into the C representation of JSON objects" PKG_IS_ADDON="no" +PKG_USE_CMAKE="no" PKG_AUTORECONF="yes" PKG_CONFIGURE_OPTS_TARGET="ac_cv_func_realloc_0_nonnull=yes \ From e105abb68ee521091b33637b34adb923f8d3cb91 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH 100/141] libcec: simplyfing cmake configuration Signed-off-by: Stephan Raue --- packages/devel/libcec/package.mk | 34 ++++++++++++++------------------ 1 file changed, 15 insertions(+), 19 deletions(-) diff --git a/packages/devel/libcec/package.mk b/packages/devel/libcec/package.mk index 1b4ba9d897..e59e2939b0 100644 --- a/packages/devel/libcec/package.mk +++ b/packages/devel/libcec/package.mk @@ -32,28 +32,34 @@ PKG_LONGDESC="libCEC is an open-source dual licensed library designed for commun PKG_IS_ADDON="no" PKG_AUTORECONF="no" -if [ "$KODIPLAYER_DRIVER" = "bcm2835-driver" ]; then - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET bcm2835-driver" +PKG_CMAKE_OPTS_TARGET="-DBUILD_SHARED_LIBS=1 \ + -DCMAKE_INSTALL_LIBDIR=/usr/lib \ + -DCMAKE_INSTALL_LIBDIR_NOARCH=/usr/lib \ + -DCMAKE_INSTALL_PREFIX_TOOLCHAIN=$SYSROOT_PREFIX/usr \ + -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" + +if [ "$KODIPLAYER_DRIVER" = "bcm2835-firmware" ]; then + PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET bcm2835-firmware" fi if [ "$KODIPLAYER_DRIVER" = "libfslvpuwrap" ]; then - EXTRA_CMAKE_OPTS="$EXTRA_CMAKE_OPTS -DHAVE_IMX_API=1" + PKG_CMAKE_OPTS_TARGET="$PKG_CMAKE_OPTS_TARGET -DHAVE_IMX_API=1" else - EXTRA_CMAKE_OPTS="$EXTRA_CMAKE_OPTS -DHAVE_IMX_API=0" + PKG_CMAKE_OPTS_TARGET="$PKG_CMAKE_OPTS_TARGET -DHAVE_IMX_API=0" fi if [ "$KODIPLAYER_DRIVER" = "libamcodec" ]; then if [ "$TARGET_ARCH" = "aarch64" ]; then - EXTRA_CMAKE_OPTS="$EXTRA_CMAKE_OPTS -DHAVE_AOCEC_API=1" + PKG_CMAKE_OPTS_TARGET="$PKG_CMAKE_OPTS_TARGET -DHAVE_AOCEC_API=1" else - EXTRA_CMAKE_OPTS="$EXTRA_CMAKE_OPTS -DHAVE_AMLOGIC_API=1" + PKG_CMAKE_OPTS_TARGET="$PKG_CMAKE_OPTS_TARGET -DHAVE_AMLOGIC_API=1" fi else - EXTRA_CMAKE_OPTS="$EXTRA_CMAKE_OPTS -DHAVE_AOCEC_API=0 -DHAVE_AMLOGIC_API=0" + PKG_CMAKE_OPTS_TARGET="$PKG_CMAKE_OPTS_TARGET -DHAVE_AOCEC_API=0 -DHAVE_AMLOGIC_API=0" fi -configure_target() { - if [ "$KODIPLAYER_DRIVER" = "bcm2835-driver" ]; then +pre_configure_target() { + if [ "$KODIPLAYER_DRIVER" = "bcm2835-firmware" ]; then export CXXFLAGS="$CXXFLAGS \ -I$SYSROOT_PREFIX/usr/include/interface/vcos/pthreads/ \ -I$SYSROOT_PREFIX/usr/include/interface/vmcs_host/linux" @@ -61,16 +67,6 @@ configure_target() { # detecting RPi support fails without -lvchiq_arm export LDFLAGS="$LDFLAGS -lvchiq_arm" fi - - cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \ - -DBUILD_SHARED_LIBS=1 \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_LIBDIR=/usr/lib \ - -DCMAKE_INSTALL_LIBDIR_NOARCH=/usr/lib \ - -DCMAKE_INSTALL_PREFIX_TOOLCHAIN=$SYSROOT_PREFIX/usr \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \ - $EXTRA_CMAKE_OPTS \ - .. } post_makeinstall_target() { From 3e30f0db4bfd95d37a296393ac1279a50acc7dcf Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH 101/141] curl: prevent from building with cmake configuration Signed-off-by: Stephan Raue --- packages/web/curl/package.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/web/curl/package.mk b/packages/web/curl/package.mk index 2d62c2209f..ec7dc35722 100644 --- a/packages/web/curl/package.mk +++ b/packages/web/curl/package.mk @@ -38,6 +38,7 @@ PKG_SHORTDESC="curl: Client and library for (HTTP, HTTPS, FTP, ...) transfers" PKG_LONGDESC="Curl is a client to get documents/files from or send documents to a server, using any of the supported protocols (HTTP, HTTPS, FTP, FTPS, GOPHER, DICT, TELNET, LDAP or FILE). The command is designed to work without user interaction or any kind of interactivity." PKG_IS_ADDON="no" +PKG_USE_CMAKE="no" PKG_AUTORECONF="yes" PKG_CONFIGURE_OPTS_TARGET="ac_cv_lib_rtmp_RTMP_Init=yes \ From adb9753aad05b8687038fc9b25d94aac0258e3fd Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH 102/141] libjpeg-turbo: prevent from building with cmake configuration Signed-off-by: Stephan Raue --- packages/graphics/libjpeg-turbo/package.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/graphics/libjpeg-turbo/package.mk b/packages/graphics/libjpeg-turbo/package.mk index 65f36e3d40..fe4574e76f 100644 --- a/packages/graphics/libjpeg-turbo/package.mk +++ b/packages/graphics/libjpeg-turbo/package.mk @@ -30,6 +30,7 @@ PKG_SHORTDESC="libjpeg-turbo: a high-speed version of libjpeg for x86 and x86-64 PKG_LONGDESC="libjpeg-turbo is a high-speed version of libjpeg for x86 and x86-64 processors which uses SIMD instructions (MMX, SSE2, etc.) to accelerate baseline JPEG compression and decompression. libjpeg-turbo is generally 2-4x as fast as the unmodified version of libjpeg, all else being equal." PKG_IS_ADDON="no" +PKG_USE_CMAKE="no" PKG_AUTORECONF="yes" PKG_CONFIGURE_OPTS_HOST="--enable-static \ From b36594cb6705c7dc38e9975d2fc4659b0f82422c Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH 103/141] pcre: prevent from building with cmake configuration Signed-off-by: Stephan Raue --- packages/devel/pcre/package.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/devel/pcre/package.mk b/packages/devel/pcre/package.mk index 2695bb55c8..90888afb5d 100644 --- a/packages/devel/pcre/package.mk +++ b/packages/devel/pcre/package.mk @@ -31,6 +31,7 @@ PKG_SHORTDESC="pcre: Perl Compatible Regulat Expressions" PKG_LONGDESC="The PCRE library is a set of functions that implement regular expression pattern matching using the same syntax and semantics as Perl 5. PCRE has its own native API, as well as a set of wrapper functions that correspond to the POSIX regular expression API. The PCRE library is free, even for building commercial software." PKG_IS_ADDON="no" +PKG_USE_CMAKE="no" PKG_AUTORECONF="yes" PKG_CONFIGURE_OPTS_HOST="--prefix=$ROOT/$TOOLCHAIN \ From c57cef2c8e5287951d51279717a1b7ecd2521111 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH 104/141] yajl: simplyfing cmake configuration Signed-off-by: Stephan Raue --- packages/devel/yajl/package.mk | 6 ------ 1 file changed, 6 deletions(-) diff --git a/packages/devel/yajl/package.mk b/packages/devel/yajl/package.mk index 889208b802..31d9c02938 100644 --- a/packages/devel/yajl/package.mk +++ b/packages/devel/yajl/package.mk @@ -32,12 +32,6 @@ PKG_LONGDESC="Yet Another JSON Library (YAJL) is a small event-driven (SAX-style PKG_IS_ADDON="no" PKG_AUTORECONF="no" -configure_target() { - cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \ - -DCMAKE_INSTALL_PREFIX=/usr \ - .. -} - post_makeinstall_target() { mv $SYSROOT_PREFIX/usr/lib/libyajl_s.a $SYSROOT_PREFIX/usr/lib/libyajl.a rm $SYSROOT_PREFIX/usr/lib/libyajl.so* From 9431e8b12322cde5b7a6757c8eb37bba534a8be0 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH 105/141] libftdi1: simplyfing cmake configuration Signed-off-by: Stephan Raue --- packages/devel/libftdi1/package.mk | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/packages/devel/libftdi1/package.mk b/packages/devel/libftdi1/package.mk index eebb6e973c..933cad3785 100644 --- a/packages/devel/libftdi1/package.mk +++ b/packages/devel/libftdi1/package.mk @@ -32,16 +32,11 @@ PKG_LONGDESC="libFTDI is an open source library to talk to FTDI chips" PKG_IS_ADDON="no" PKG_AUTORECONF="no" -configure_target() { - cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DSTATICLIBS=ON \ - -DDOCUMENTATION=FALSE \ - -DEXAMPLES=FALSE \ - -DFTDIPP=FALSE \ - -DPYTHON_BINDINGS=FALSE \ - .. -} +PKG_CMAKE_OPTS_TARGET="-DSTATICLIBS=ON \ + -DDOCUMENTATION=FALSE \ + -DEXAMPLES=FALSE \ + -DFTDIPP=FALSE \ + -DPYTHON_BINDINGS=FALSE" pre_configure_target() { CFLAGS="$CFLAGS -fPIC -DPIC" From f2ffd1b3de3883fc7fc0c39a64f915917b225f9b Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH 106/141] dvbhdhomerun: simplyfing cmake configuration Signed-off-by: Stephan Raue --- .../linux-drivers/dvbhdhomerun/package.mk | 24 ++++++++++--------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/packages/linux-drivers/dvbhdhomerun/package.mk b/packages/linux-drivers/dvbhdhomerun/package.mk index 5a38c12387..2c685d6ec0 100644 --- a/packages/linux-drivers/dvbhdhomerun/package.mk +++ b/packages/linux-drivers/dvbhdhomerun/package.mk @@ -35,23 +35,25 @@ PKG_LONGDESC="A linux DVB driver for the HDHomeRun TV tuner (http://www.silicond PKG_IS_ADDON="no" PKG_AUTORECONF="no" -configure_target() { - ( cd kernel +PKG_CMAKE_SCRIPT="userhdhomerun/CMakeLists.txt" + +pre_make_target() { + ( cd ../kernel LDFLAGS="" make dvb_hdhomerun KERNEL_DIR=$(kernel_path) fix_module_depends dvb_hdhomerun_core.ko "dvb_core" ) +} + +pre_configure_target() { + +# use it here to be sure libhdhomerun is already built + PKG_CMAKE_OPTS_TARGET="-DLIBHDHOMERUN_PATH=$(ls -d $ROOT/$BUILD/libhdhomerun-*/)" # absolute path LIBHDHOMERUN_PATH=$(ls -d $ROOT/$BUILD/libhdhomerun-*/) - sed -i "s|SET(LIBHDHOMERUN_PATH .*)|SET(LIBHDHOMERUN_PATH $LIBHDHOMERUN_PATH)|g" userhdhomerun/CMakeLists.txt - sed -i "s|/etc/dvbhdhomerun|/tmp/dvbhdhomerun|g" userhdhomerun/hdhomerun_tuner.cpp - sed -i "s|/etc/dvbhdhomerun|/tmp/dvbhdhomerun|g" userhdhomerun/hdhomerun_controller.cpp - - mkdir -p .$TARGET_NAME && cd .$TARGET_NAME - cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DLIBHDHOMERUN_PATH=$(ls -d $ROOT/$BUILD/libhdhomerun-*/) \ - ../userhdhomerun + sed -i "s|SET(LIBHDHOMERUN_PATH .*)|SET(LIBHDHOMERUN_PATH $LIBHDHOMERUN_PATH)|g" ../userhdhomerun/CMakeLists.txt + sed -i "s|/etc/dvbhdhomerun|/tmp/dvbhdhomerun|g" ../userhdhomerun/hdhomerun_tuner.cpp + sed -i "s|/etc/dvbhdhomerun|/tmp/dvbhdhomerun|g" ../userhdhomerun/hdhomerun_controller.cpp } makeinstall_target() { From 8a73d1d262fe2e306961da6133977695f8596579 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH 107/141] libssh: simplyfing cmake configuration Signed-off-by: Stephan Raue --- packages/network/libssh/package.mk | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/packages/network/libssh/package.mk b/packages/network/libssh/package.mk index 9d4114a061..c129037088 100644 --- a/packages/network/libssh/package.mk +++ b/packages/network/libssh/package.mk @@ -32,14 +32,7 @@ PKG_LONGDESC="The ssh library was designed to be used by programmers needing a w PKG_IS_ADDON="no" PKG_AUTORECONF="no" -configure_target() { - cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DWITH_STATIC_LIB=1 \ - -DWITH_SERVER="OFF" \ - -DWITH_GCRYPT="OFF" \ - .. -} +PKG_CMAKE_OPTS_TARGET="-DWITH_STATIC_LIB=1 -DWITH_SERVER=OFF -DWITH_GCRYPT=OFF" makeinstall_target() { # install static library only From 3b037295ef8e6c48fd71f33097b355e2760c4eb2 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH 108/141] p8-platform: simplyfing cmake configuration Signed-off-by: Stephan Raue --- packages/mediacenter/p8-platform/package.mk | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/packages/mediacenter/p8-platform/package.mk b/packages/mediacenter/p8-platform/package.mk index 2b8a8a53ec..2c8eba2bd6 100644 --- a/packages/mediacenter/p8-platform/package.mk +++ b/packages/mediacenter/p8-platform/package.mk @@ -33,16 +33,11 @@ PKG_LONGDESC="Platform support library used by libCEC and binary add-ons for Kod PKG_IS_ADDON="no" PKG_AUTORECONF="no" -configure_target() { - cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_LIBDIR=/usr/lib \ - -DCMAKE_INSTALL_LIBDIR_NOARCH=/usr/lib \ - -DCMAKE_INSTALL_PREFIX_TOOLCHAIN=$SYSROOT_PREFIX/usr \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \ - -DBUILD_SHARED_LIBS=0 \ - .. -} +PKG_CMAKE_OPTS_TARGET="-DCMAKE_INSTALL_LIBDIR=/usr/lib \ + -DCMAKE_INSTALL_LIBDIR_NOARCH=/usr/lib \ + -DCMAKE_INSTALL_PREFIX_TOOLCHAIN=$SYSROOT_PREFIX/usr \ + -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \ + -DBUILD_SHARED_LIBS=0" post_makeinstall_target() { rm -rf $INSTALL/usr From 14927c4ba1f923c5e3d86ecdd3d5e84be11e6bb4 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH 109/141] SDL2: prevent from building with cmake configuration Signed-off-by: Stephan Raue --- packages/multimedia/SDL2/package.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/multimedia/SDL2/package.mk b/packages/multimedia/SDL2/package.mk index f2f8b05d30..f213ec7b8a 100644 --- a/packages/multimedia/SDL2/package.mk +++ b/packages/multimedia/SDL2/package.mk @@ -30,6 +30,7 @@ PKG_SHORTDESC="SDL2: A cross-platform Graphic API" PKG_LONGDESC="Simple DirectMedia Layer is a cross-platform multimedia library designed to provide fast access to the graphics framebuffer and audio device. It is used by MPEG playback software, emulators, and many popular games, including the award winning Linux port of 'Civilization: Call To Power.' Simple DirectMedia Layer supports Linux, Win32, BeOS, MacOS, Solaris, IRIX, and FreeBSD." PKG_IS_ADDON="no" +PKG_USE_CMAKE="no" PKG_AUTORECONF="no" PKG_CONFIGURE_OPTS_TARGET="--disable-shared --enable-static \ From 69b1e52d3d1ebe46a4ae3005ffafb85987f2b170 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH 110/141] kodi-platform: simplyfing cmake configuration Signed-off-by: Stephan Raue --- packages/mediacenter/kodi-platform/package.mk | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/packages/mediacenter/kodi-platform/package.mk b/packages/mediacenter/kodi-platform/package.mk index 1ac993fa60..e14f93b7ca 100644 --- a/packages/mediacenter/kodi-platform/package.mk +++ b/packages/mediacenter/kodi-platform/package.mk @@ -32,15 +32,10 @@ PKG_LONGDESC="kodi-platform:" PKG_IS_ADDON="no" PKG_AUTORECONF="no" -configure_target() { - cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_PREFIX_TOOLCHAIN=$SYSROOT_PREFIX/usr \ - -DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \ - -DBUILD_SHARED_LIBS=0 \ - .. -} +PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ + -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \ + -DCMAKE_INSTALL_PREFIX_TOOLCHAIN=$SYSROOT_PREFIX/usr \ + -DBUILD_SHARED_LIBS=0" post_makeinstall_target() { rm -rf $INSTALL/usr/lib/kodiplatform From 118b8bfb18982b66de1844276facfbdc1ec5b6db Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH 111/141] lzo: use cmake configuration Signed-off-by: Stephan Raue --- packages/compress/lzo/package.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/compress/lzo/package.mk b/packages/compress/lzo/package.mk index ce8d71760f..cbc1fb22cf 100644 --- a/packages/compress/lzo/package.mk +++ b/packages/compress/lzo/package.mk @@ -31,7 +31,7 @@ PKG_SHORTDESC="LZO data compressor" PKG_LONGDESC="LZO is a data compression library which is suitable for data de-/compression in real-time. This means it favours speed over compression ratio." PKG_IS_ADDON="no" -PKG_AUTORECONF="yes" +PKG_AUTORECONF="no" -PKG_CONFIGURE_OPTS_HOST="--disable-shared --enable-static" -PKG_CONFIGURE_OPTS_TARGET="--disable-shared --enable-static" +PKG_CMAKE_OPTS_HOST="-DENABLE_SHARED=OFF -DENABLE_STATIC=ON" +PKG_CMAKE_OPTS_TARGET="-DENABLE_SHARED=OFF -DENABLE_STATIC=ON" From b902d7c6bf3e0db30e802a3a92b5fc36447aabba Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH 112/141] yasm: use cmake configuration Signed-off-by: Stephan Raue --- packages/lang/yasm/package.mk | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/packages/lang/yasm/package.mk b/packages/lang/yasm/package.mk index cfeaa18e1f..55a8dca439 100644 --- a/packages/lang/yasm/package.mk +++ b/packages/lang/yasm/package.mk @@ -23,7 +23,7 @@ PKG_ARCH="any" PKG_LICENSE="BSD" PKG_SITE="http://www.tortall.net/projects/yasm/" PKG_URL="http://www.tortall.net/projects/yasm/releases/$PKG_NAME-$PKG_VERSION.tar.gz" -PKG_DEPENDS_HOST="" +PKG_DEPENDS_HOST="cmake:host" PKG_PRIORITY="optional" PKG_SECTION="toolchain/lang" PKG_SHORTDESC="yasm: A complete rewrite of the NASM assembler" @@ -32,15 +32,6 @@ PKG_LONGDESC="Yasm is a complete rewrite of the NASM assembler under the new BSD PKG_IS_ADDON="no" PKG_AUTORECONF="no" -PKG_CONFIGURE_OPTS_HOST="--disable-debug \ - --disable-warnerror \ - --disable-profiling \ - --disable-gcov \ - --disable-python \ - --disable-python-bindings \ - --enable-nls \ - --disable-rpath \ - --without-dmalloc \ - --with-gnu-ld \ - --without-libiconv-prefix \ - --without-libintl-prefix" +PKG_CMAKE_OPTS_HOST="-DBUILD_SHARED_LIBS=ON \ + -DENABLE_NLS=OFF \ + -DYASM_BUILD_TESTS=OFF" From 8379bf0705fff236af1dc7daf9971f379412fca1 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH 113/141] expat: use cmake configuration Signed-off-by: Stephan Raue --- packages/textproc/expat/package.mk | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/packages/textproc/expat/package.mk b/packages/textproc/expat/package.mk index 2f5d758b98..afb6e6f041 100644 --- a/packages/textproc/expat/package.mk +++ b/packages/textproc/expat/package.mk @@ -30,9 +30,11 @@ PKG_SHORTDESC="expat: XML parser library" PKG_LONGDESC="Expat is an XML parser library written in C. It is a stream-oriented parser in which an application registers handlers for things the parser might find in the XML document (like start tags). An introductory article on using Expat is available on xml.com." PKG_IS_ADDON="no" -PKG_AUTORECONF="yes" +PKG_AUTORECONF="no" -post_makeinstall_target() { - rm -rf $INSTALL/usr/bin +PKG_CMAKE_OPTS_TARGET="-DBUILD_tools=OFF -DBUILD_examples=OFF -DBUILD_tests=OFF -DBUILD_shared=ON" + +pre_make_target() { + # fix builderror when building in subdirs + cp -r ../doc . } - From 3c5fe20bf18203c1db71bdb7d4f4b1faacb67745 Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH 114/141] libressl: prevent from building with cmake configuration --- packages/security/libressl/package.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/security/libressl/package.mk b/packages/security/libressl/package.mk index d36485bdce..8585364767 100644 --- a/packages/security/libressl/package.mk +++ b/packages/security/libressl/package.mk @@ -30,6 +30,7 @@ PKG_SHORTDESC="libressl: a FREE version of the SSL/TLS protocol forked from Open PKG_LONGDESC="LibreSSL is a FREE version of the SSL/TLS protocol forked from OpenSSL" PKG_IS_ADDON="no" +PKG_USE_CMAKE="no" PKG_AUTORECONF="yes" post_makeinstall_target() { From b95d8b41c4201d678274f78c96684d5e9343b2fa Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH 115/141] zlib: use cmake configuration --- packages/compress/zlib/package.mk | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/packages/compress/zlib/package.mk b/packages/compress/zlib/package.mk index a1f74b347a..5b8b074857 100644 --- a/packages/compress/zlib/package.mk +++ b/packages/compress/zlib/package.mk @@ -33,37 +33,25 @@ PKG_LONGDESC="zlib is a general purpose data compression library. All the code i PKG_IS_ADDON="no" PKG_AUTORECONF="no" -TARGET_CONFIGURE_OPTS="--prefix=/usr" -HOST_CONFIGURE_OPTS="--prefix=$ROOT/$TOOLCHAIN" - post_configure_target() { ## configure minizip ( - cd $ROOT/$PKG_BUILD/.$TARGET_NAME/contrib/minizip + cd $ROOT/$PKG_BUILD/contrib/minizip rm Makefile export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:../../" do_autoreconf + cp $ROOT/$PKG_BUILD/.$TARGET_NAME/zconf.h ./ ./configure --host=$TARGET_NAME --build=$HOST_NAME $TARGET_CONFIGURE_OPTS --disable-shared --enable-static ) } -pre_build_target() { - mkdir -p $PKG_BUILD/.$TARGET_NAME - cp -RP $PKG_BUILD/* $PKG_BUILD/.$TARGET_NAME -} - -pre_build_host() { - mkdir -p $PKG_BUILD/.$HOST_NAME - cp -RP $PKG_BUILD/* $PKG_BUILD/.$HOST_NAME -} - post_make_target() { # make minizip - make -C $ROOT/$PKG_BUILD/.$TARGET_NAME/contrib/minizip + make -C $ROOT/$PKG_BUILD/contrib/minizip } post_makeinstall_target() { # Install minizip - make -C $ROOT/$PKG_BUILD/.$TARGET_NAME/contrib/minizip DESTDIR=$SYSROOT_PREFIX install + make -C $ROOT/$PKG_BUILD/contrib/minizip DESTDIR=$SYSROOT_PREFIX install } From dbc1ea3833480b22bf642edea6d1b4fdc68907ba Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH 116/141] moonlight-embedded: use cmake configuration --- .../addon-depends/moonlight-embedded/package.mk | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/packages/addons/addon-depends/moonlight-embedded/package.mk b/packages/addons/addon-depends/moonlight-embedded/package.mk index 926e74875b..dc837d5ab5 100644 --- a/packages/addons/addon-depends/moonlight-embedded/package.mk +++ b/packages/addons/addon-depends/moonlight-embedded/package.mk @@ -44,19 +44,16 @@ elif [ "$DISPLAYSERVER" = "x11" ]; then PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET libvdpau SDL2 ffmpeg libxcb" fi +PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ + -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \ + $FREESCALE_V4L_INCLUDE" + pre_build_target() { cp -a $(get_build_dir moonlight-common-c)/* $ROOT/$PKG_BUILD/third_party/moonlight-common-c } -configure_target() { - [ "$PROJECT" = "imx6" ] && strip_gold - - cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_LIBDIR=/usr/lib \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \ - $FREESCALE_V4L_INCLUDE \ - .. +pre_configure_target() { + [ "$PROJECT" = "imx6" ] && strip_gold || true } makeinstall_target() { From 7347ef76b7e3fd1ef606818ee952fad15f2fbcd0 Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH 117/141] mysql: simplify cmake configuration --- packages/databases/mysql/package.mk | 83 +++++++++---------- ...le-comp_err-even-when-crosscompiling.patch | 18 ++++ ...le-comp_sql-even-when-crosscompiling.patch | 17 ++++ 3 files changed, 72 insertions(+), 46 deletions(-) create mode 100644 packages/databases/mysql/patches/mysql-0003-compile-comp_err-even-when-crosscompiling.patch create mode 100644 packages/databases/mysql/patches/mysql-0004-compile-comp_sql-even-when-crosscompiling.patch diff --git a/packages/databases/mysql/package.mk b/packages/databases/mysql/package.mk index 9a5c8dc54a..0c557dfa0b 100644 --- a/packages/databases/mysql/package.mk +++ b/packages/databases/mysql/package.mk @@ -43,23 +43,22 @@ post_unpack() { sed -i '/^IF(NOT BOOST_MINOR_VERSION.*$/,/^ENDIF()$/d' $ROOT/$PKG_BUILD/cmake/boost.cmake } -configure_host() { - cmake -DCMAKE_PREFIX_PATH=$ROOT/$TOOLCHAIN/ \ - -DCMAKE_BUILD_TYPE=Release \ - -DWITHOUT_SERVER=OFF \ - -DWITH_EMBEDDED_SERVER=OFF \ - -DWITH_INNOBASE_STORAGE_ENGINE=OFF \ - -DWITH_PARTITION_STORAGE_ENGINE=OFF \ - -DWITH_PERFSCHEMA_STORAGE_ENGINE=OFF \ - -DWITH_EXTRA_CHARSETS=none \ - -DWITH_EDITLINE=bundled \ - -DWITH_LIBEVENT=bundled \ - -DDOWNLOAD_BOOST=0 \ - -DLOCAL_BOOST_DIR=$(get_build_dir boost) \ - -DWITH_UNIT_TESTS=OFF \ - -DWITH_ZLIB=bundled \ - .. -} +PKG_CMAKE_OPTS_HOST="-DCMAKE_BUILD_TYPE=Release \ + -DSTACK_DIRECTION=-1 \ + -DHAVE_LLVM_LIBCPP_EXITCODE=0 \ + -DHAVE_FALLOC_PUNCH_HOLE_AND_KEEP_SIZE_EXITCODE=0 \ + -DWITHOUT_SERVER=OFF \ + -DWITH_EMBEDDED_SERVER=OFF \ + -DWITH_INNOBASE_STORAGE_ENGINE=OFF \ + -DWITH_PARTITION_STORAGE_ENGINE=OFF \ + -DWITH_PERFSCHEMA_STORAGE_ENGINE=OFF \ + -DWITH_EXTRA_CHARSETS=none \ + -DWITH_EDITLINE=bundled \ + -DWITH_LIBEVENT=bundled \ + -DDOWNLOAD_BOOST=0 \ + -DLOCAL_BOOST_DIR=$(get_build_dir boost) \ + -DWITH_UNIT_TESTS=OFF \ + -DWITH_ZLIB=bundled" make_host() { make comp_err @@ -78,40 +77,32 @@ makeinstall_host() { cp -P scripts/comp_sql $ROOT/$TOOLCHAIN/bin } -configure_target() { - cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DINSTALL_INCLUDEDIR=include/mysql \ - -DCMAKE_BUILD_TYPE=Release \ - -DFEATURE_SET=classic \ - -DDISABLE_SHARED=ON \ - -DENABLE_DTRACE=OFF \ - -DWITH_EMBEDDED_SERVER=OFF \ - -DWITH_INNOBASE_STORAGE_ENGINE=OFF \ - -DWITH_PARTITION_STORAGE_ENGINE=OFF \ - -DWITH_PERFSCHEMA_STORAGE_ENGINE=OFF \ - -DWITH_EXTRA_CHARSETS=all \ - -DWITH_UNIT_TESTS=OFF \ - -DWITHOUT_SERVER=ON \ - -DWITH_EDITLINE=bundled \ - -DWITH_LIBEVENT=bundled \ - -DWITH_ZLIB=system \ - -DWITH_SSL=$SYSROOT_PREFIX/usr \ - -DDOWNLOAD_BOOST=0 \ - -DLOCAL_BOOST_DIR=$(get_build_dir boost) \ - -DSTACK_DIRECTION=1 \ - -DHAVE_LLVM_LIBCPP=1 \ - -DCMAKE_C_FLAGS="-fPIC ${CFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -fomit-frame-pointer -fno-delete-null-pointer-checks" \ - -DCMAKE_CXX_FLAGS="-fPIC ${CXXFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -felide-constructors -fno-delete-null-pointer-checks" \ - .. -} +PKG_CMAKE_OPTS_TARGET="-DINSTALL_INCLUDEDIR=include/mysql \ + -DCMAKE_BUILD_TYPE=Release \ + -DFEATURE_SET=classic \ + -DDISABLE_SHARED=ON \ + -DENABLE_DTRACE=OFF \ + -DWITH_EMBEDDED_SERVER=OFF \ + -DWITH_INNOBASE_STORAGE_ENGINE=OFF \ + -DWITH_PARTITION_STORAGE_ENGINE=OFF \ + -DWITH_PERFSCHEMA_STORAGE_ENGINE=OFF \ + -DWITH_EXTRA_CHARSETS=all \ + -DWITH_UNIT_TESTS=OFF \ + -DWITHOUT_SERVER=ON \ + -DWITH_EDITLINE=bundled \ + -DWITH_LIBEVENT=bundled \ + -DWITH_ZLIB=system \ + -DWITH_SSL=$SYSROOT_PREFIX/usr \ + -DDOWNLOAD_BOOST=0 \ + -DLOCAL_BOOST_DIR=$(get_build_dir boost) \ + -DSTACK_DIRECTION=1 \ + -DHAVE_LLVM_LIBCPP=1" post_makeinstall_target() { 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 cp scripts/mysql_config $SYSROOT_PREFIX/usr/bin ln -sf $SYSROOT_PREFIX/usr/bin/mysql_config $ROOT/$TOOLCHAIN/bin/mysql_config - + rm -rf $INSTALL } diff --git a/packages/databases/mysql/patches/mysql-0003-compile-comp_err-even-when-crosscompiling.patch b/packages/databases/mysql/patches/mysql-0003-compile-comp_err-even-when-crosscompiling.patch new file mode 100644 index 0000000000..350f3b813e --- /dev/null +++ b/packages/databases/mysql/patches/mysql-0003-compile-comp_err-even-when-crosscompiling.patch @@ -0,0 +1,18 @@ +diff -Naur a/extra/CMakeLists.txt b/extra/CMakeLists.txt +--- a/extra/CMakeLists.txt 2016-09-21 23:16:59.458308368 -0700 ++++ b/extra/CMakeLists.txt 2016-09-21 23:17:34.187663318 -0700 +@@ -28,11 +28,9 @@ + # Default install component for the files is Server here + SET(MYSQL_INSTALL_COMPONENT Server) + +-IF(NOT CMAKE_CROSSCOMPILING) +- ADD_EXECUTABLE(comp_err comp_err.c) +- TARGET_LINK_LIBRARIES(comp_err mysys mysys_ssl) +- SET_TARGET_PROPERTIES(comp_err PROPERTIES LINKER_LANGUAGE CXX) +-ENDIF() ++ADD_EXECUTABLE(comp_err comp_err.c) ++TARGET_LINK_LIBRARIES(comp_err mysys mysys_ssl) ++SET_TARGET_PROPERTIES(comp_err PROPERTIES LINKER_LANGUAGE CXX) + + IF (BUILD_BUNDLED_LZ4) + ADD_CONVENIENCE_LIBRARY(lz4_lib diff --git a/packages/databases/mysql/patches/mysql-0004-compile-comp_sql-even-when-crosscompiling.patch b/packages/databases/mysql/patches/mysql-0004-compile-comp_sql-even-when-crosscompiling.patch new file mode 100644 index 0000000000..e1514dbf94 --- /dev/null +++ b/packages/databases/mysql/patches/mysql-0004-compile-comp_sql-even-when-crosscompiling.patch @@ -0,0 +1,17 @@ +diff -Naur a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt +--- a/scripts/CMakeLists.txt 2016-09-21 23:16:59.461308398 -0700 ++++ b/scripts/CMakeLists.txt 2016-09-21 23:23:50.606510539 -0700 +@@ -14,11 +14,8 @@ + # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + # Build comp_sql - used for embedding SQL in C or C++ programs +-IF(NOT CMAKE_CROSSCOMPILING) +- ADD_EXECUTABLE(comp_sql comp_sql.c) +- TARGET_LINK_LIBRARIES(comp_sql) +-ENDIF() +- ++ADD_EXECUTABLE(comp_sql comp_sql.c) ++TARGET_LINK_LIBRARIES(comp_sql) + + # Build mysql_fix_privilege_tables.sql (concatenate 2 sql scripts) + IF(NOT WIN32 OR CMAKE_CROSSCOMPILING) From be7d908d903b8c7a739e18ff60a01b0c64be3a05 Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH 118/141] llvm: simplify cmake configuration --- packages/lang/llvm/package.mk | 92 ++++++++++++++++------------------- 1 file changed, 41 insertions(+), 51 deletions(-) diff --git a/packages/lang/llvm/package.mk b/packages/lang/llvm/package.mk index 7b9367f98b..76f2ec7598 100644 --- a/packages/lang/llvm/package.mk +++ b/packages/lang/llvm/package.mk @@ -33,28 +33,24 @@ PKG_LONGDESC="Low-Level Virtual Machine (LLVM) is a compiler infrastructure desi PKG_IS_ADDON="no" PKG_AUTORECONF="no" -configure_host() { - cmake -DCMAKE_INSTALL_PREFIX=$ROOT/$TOOLCHAIN \ - -DCMAKE_BUILD_TYPE=Release \ - -DLLVM_INCLUDE_TOOLS=ON \ - -DLLVM_BUILD_TOOLS=OFF \ - -DLLVM_BUILD_UTILS=OFF \ - -DLLVM_BUILD_EXAMPLES=OFF \ - -DLLVM_INCLUDE_EXAMPLES=OFF \ - -DLLVM_BUILD_TESTS=OFF \ - -DLLVM_INCLUDE_TESTS=OFF \ - -DLLVM_INCLUDE_GO_TESTS=OFF \ - -DLLVM_BUILD_DOCS=OFF \ - -DLLVM_INCLUDE_DOCS=OFF \ - -DLLVM_ENABLE_DOXYGEN=OFF \ - -DLLVM_ENABLE_SPHINX=OFF \ - -DLLVM_TARGETS_TO_BUILD="AMDGPU" \ - -DLLVM_ENABLE_TERMINFO=OFF \ - -DLLVM_ENABLE_ASSERTIONS=OFF \ - -DLLVM_ENABLE_WERROR=OFF \ - -DLLVM_ENABLE_ZLIB=OFF \ - .. -} +PKG_CMAKE_OPTS_HOST="-DCMAKE_BUILD_TYPE=Release \ + -DLLVM_INCLUDE_TOOLS=ON \ + -DLLVM_BUILD_TOOLS=OFF \ + -DLLVM_BUILD_UTILS=OFF \ + -DLLVM_BUILD_EXAMPLES=OFF \ + -DLLVM_INCLUDE_EXAMPLES=OFF \ + -DLLVM_BUILD_TESTS=OFF \ + -DLLVM_INCLUDE_TESTS=OFF \ + -DLLVM_INCLUDE_GO_TESTS=OFF \ + -DLLVM_BUILD_DOCS=OFF \ + -DLLVM_INCLUDE_DOCS=OFF \ + -DLLVM_ENABLE_DOXYGEN=OFF \ + -DLLVM_ENABLE_SPHINX=OFF \ + -DLLVM_TARGETS_TO_BUILD="AMDGPU" \ + -DLLVM_ENABLE_TERMINFO=OFF \ + -DLLVM_ENABLE_ASSERTIONS=OFF \ + -DLLVM_ENABLE_WERROR=OFF \ + -DLLVM_ENABLE_ZLIB=OFF" make_host() { make llvm-config @@ -64,35 +60,29 @@ makeinstall_host() { cp -a bin/llvm-config $SYSROOT_PREFIX/usr/bin/llvm-config-host } -configure_target() { - cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_C_FLAGS="$CFLAGS" \ - -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ - -DLLVM_INCLUDE_TOOLS=OFF \ - -DLLVM_BUILD_TOOLS=OFF \ - -DLLVM_BUILD_UTILS=OFF \ - -DLLVM_BUILD_EXAMPLES=OFF \ - -DLLVM_INCLUDE_EXAMPLES=OFF \ - -DLLVM_BUILD_TESTS=OFF \ - -DLLVM_INCLUDE_TESTS=OFF \ - -DLLVM_INCLUDE_GO_TESTS=OFF \ - -DLLVM_BUILD_DOCS=OFF \ - -DLLVM_INCLUDE_DOCS=OFF \ - -DLLVM_ENABLE_DOXYGEN=OFF \ - -DLLVM_ENABLE_SPHINX=OFF \ - -DLLVM_TARGETS_TO_BUILD="AMDGPU" \ - -DLLVM_ENABLE_TERMINFO=OFF \ - -DLLVM_ENABLE_ASSERTIONS=OFF \ - -DLLVM_ENABLE_WERROR=OFF \ - -DLLVM_TARGET_ARCH="$TARGET_ARCH" \ - -DLLVM_ENABLE_ZLIB=ON \ - -DLLVM_BUILD_LLVM_DYLIB=OFF \ - -DLLVM_LINK_LLVM_DYLIB=OFF \ - .. -} +PKG_CMAKE_OPTS_TARGET="-DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DLLVM_INCLUDE_TOOLS=OFF \ + -DLLVM_BUILD_TOOLS=OFF \ + -DLLVM_BUILD_UTILS=OFF \ + -DLLVM_BUILD_EXAMPLES=OFF \ + -DLLVM_INCLUDE_EXAMPLES=OFF \ + -DLLVM_BUILD_TESTS=OFF \ + -DLLVM_INCLUDE_TESTS=OFF \ + -DLLVM_INCLUDE_GO_TESTS=OFF \ + -DLLVM_BUILD_DOCS=OFF \ + -DLLVM_INCLUDE_DOCS=OFF \ + -DLLVM_ENABLE_DOXYGEN=OFF \ + -DLLVM_ENABLE_SPHINX=OFF \ + -DLLVM_TARGETS_TO_BUILD="AMDGPU" \ + -DLLVM_ENABLE_TERMINFO=OFF \ + -DLLVM_ENABLE_ASSERTIONS=OFF \ + -DLLVM_ENABLE_WERROR=OFF \ + -DLLVM_TARGET_ARCH="$TARGET_ARCH" \ + -DLLVM_ENABLE_ZLIB=ON \ + -DLLVM_BUILD_LLVM_DYLIB=OFF \ + -DLLVM_LINK_LLVM_DYLIB=OFF" post_makeinstall_target() { From 2dad6f0d7b1ec1bdd325e47f5ec45d020481b0fa Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH 119/141] visualization.pictureit: simplify cmake configuration --- .../visualization.pictureit/package.mk | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/packages/mediacenter/kodi-binary-addons/visualization.pictureit/package.mk b/packages/mediacenter/kodi-binary-addons/visualization.pictureit/package.mk index 00f24ca61a..84951decdd 100644 --- a/packages/mediacenter/kodi-binary-addons/visualization.pictureit/package.mk +++ b/packages/mediacenter/kodi-binary-addons/visualization.pictureit/package.mk @@ -33,13 +33,8 @@ PKG_AUTORECONF="no" PKG_IS_ADDON="yes" PKG_ADDON_TYPE="xbmc.player.musicviz" -configure_target() { - cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \ - .. -} +PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ + -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ From 333c240450b39e02effbce2c3f224eacff1c76ac Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH 120/141] visualization.wavforhue: simplify cmake configuration --- .../visualization.wavforhue/package.mk | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/packages/mediacenter/kodi-binary-addons/visualization.wavforhue/package.mk b/packages/mediacenter/kodi-binary-addons/visualization.wavforhue/package.mk index c3104ef1ac..4edfe304e3 100644 --- a/packages/mediacenter/kodi-binary-addons/visualization.wavforhue/package.mk +++ b/packages/mediacenter/kodi-binary-addons/visualization.wavforhue/package.mk @@ -33,13 +33,8 @@ PKG_AUTORECONF="no" PKG_IS_ADDON="yes" PKG_ADDON_TYPE="xbmc.player.musicviz" -configure_target() { - cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \ - .. -} +PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ + -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ From 4a32b45705b85b5e58fb6cd3500ce34441ab463d Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH 121/141] oscam :simplify cmake configuration --- packages/addons/service/oscam/package.mk | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/packages/addons/service/oscam/package.mk b/packages/addons/service/oscam/package.mk index 8ca68d80d4..2b40fdad5d 100644 --- a/packages/addons/service/oscam/package.mk +++ b/packages/addons/service/oscam/package.mk @@ -39,20 +39,15 @@ pre_unpack() { export OSCAM_ADDON_VERSION="$PKG_VERSION_NUMBER" } -configure_target() { - cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DLIBUSBDIR=$SYSROOT_PREFIX/usr \ - -DWITH_SSL=0 \ - -DHAVE_LIBCRYPTO=0 \ - -DHAVE_DVBAPI=1 -DWITH_STAPI=0 \ - -DWEBIF=1 \ - -DWITH_DEBUG=0 \ - -DOPTIONAL_INCLUDE_DIR=$SYSROOT_PREFIX/usr/include \ - -DSTATIC_LIBUSB=1 \ - -DCLOCKFIX=0 \ - .. -} +PKG_CMAKE_OPTS_TARGET="-DLIBUSBDIR=$SYSROOT_PREFIX/usr \ + -DWITH_SSL=0 \ + -DHAVE_LIBCRYPTO=0 \ + -DHAVE_DVBAPI=1 -DWITH_STAPI=0 \ + -DWEBIF=1 \ + -DWITH_DEBUG=0 \ + -DOPTIONAL_INCLUDE_DIR=$SYSROOT_PREFIX/usr/include \ + -DSTATIC_LIBUSB=1 \ + -DCLOCKFIX=0" makeinstall_target() { : # nop From 11916e8b7d74476c02aa4f3251b613d5f546e9cb Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH 122/141] hyperion: simplify cmake configuration --- packages/addons/service/hyperion/package.mk | 39 ++++++++++----------- 1 file changed, 18 insertions(+), 21 deletions(-) diff --git a/packages/addons/service/hyperion/package.mk b/packages/addons/service/hyperion/package.mk index fd9d03e272..6fcb828443 100644 --- a/packages/addons/service/hyperion/package.mk +++ b/packages/addons/service/hyperion/package.mk @@ -51,30 +51,27 @@ pre_build_target() { cp -a $(get_build_dir rpi_ws281x)/* $ROOT/$PKG_BUILD/dependencies/external/rpi_ws281x } -configure_target() { +pre_configure_target() { echo "" > ../cmake/FindGitVersion.cmake - cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \ - -DQT_QMAKE_EXECUTABLE=$ROOT/$TOOLCHAIN/bin/qmake \ - -DHYPERION_VERSION_ID="$PKG_VERSION" \ - $AMLOGIC_SUPPORT \ - $DISPMANX_SUPPORT \ - $FB_SUPPORT \ - -DENABLE_OSX=0 \ - -DUSE_SYSTEM_PROTO_LIBS=ON \ - -DENABLE_SPIDEV=1 \ - -DENABLE_TINKERFORGE=0 \ - -DENABLE_V4L2=1 \ - -DENABLE_WS2812BPWM=0 \ - -DENABLE_WS281XPWM=1 \ - $X11_SUPPORT \ - -DENABLE_QT5=0 \ - -DENABLE_TESTS=0 \ - -Wno-dev \ - .. } +PKG_CMAKE_OPTS_TARGET="-DQT_QMAKE_EXECUTABLE=$ROOT/$TOOLCHAIN/bin/qmake \ + -DHYPERION_VERSION_ID="$PKG_VERSION" \ + $AMLOGIC_SUPPORT \ + $DISPMANX_SUPPORT \ + $FB_SUPPORT \ + -DENABLE_OSX=0 \ + -DUSE_SYSTEM_PROTO_LIBS=ON \ + -DENABLE_SPIDEV=1 \ + -DENABLE_TINKERFORGE=0 \ + -DENABLE_V4L2=1 \ + -DENABLE_WS2812BPWM=0 \ + -DENABLE_WS281XPWM=1 \ + $X11_SUPPORT \ + -DENABLE_QT5=0 \ + -DENABLE_TESTS=0 \ + -Wno-dev" + makeinstall_target() { : # nothing to do here } From 5f11e9ba7dee9fc7257b4cd112e56bfe3536279f Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH 123/141] gcc: disable libssp --- packages/lang/gcc/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/lang/gcc/package.mk b/packages/lang/gcc/package.mk index 064b461d99..3ce5180d39 100644 --- a/packages/lang/gcc/package.mk +++ b/packages/lang/gcc/package.mk @@ -57,13 +57,13 @@ GCC_COMMON_CONFIGURE_OPTS="--target=$TARGET_NAME \ --disable-libitm \ --disable-libquadmath \ --disable-libgomp \ - --disable-libmpx" + --disable-libmpx \ + --disable-libssp" PKG_CONFIGURE_OPTS_BOOTSTRAP="$GCC_COMMON_CONFIGURE_OPTS \ --enable-languages=c \ --disable-__cxa_atexit \ --disable-libsanitizer \ - --disable-libssp \ --enable-cloog-backend=isl \ --disable-shared \ --disable-threads \ From 98a5212c6cc15269a31099337a95eb5a941c217d Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH 124/141] libpng: prevent from building with cmake configuration --- packages/graphics/libpng/package.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/graphics/libpng/package.mk b/packages/graphics/libpng/package.mk index ee2764e4b5..d9f1660aec 100644 --- a/packages/graphics/libpng/package.mk +++ b/packages/graphics/libpng/package.mk @@ -31,6 +31,7 @@ PKG_SHORTDESC="libpng: Portable Network Graphics (PNG) Reference Library" PKG_LONGDESC="PNG (Portable Network Graphics) is an extensible file format for the lossless, portable, well-compressed storage of raster images. PNG provides a patent-free replacement for GIF and can also replace many common uses of TIFF. Indexed-color, grayscale, and truecolor images are supported, plus an optional alpha channel. Sample depths range from 1 to 16 bits." PKG_IS_ADDON="no" +PKG_USE_CMAKE="no" PKG_AUTORECONF="yes" PKG_CONFIGURE_OPTS_TARGET="ac_cv_lib_z_zlibVersion=yes \ From 7ec3cd165b4fee4a5de62305cbd8be000edfa9f5 Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH 125/141] freetype: prevent from building with cmake configuration --- packages/print/freetype/package.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/print/freetype/package.mk b/packages/print/freetype/package.mk index 593f6ed2fb..4262d47a8c 100644 --- a/packages/print/freetype/package.mk +++ b/packages/print/freetype/package.mk @@ -30,6 +30,7 @@ PKG_SHORTDESC="freetype: TrueType font rendering library" PKG_LONGDESC="The FreeType engine is a free and portable TrueType font rendering engine. It has been developed to provide TT support to a great variety of platforms and environments." PKG_IS_ADDON="no" +PKG_USE_CMAKE="no" PKG_AUTORECONF="no" # package specific configure options From d5a5e714515b883976bfb4b1a09c94ad7946d8ba Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Sat, 24 Sep 2016 01:45:36 -0700 Subject: [PATCH 126/141] Revert "yasm: use cmake configuration" This reverts commit 825faf59d4ce47e33f224427b60df4d4fb989ac0. --- packages/lang/yasm/package.mk | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/packages/lang/yasm/package.mk b/packages/lang/yasm/package.mk index 55a8dca439..cfeaa18e1f 100644 --- a/packages/lang/yasm/package.mk +++ b/packages/lang/yasm/package.mk @@ -23,7 +23,7 @@ PKG_ARCH="any" PKG_LICENSE="BSD" PKG_SITE="http://www.tortall.net/projects/yasm/" PKG_URL="http://www.tortall.net/projects/yasm/releases/$PKG_NAME-$PKG_VERSION.tar.gz" -PKG_DEPENDS_HOST="cmake:host" +PKG_DEPENDS_HOST="" PKG_PRIORITY="optional" PKG_SECTION="toolchain/lang" PKG_SHORTDESC="yasm: A complete rewrite of the NASM assembler" @@ -32,6 +32,15 @@ PKG_LONGDESC="Yasm is a complete rewrite of the NASM assembler under the new BSD PKG_IS_ADDON="no" PKG_AUTORECONF="no" -PKG_CMAKE_OPTS_HOST="-DBUILD_SHARED_LIBS=ON \ - -DENABLE_NLS=OFF \ - -DYASM_BUILD_TESTS=OFF" +PKG_CONFIGURE_OPTS_HOST="--disable-debug \ + --disable-warnerror \ + --disable-profiling \ + --disable-gcov \ + --disable-python \ + --disable-python-bindings \ + --enable-nls \ + --disable-rpath \ + --without-dmalloc \ + --with-gnu-ld \ + --without-libiconv-prefix \ + --without-libintl-prefix" From 75a9b50517308d3d4fa022f962e4ba32d7bbb6f7 Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Sat, 24 Sep 2016 01:46:20 -0700 Subject: [PATCH 127/141] yasm: prevent from building with cmake configuration --- packages/lang/yasm/package.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/lang/yasm/package.mk b/packages/lang/yasm/package.mk index cfeaa18e1f..68f6a3a664 100644 --- a/packages/lang/yasm/package.mk +++ b/packages/lang/yasm/package.mk @@ -30,6 +30,7 @@ PKG_SHORTDESC="yasm: A complete rewrite of the NASM assembler" PKG_LONGDESC="Yasm is a complete rewrite of the NASM assembler under the new BSD License (some portions are under other licenses, see COPYING for details). It is designed from the ground up to allow for multiple assembler syntaxes to be supported (eg, NASM, TASM, GAS, etc.) in addition to multiple output object formats and even multiple instruction sets. Another primary module of the overall design is an optimizer module." PKG_IS_ADDON="no" +PKG_USE_CMAKE="no" PKG_AUTORECONF="no" PKG_CONFIGURE_OPTS_HOST="--disable-debug \ From 0a6095a03dee23055df61bc29ded4d456a2365bf Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Sat, 24 Sep 2016 11:45:10 -0700 Subject: [PATCH 128/141] containerd: dont use $TARGET_* variables --- packages/addons/addon-depends/containerd/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/addons/addon-depends/containerd/package.mk b/packages/addons/addon-depends/containerd/package.mk index 11475d01b1..c04911c681 100644 --- a/packages/addons/addon-depends/containerd/package.mk +++ b/packages/addons/addon-depends/containerd/package.mk @@ -55,7 +55,7 @@ pre_make_target() { export CGO_ENABLED=1 export CGO_NO_EMULATION=1 export CGO_CFLAGS=$CFLAGS - export LDFLAGS="-w -extldflags -static -X github.com/docker/containerd.GitCommit=${PKG_VERSION} -extld $TARGET_CC" + export LDFLAGS="-w -extldflags -static -X github.com/docker/containerd.GitCommit=${PKG_VERSION} -extld $CC" export GOLANG=$ROOT/$TOOLCHAIN/lib/golang/bin/go export GOPATH=$ROOT/$PKG_BUILD.gopath:$ROOT/$PKG_BUILD/vendor/ export GOROOT=$ROOT/$TOOLCHAIN/lib/golang From 54c3aeaa29df6c8e37e77c34467d0f6d12ce2310 Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Sat, 24 Sep 2016 11:45:10 -0700 Subject: [PATCH 129/141] nss: dont use $TARGET_* variables --- packages/addons/addon-depends/nss/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/addons/addon-depends/nss/package.mk b/packages/addons/addon-depends/nss/package.mk index 8eab11b3d3..1326a36623 100644 --- a/packages/addons/addon-depends/nss/package.mk +++ b/packages/addons/addon-depends/nss/package.mk @@ -63,7 +63,7 @@ make_target() { NSS_TESTS="dummy" \ NSINSTALL=$ROOT/$TOOLCHAIN/bin/nsinstall \ CPU_ARCH_TAG=$TARGET_ARCH \ - CC=$TARGET_CC LDFLAGS="$LDFLAGS -L$SYSROOT_PREFIX/usr/lib" \ + CC=$CC LDFLAGS="$LDFLAGS -L$SYSROOT_PREFIX/usr/lib" \ V=1 } From e826bb66d6c4825f314a1cd5e4f0bc9c80866284 Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Sat, 24 Sep 2016 11:45:10 -0700 Subject: [PATCH 130/141] runc: dont use $TARGET_* variables --- packages/addons/addon-depends/runc/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/addons/addon-depends/runc/package.mk b/packages/addons/addon-depends/runc/package.mk index 6844cdaa18..2a04b29d73 100644 --- a/packages/addons/addon-depends/runc/package.mk +++ b/packages/addons/addon-depends/runc/package.mk @@ -55,7 +55,7 @@ pre_make_target() { export CGO_ENABLED=1 export CGO_NO_EMULATION=1 export CGO_CFLAGS=$CFLAGS - export LDFLAGS="-w -extldflags -static -X main.gitCommit=${PKG_VERSION} -extld $TARGET_CC" + export LDFLAGS="-w -extldflags -static -X main.gitCommit=${PKG_VERSION} -extld $CC" export GOLANG=$ROOT/$TOOLCHAIN/lib/golang/bin/go export GOPATH=$ROOT/$PKG_BUILD.gopath:$ROOT/$PKG_BUILD/Godeps/_workspace/ export GOROOT=$ROOT/$TOOLCHAIN/lib/golang From b3604a7c9f60a3fc84fbb908912215bb0b25f024 Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Sat, 24 Sep 2016 11:45:10 -0700 Subject: [PATCH 131/141] i2c-tools: dont use $TARGET_* variables --- .../addon-depends/system-tools-depends/i2c-tools/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/addons/addon-depends/system-tools-depends/i2c-tools/package.mk b/packages/addons/addon-depends/system-tools-depends/i2c-tools/package.mk index 7c4843a5f6..c84a44d065 100644 --- a/packages/addons/addon-depends/system-tools-depends/i2c-tools/package.mk +++ b/packages/addons/addon-depends/system-tools-depends/i2c-tools/package.mk @@ -37,7 +37,7 @@ pre_make_target() { make_target() { make EXTRA="py-smbus" \ - CC="$TARGET_CC" \ + CC="$CC" \ AR="$TARGET_AR" \ CFLAGS="$TARGET_CFLAGS" \ CPPFLAGS="$TARGET_CPPFLAGS -I${SYSROOT_PREFIX}/usr/include/python2.7" From c65ebdaec3be0b278d3884f1f4cca21ec845a50b Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Sat, 24 Sep 2016 11:45:10 -0700 Subject: [PATCH 132/141] lm_sensors: dont use $TARGET_* variables --- .../addon-depends/system-tools-depends/lm_sensors/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/addons/addon-depends/system-tools-depends/lm_sensors/package.mk b/packages/addons/addon-depends/system-tools-depends/lm_sensors/package.mk index 34acbf1b87..9f3e2f50f2 100644 --- a/packages/addons/addon-depends/system-tools-depends/lm_sensors/package.mk +++ b/packages/addons/addon-depends/system-tools-depends/lm_sensors/package.mk @@ -30,7 +30,7 @@ PKG_SHORTDESC="lm_sensors: Hardware monitoring via the SMBus" PKG_LONGDESC="lm_sensors is a package to get data from the SMB (System Management Bus - an i2c bus) on modern mainboards. It consists of kernel modules and users space tools to get stuff like cpu / mb temperature, voltages, fan speed..." # TODO: PKG_MAKE_OPTS_TARGET + ETCDIR=/storage/.kodi/addons/tools.lm_sensors/data if one wants sensor3.conf.. -PKG_MAKE_OPTS_TARGET="PREFIX=/usr CC=$TARGET_CC AR=$TARGET_AR" +PKG_MAKE_OPTS_TARGET="PREFIX=/usr CC=$CC AR=$AR" PKG_MAKEINSTALL_OPTS_TARGET="PREFIX=/usr" pre_make_target() { From dee190026640e73ff45690af70f5185018b281af Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Sat, 24 Sep 2016 11:45:10 -0700 Subject: [PATCH 133/141] p7zip: dont use $TARGET_* variables --- .../addons/addon-depends/system-tools-depends/p7zip/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/addons/addon-depends/system-tools-depends/p7zip/package.mk b/packages/addons/addon-depends/system-tools-depends/p7zip/package.mk index 47d962c11d..97b5f35b08 100644 --- a/packages/addons/addon-depends/system-tools-depends/p7zip/package.mk +++ b/packages/addons/addon-depends/system-tools-depends/p7zip/package.mk @@ -32,7 +32,7 @@ PKG_LONGDESC="p7zip is a port of 7za.exe for POSIX systems like Unix" PKG_AUTORECONF="no" make_target() { - make TARGET_CXX=$TARGET_CXX TARGET_CC=$TARGET_CC 7z 7za + make TARGET_CXX=$CXX TARGET_CC=$CC 7z 7za } makeinstall_target() { From 39f38ab216902a4636402fdf4f2fc798826b0f2c Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Sat, 24 Sep 2016 11:45:11 -0700 Subject: [PATCH 134/141] unrar: dont use $TARGET_* variables --- .../addon-depends/system-tools-depends/unrar/package.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/addons/addon-depends/system-tools-depends/unrar/package.mk b/packages/addons/addon-depends/system-tools-depends/unrar/package.mk index e2a12a3895..fb17396d24 100644 --- a/packages/addons/addon-depends/system-tools-depends/unrar/package.mk +++ b/packages/addons/addon-depends/system-tools-depends/unrar/package.mk @@ -32,11 +32,11 @@ PKG_LONGDESC="Unrar is a package to handle files compressed in the RAR format. D PKG_AUTORECONF="no" make_target() { - make CXX="$TARGET_CXX" \ + make CXX="$CXX" \ CXXFLAGS="$TARGET_CXXFLAGS" \ - RANLIB="$TARGET_RANLIB" \ - AR="$TARGET_AR" \ - STRIP="$TARGET_STRIP" \ + RANLIB="$RANLIB" \ + AR="$AR" \ + STRIP="$STRIP" \ -f makefile } From faf4d68b178921618058f0369ef0e09fab579ac9 Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Sat, 24 Sep 2016 11:45:11 -0700 Subject: [PATCH 135/141] docker: dont use $TARGET_* variables --- packages/addons/service/docker/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/addons/service/docker/package.mk b/packages/addons/service/docker/package.mk index 16df21ba3c..9643eb5ef3 100644 --- a/packages/addons/service/docker/package.mk +++ b/packages/addons/service/docker/package.mk @@ -64,7 +64,7 @@ configure_target() { export CGO_ENABLED=1 export CGO_NO_EMULATION=1 export CGO_CFLAGS=$CFLAGS - export LDFLAGS="-w -linkmode external -extldflags -Wl,--unresolved-symbols=ignore-in-shared-libs -extld $TARGET_CC" + export LDFLAGS="-w -linkmode external -extldflags -Wl,--unresolved-symbols=ignore-in-shared-libs -extld $CC" export GOLANG=$ROOT/$TOOLCHAIN/lib/golang/bin/go export GOPATH=$ROOT/$PKG_BUILD/.gopath:$ROOT/$PKG_BUILD/vendor export GOROOT=$ROOT/$TOOLCHAIN/lib/golang From 9b75d654a664c8389d7b81d06d7bf68a388eb842 Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Sat, 24 Sep 2016 11:45:11 -0700 Subject: [PATCH 136/141] syncthing: dont use $TARGET_* variables --- packages/addons/service/syncthing/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/addons/service/syncthing/package.mk b/packages/addons/service/syncthing/package.mk index db065a679e..ee83fde1cb 100644 --- a/packages/addons/service/syncthing/package.mk +++ b/packages/addons/service/syncthing/package.mk @@ -66,7 +66,7 @@ configure_target() { export CGO_ENABLED=1 export CGO_NO_EMULATION=1 export CGO_CFLAGS=$CFLAGS - export LDFLAGS="-w -linkmode external -extldflags -Wl,--unresolved-symbols=ignore-in-shared-libs -extld $TARGET_CC -X main.Version=v$PKG_VERSION" + export LDFLAGS="-w -linkmode external -extldflags -Wl,--unresolved-symbols=ignore-in-shared-libs -extld $CC -X main.Version=v$PKG_VERSION" export GOLANG=$ROOT/$TOOLCHAIN/lib/golang/bin/go export GOPATH=$ROOT/$PKG_BUILD/src/github.com/syncthing/syncthing:$ROOT/$PKG_BUILD/vendor:$ROOT/$PKG_BUILD/Godeps/_workspace export GOROOT=$ROOT/$TOOLCHAIN/lib/golang From 01ceca1c63ef2572914e8d1fe1ea7adb861d91ea Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Sat, 24 Sep 2016 11:45:11 -0700 Subject: [PATCH 137/141] tvheadend: dont use $TARGET_* variables --- packages/addons/service/tvheadend/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/addons/service/tvheadend/package.mk b/packages/addons/service/tvheadend/package.mk index aa4e40bc3d..7941cb7968 100644 --- a/packages/addons/service/tvheadend/package.mk +++ b/packages/addons/service/tvheadend/package.mk @@ -38,7 +38,7 @@ PKG_ADDON_TYPE="xbmc.service" PKG_CONFIGURE_OPTS_TARGET="--prefix=/usr \ --arch=$TARGET_ARCH \ --cpu=$TARGET_CPU \ - --cc=$TARGET_CC \ + --cc=$CC \ --enable-hdhomerun_client \ --enable-hdhomerun_static \ --disable-avahi \ From c61644894b361128b2ce6fed8d811b8c07be15b5 Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Sat, 24 Sep 2016 11:45:11 -0700 Subject: [PATCH 138/141] tvheadend42: dont use $TARGET_* variables --- packages/addons/service/tvheadend42/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/addons/service/tvheadend42/package.mk b/packages/addons/service/tvheadend42/package.mk index 41b72bf239..877361182d 100644 --- a/packages/addons/service/tvheadend42/package.mk +++ b/packages/addons/service/tvheadend42/package.mk @@ -47,7 +47,7 @@ fi PKG_CONFIGURE_OPTS_TARGET="--prefix=/usr \ --arch=$TARGET_ARCH \ --cpu=$TARGET_CPU \ - --cc=$TARGET_CC \ + --cc=$CC \ --disable-avahi \ --enable-bundle \ --disable-dbus_1 \ @@ -87,7 +87,7 @@ pre_configure_target() { # transcoding link tvheadend with g++ if [ "$TARGET_ARCH" = x86_64 ]; then pre_make_target() { - export CXX=$TARGET_CXX + export CXX=$CXX } fi From d0cd1e10a58f9e5784f96af668d9090cbdeda169 Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Sun, 25 Sep 2016 13:45:25 -0700 Subject: [PATCH 139/141] libzip: prevent from building with cmake configuration --- packages/addons/addon-depends/libzip/package.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/addons/addon-depends/libzip/package.mk b/packages/addons/addon-depends/libzip/package.mk index 47d5a134d2..37c69156d4 100644 --- a/packages/addons/addon-depends/libzip/package.mk +++ b/packages/addons/addon-depends/libzip/package.mk @@ -29,6 +29,7 @@ PKG_SHORTDESC="libzip" PKG_LONGDESC="libzip" PKG_IS_ADDON="no" +PKG_USE_CMAKE="no" PKG_AUTORECONF="no" PKG_CONFIGURE_OPTS_TARGET="--disable-shared --enable-static" From 02f0de1a7ec8bfe49610c2f1197c44be8996e4c3 Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Sat, 24 Sep 2016 01:19:48 -0700 Subject: [PATCH 140/141] scripts/build: cmake default to Release build type --- scripts/build | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/scripts/build b/scripts/build index 0c7d9a1398..31cf7c611f 100755 --- a/scripts/build +++ b/scripts/build @@ -126,7 +126,8 @@ if [ ! -f $STAMP ]; then --enable-shared" TARGET_CMAKE_OPTS="-DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \ - -DCMAKE_INSTALL_PREFIX=/usr" + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release" # configure HOST build defaults HOST_CONFIGURE_OPTS="--host=$HOST_NAME \ @@ -140,8 +141,15 @@ if [ ! -f $STAMP ]; then --disable-static \ --enable-shared" + if [ "$DEBUG" = "yes" ]; then + CMAKE_BUILD_TYPE="Debug" + else + CMAKE_BUILD_TYPE="Release" + fi + HOST_CMAKE_OPTS="-DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \ - -DCMAKE_INSTALL_PREFIX=$ROOT/$TOOLCHAIN" + -DCMAKE_INSTALL_PREFIX=$ROOT/$TOOLCHAIN \ + -DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE" # configure INIT build defaults INIT_CONFIGURE_OPTS="$TARGET_CONFIGURE_OPTS" From 468f9676c1c4344d65fd846fd9274a400c8642ff Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Sat, 24 Sep 2016 01:11:01 -0700 Subject: [PATCH 141/141] enet: prevent from building with cmake configuration --- packages/addons/addon-depends/enet/package.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/addons/addon-depends/enet/package.mk b/packages/addons/addon-depends/enet/package.mk index 8bacd38418..76d18de836 100644 --- a/packages/addons/addon-depends/enet/package.mk +++ b/packages/addons/addon-depends/enet/package.mk @@ -30,6 +30,7 @@ PKG_SHORTDESC="ENet's purpose is to provide a relatively thin, simple and robust PKG_LONGDESC="ENet's purpose is to provide a relatively thin, simple and robust network communication layer on top of UDP (User Datagram Protocol)" PKG_IS_ADDON="no" +PKG_USE_CMAKE="no" PKG_AUTORECONF="yes" PKG_CONFIGURE_OPTS_TARGET="--enable-static --disable-shared"