Merge pull request #6914 from SupervisedThinking/up_minor_kodi_stuff

[le11] linker fix-ups for Kodi and various other packages

packages/addons/addon-depends/ffmpegx/package.mk

@@ -9,7 +9,7 @@ PKG_SITE="https://ffmpeg.org"
 PKG_URL="https://ffmpeg.org/releases/ffmpeg-${PKG_VERSION}.tar.xz"
 PKG_DEPENDS_TARGET="toolchain aom bzip2 openssl lame libvorbis opus x264 zlib"
 PKG_LONGDESC="FFmpegx is an complete FFmpeg build to support encoding and decoding."
-PKG_BUILD_FLAGS="-gold -sysroot"
+PKG_BUILD_FLAGS="-sysroot"
 
 # Dependencies
 get_graphicdrivers

packages/devel/libfmt/package.mk

@@ -10,4 +10,9 @@ PKG_URL="https://github.com/fmtlib/fmt/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="fmt is an open-source formatting library for C++. It can be used as a safe alternative to printf or as a fast alternative to IOStreams."
 
-PKG_CMAKE_OPTS_TARGET="-DCMAKE_CXX_STANDARD=14 -DCMAKE_CXX_EXTENSIONS:BOOL=OFF -DFMT_DOC=OFF -DFMT_INSTALL=ON -DFMT_TEST=OFF"
+PKG_CMAKE_OPTS_TARGET="-DCMAKE_CXX_STANDARD=14 \
+                       -DCMAKE_CXX_EXTENSIONS:BOOL=OFF \
+                       -DFMT_DOC=OFF \
+                       -DFMT_INSTALL=ON \
+                       -DFMT_TEST=OFF \
+                       -DBUILD_SHARED_LIBS=ON"

packages/mediacenter/kodi/package.mk

@@ -19,6 +19,15 @@ configure_package() {
     PKG_KODI_USE_LTO="-DUSE_LTO=${CONCURRENCY_MAKE_LEVEL}"
   fi
 
+  # Set linker options
+  if [ "${GOLD_SUPPORT}" = "yes" ]; then
+    PKG_KODI_LINKER="-DENABLE_GOLD=ON \
+                     -DENABLE_MOLD=OFF"
+  else
+    PKG_KODI_LINKER="-DENABLE_GOLD=OFF \
+                     -DENABLE_MOLD=OFF"
+  fi
+
   get_graphicdrivers
 
   if [ "${TARGET_ARCH}" = "x86_64" ]; then
@@ -232,7 +241,6 @@ configure_package() {
                          -DENABLE_CCACHE=OFF \
                          -DENABLE_LIRCCLIENT=ON \
                          -DENABLE_EVENTCLIENTS=ON \
-                         -DENABLE_LDGOLD=ON \
                          -DENABLE_DEBUGFISSION=OFF \
                          -DENABLE_APP_AUTONAME=OFF \
                          -DENABLE_TESTING=OFF \
@@ -240,6 +248,7 @@ configure_package() {
                          -DENABLE_LCMS2=OFF \
                          -DADDONS_CONFIGURE_AT_STARTUP=OFF \
                          ${PKG_KODI_USE_LTO} \
+                         ${PKG_KODI_LINKER} \
                          ${KODI_ARCH} \
                          ${KODI_NEON} \
                          ${KODI_VDPAU} \

packages/multimedia/ffmpeg/package.mk

@@ -7,7 +7,6 @@ PKG_LICENSE="LGPLv2.1+"
 PKG_SITE="https://ffmpeg.org"
 PKG_DEPENDS_TARGET="toolchain zlib bzip2 openssl speex"
 PKG_LONGDESC="FFmpeg is a complete, cross-platform solution to record, convert and stream audio and video."
-PKG_BUILD_FLAGS="-gold"
 
 case "${PROJECT}" in
   Amlogic)

packages/network/samba/package.mk

@@ -11,7 +11,6 @@ PKG_URL="https://download.samba.org/pub/samba/stable/${PKG_NAME}-${PKG_VERSION}.
 PKG_DEPENDS_TARGET="toolchain attr heimdal:host e2fsprogs Python3 libunwind zlib readline popt libaio connman gnutls wsdd2"
 PKG_NEED_UNPACK="$(get_pkg_directory heimdal) $(get_pkg_directory e2fsprogs)"
 PKG_LONGDESC="A free SMB / CIFS fileserver and client."
-PKG_BUILD_FLAGS="-gold"
 
 configure_package() {
   #PKG_WAF_VERBOSE="-v"

packages/sysutils/busybox/package.mk

@@ -11,8 +11,7 @@ PKG_URL="https://busybox.net/downloads/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
 PKG_DEPENDS_TARGET="toolchain hdparm dosfstools e2fsprogs zip usbutils parted procps-ng gptfdisk libtirpc"
 PKG_DEPENDS_INIT="toolchain libtirpc"
 PKG_LONGDESC="BusyBox combines tiny versions of many common UNIX utilities into a single small executable."
-# busybox fails to build with GOLD support enabled with binutils-2.25
-PKG_BUILD_FLAGS="-parallel -gold"
+PKG_BUILD_FLAGS="-parallel"
 
 # nano text editor
 if [ "${NANO_EDITOR}" = "yes" ]; then

packages/sysutils/fuse/package.mk

@@ -10,8 +10,6 @@ PKG_SITE="https://github.com/libfuse/libfuse/"
 PKG_URL="https://github.com/libfuse/libfuse/releases/download/${PKG_NAME}-${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="FUSE provides a simple interface for userspace programs to export a virtual filesystem to the Linux kernel."
-# fuse fails to build with GOLD linker on gcc-4.9
-PKG_BUILD_FLAGS="-gold"
 PKG_TOOLCHAIN="autotools"
 
 PKG_CONFIGURE_OPTS_TARGET="MOUNT_FUSE_PATH=/usr/sbin \