From 28fde0b15f11764ee3590a4178547a3d70f27091 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Sat, 9 Jun 2018 15:27:17 +0200 Subject: [PATCH 1/3] sqlite: build shared Signed-off-by: Matthias Reichl --- packages/databases/sqlite/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/databases/sqlite/package.mk b/packages/databases/sqlite/package.mk index 922687b089..2ec8962a71 100644 --- a/packages/databases/sqlite/package.mk +++ b/packages/databases/sqlite/package.mk @@ -62,8 +62,8 @@ PKG_BUILD_FLAGS="+pic +pic:host -parallel" # mmap_size pragma. CFLAGS="$CFLAGS -DSQLITE_TEMP_STORE=3 -DSQLITE_DEFAULT_MMAP_SIZE=268435456" -PKG_CONFIGURE_OPTS_TARGET="--enable-static \ - --disable-shared \ +PKG_CONFIGURE_OPTS_TARGET="--disable-static \ + --enable-shared \ --disable-readline \ --enable-threadsafe \ --enable-dynamic-extensions \ From f60b4f6a8df1c0094af85af3414e8fa7e5b3612b Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Sat, 9 Jun 2018 15:27:44 +0200 Subject: [PATCH 2/3] mono: remove mono_sqlite dependency shared library from system can be used instead Signed-off-by: Matthias Reichl --- packages/addons/tools/mono/package.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/addons/tools/mono/package.mk b/packages/addons/tools/mono/package.mk index f13bfa40bf..e9b8f56a99 100644 --- a/packages/addons/tools/mono/package.mk +++ b/packages/addons/tools/mono/package.mk @@ -25,7 +25,7 @@ PKG_LICENSE="MIT" PKG_SITE="http://www.mono-project.com" PKG_URL="http://download.mono-project.com/sources/mono/$PKG_NAME-$PKG_VERSION.tar.bz2" PKG_SOURCE_DIR="$PKG_NAME-${PKG_VERSION%.*}" -PKG_DEPENDS_TARGET="toolchain mono:host libgdiplus sqlite mono_sqlite zlib" +PKG_DEPENDS_TARGET="toolchain mono:host libgdiplus sqlite zlib" PKG_SECTION="tools" PKG_SHORTDESC="Mono: a cross platform, open source .NET framework" PKG_LONGDESC="Mono ($PKG_VERSION) is a software platform designed to allow developers to easily create cross platform applications part of the .NET Foundation" @@ -83,7 +83,6 @@ addon() { cp -L "$(get_build_dir cairo)/.install_pkg/usr/lib/libcairo.so.2" \ "$(get_build_dir libgdiplus)/.install_pkg/usr/lib/libgdiplus.so" \ - "$(get_build_dir mono_sqlite)/.install_pkg/usr/lib/libsqlite3.so.0" \ "$(get_build_dir pixman)/.install_pkg/usr/lib/libpixman-1.so.0" \ "$ADDON_BUILD/$PKG_ADDON_ID/lib" } From b3d0e598a7a1cec4ab748c56af2eaf356a6a97f4 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Sat, 9 Jun 2018 15:28:21 +0200 Subject: [PATCH 3/3] mono_sqlite: remove package Signed-off-by: Matthias Reichl --- .../mono-depends/mono_sqlite/package.mk | 37 ------------------- .../mono_sqlite/sources/trigger_unpack | 0 2 files changed, 37 deletions(-) delete mode 100644 packages/addons/addon-depends/mono-depends/mono_sqlite/package.mk delete mode 100644 packages/addons/addon-depends/mono-depends/mono_sqlite/sources/trigger_unpack diff --git a/packages/addons/addon-depends/mono-depends/mono_sqlite/package.mk b/packages/addons/addon-depends/mono-depends/mono_sqlite/package.mk deleted file mode 100644 index ae79878ced..0000000000 --- a/packages/addons/addon-depends/mono-depends/mono_sqlite/package.mk +++ /dev/null @@ -1,37 +0,0 @@ -################################################################################ -# This file is part of LibreELEC - https://libreelec.tv -# Copyright (C) 2016-present Team LibreELEC -# -# LibreELEC is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 2 of the License, or -# (at your option) any later version. -# -# LibreELEC is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with LibreELEC. If not, see . -################################################################################ - -. "$ROOT/packages/databases/sqlite/package.mk" - -PKG_NAME="mono_sqlite" -PKG_URL="" -PKG_DEPENDS_TARGET="toolchain sqlite" -PKG_SHORTDESC="sqlite for mono" -PKG_LONGDESC="libsqlite built shared for mono" -PKG_TOOLCHAIN="autotools" - -PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --disable-static --enable-shared" - -unpack() { - mkdir -p $PKG_BUILD - cp -r $(get_build_dir sqlite)/* $PKG_BUILD/ -} - -makeinstall_target() { - make install DESTDIR=$INSTALL -} diff --git a/packages/addons/addon-depends/mono-depends/mono_sqlite/sources/trigger_unpack b/packages/addons/addon-depends/mono-depends/mono_sqlite/sources/trigger_unpack deleted file mode 100644 index e69de29bb2..0000000000