From 46fec4402f787095933a0896114041fcd9dc48b4 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Sun, 15 Sep 2024 05:31:10 +0000 Subject: [PATCH 01/18] scripts/build: add cfg-libs option to PKG_BUILD_FLAGS to fix configure unrecognized options Allows packages to be updated to remove the configure warning: configure: WARNING: unrecognized options: --disable-static, --enable-shared add the following line to the affected package.mk files PKG_BUILD_FLAGS="-cfg-libs" -cfg-libs, -cfg-libs:host and -cfg-libs:init are used --- packages/readme.md | 7 ++++--- scripts/build | 14 ++++++++------ 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/packages/readme.md b/packages/readme.md index 45318ca522..f80e734b32 100644 --- a/packages/readme.md +++ b/packages/readme.md @@ -32,11 +32,11 @@ To control the build behaviour of your package, use variables in the top-down or | PKG_SOURCE_NAME | - | no | Force the filename of the application sources. Used when the filename is not the basename of `PKG_URL` | | PKG_PATCH_DIRS | - | no | Patches in `./patches` are automatically applied after package unpack. Use this option to include patches from an additional folder, e.g. `./patches/$PKG_PATCH_DIRS` | | PKG_NEED_UNPACK | - | no | Space separated list of files or folders to include in package stamp calculation. If the stamp is invalidated through changes to package files or dependent files/folders the package is cleaned and rebuilt. e.g. `PKG_NEED_UNPACK="$(get_pkg_directory linux)"` will trigger clean/rebuild of a Linux kernel driver package when a change to the `linux` kernel package is detected. | -| PKG_TOOLCHAIN | auto | no | Control which build toolchain is used. For detailed information, see [reference](#toolchain-options). | -| PKG_BUILD_FLAGS | - | no | A space separated list of flags with which to fine-tune the build process. Flags can be enabled or disabled with a `+` or `-` prefix. For detailed information, see the [Reference](#build_flags-options). | +| PKG_TOOLCHAIN | auto | no | Control which build toolchain is used. For detailed information, see [Reference](#toolchain-options). | +| PKG_BUILD_FLAGS | - | no | A space separated list of flags with which to fine-tune the build process. Flags can be enabled or disabled with a `+` or `-` prefix. For detailed information, see [Reference](#build_flags-options). | | PKG_PYTHON_VERSION | python3.8 | no | Define the Python version to be used. | | PKG_IS_KERNEL_PKG | - | no | Set to `yes` for packages that include Linux kernel modules | -| PKG_DEPENDS_CONFIG | - | no | Space separated list of packages to add to PKG_CONFIG_PATH. Use this to build with support for `-sysroot` packages (See [reference](BUILD_FLAGS options). | +| PKG_DEPENDS_CONFIG | - | no | Space separated list of packages to add to PKG_CONFIG_PATH. Use this to build with support for `-sysroot` packages, see [Reference](#build_flags-options). | #### Meson Options | Variable | Default | Required |Description | @@ -133,6 +133,7 @@ Set the variable `PKG_BUILD_FLAGS` in the `package.mk` to enable/disable the sin | strip | enabled | target | strips executables (or not) | | sysroot | enabled | target | installs the package to the sysroot folder (or not) | | local-cc | disabled | host | use compiler from buildhost instead of host-gcc/g++ in toolchain | +| cfg-libs | enabled | all | `-cfg-libs` will not append --disable-static --enable-shared to CONFIGURE_OPTS | ###### Example ``` diff --git a/scripts/build b/scripts/build index 6d8e990316..fa170e1bcc 100755 --- a/scripts/build +++ b/scripts/build @@ -159,9 +159,10 @@ TARGET_CONFIGURE_OPTS="--host=${TARGET_NAME} \ --sysconfdir=/etc \ --libdir=/usr/lib \ --libexecdir=/usr/lib \ - --localstatedir=/var \ - --disable-static \ - --enable-shared" + --localstatedir=/var" +if flag_enabled "cfg-libs" "yes"; then + TARGET_CONFIGURE_OPTS+=" --disable-static --enable-shared" +fi TARGET_CMAKE_OPTS="-DCMAKE_TOOLCHAIN_FILE=${CMAKE_CONF} \ -DCMAKE_INSTALL_PREFIX=/usr \ @@ -187,9 +188,10 @@ HOST_CONFIGURE_OPTS="--host=${HOST_NAME} \ --sbindir=${TOOLCHAIN}/sbin \ --sysconfdir=${TOOLCHAIN}/etc \ --libexecdir=${TOOLCHAIN}/lib \ - --localstatedir=${TOOLCHAIN}/var \ - --disable-static \ - --enable-shared" + --localstatedir=${TOOLCHAIN}/var" +if flag_enabled "cfg-libs:host" "yes"; then + HOST_CONFIGURE_OPTS+=" --disable-static --enable-shared" +fi HOST_CMAKE_OPTS="${CMAKE_GENERATOR} \ -DCMAKE_TOOLCHAIN_FILE=${CMAKE_CONF} \ From 6e4c58df89fe68c52a0802ada0b55ae77188178f Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Sun, 15 Sep 2024 03:36:30 +0000 Subject: [PATCH 02/18] cleanup packages: fix configure warnings with PKG_BUILD_FLAGS=-cfg-libs --- .../addon-depends/system-tools-depends/autossh/package.mk | 2 +- packages/debug/strace/package.mk | 1 + packages/devel/autoconf-archive/package.mk | 1 + packages/devel/autoconf/package.mk | 1 + packages/devel/automake/package.mk | 2 +- packages/devel/bison/package.mk | 2 +- packages/devel/intltool/package.mk | 1 + packages/devel/libfstrcmp/package.mk | 1 + packages/devel/m4/package.mk | 1 + packages/devel/make/package.mk | 2 +- packages/devel/patchelf/package.mk | 1 + packages/devel/slang/package.mk | 2 +- packages/network/cifs-utils/package.mk | 1 + packages/network/ethtool/package.mk | 1 + packages/network/openssh/package.mk | 2 +- packages/network/rpcbind/package.mk | 1 + packages/security/nspr/package.mk | 2 +- packages/sysutils/dosfstools/package.mk | 1 + packages/sysutils/e2fsprogs/package.mk | 2 +- packages/sysutils/eventlircd/package.mk | 1 + packages/sysutils/sed/package.mk | 1 + packages/textproc/xmlstarlet/package.mk | 1 + packages/tools/grub/package.mk | 1 + packages/tools/mtools/package.mk | 1 + packages/tools/nano/package.mk | 1 + packages/tools/newt/package.mk | 1 + packages/x11/util/util-macros/package.mk | 1 + 27 files changed, 27 insertions(+), 8 deletions(-) diff --git a/packages/addons/addon-depends/system-tools-depends/autossh/package.mk b/packages/addons/addon-depends/system-tools-depends/autossh/package.mk index 9d5ca84e60..43d657ab27 100644 --- a/packages/addons/addon-depends/system-tools-depends/autossh/package.mk +++ b/packages/addons/addon-depends/system-tools-depends/autossh/package.mk @@ -10,7 +10,7 @@ PKG_URL="http://www.harding.motd.ca/autossh/autossh-${PKG_VERSION}.tgz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="Automatically restart SSH sessions and tunnels." PKG_TOOLCHAIN="autotools" -PKG_BUILD_FLAGS="-sysroot" +PKG_BUILD_FLAGS="-sysroot -cfg-libs" PKG_CONFIGURE_OPTS_TARGET="ac_cv_func_malloc_0_nonnull=yes \ ac_cv_func_realloc_0_nonnull=yes" diff --git a/packages/debug/strace/package.mk b/packages/debug/strace/package.mk index bff36d82c4..bf3284b718 100644 --- a/packages/debug/strace/package.mk +++ b/packages/debug/strace/package.mk @@ -10,6 +10,7 @@ PKG_URL="https://strace.io/files/${PKG_VERSION}/strace-${PKG_VERSION}.tar.xz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="strace is a diagnostic, debugging and instructional userspace utility" PKG_TOOLCHAIN="autotools" +PKG_BUILD_FLAGS="-cfg-libs" if [ "${TARGET_ARCH}" = x86_64 -o "${TARGET_ARCH}" = "aarch64" ]; then PKG_CONFIGURE_OPTS_TARGET="--enable-mpers=no" diff --git a/packages/devel/autoconf-archive/package.mk b/packages/devel/autoconf-archive/package.mk index 8c77e6819a..a1bb96a792 100644 --- a/packages/devel/autoconf-archive/package.mk +++ b/packages/devel/autoconf-archive/package.mk @@ -10,6 +10,7 @@ PKG_SITE="https://www.gnu.org/software/autoconf-archive/" PKG_URL="http://ftpmirror.gnu.org/autoconf-archive/${PKG_NAME}-${PKG_VERSION}.tar.xz" PKG_DEPENDS_HOST="ccache:host" PKG_LONGDESC="autoconf-archive is an package of m4 macros" +PKG_BUILD_FLAGS="-cfg-libs:host" PKG_CONFIGURE_OPTS_HOST="--target=${TARGET_NAME} --prefix=${TOOLCHAIN}" diff --git a/packages/devel/autoconf/package.mk b/packages/devel/autoconf/package.mk index 1d9fd4f252..8ec2ebc0d7 100644 --- a/packages/devel/autoconf/package.mk +++ b/packages/devel/autoconf/package.mk @@ -10,6 +10,7 @@ PKG_SITE="https://www.gnu.org/software/autoconf/" PKG_URL="https://ftpmirror.gnu.org/autoconf/${PKG_NAME}-${PKG_VERSION}.tar.xz" PKG_DEPENDS_HOST="ccache:host m4:host gettext:host" PKG_LONGDESC="A GNU tool for automatically configuring source code." +PKG_BUILD_FLAGS="-cfg-libs:host" PKG_CONFIGURE_OPTS_HOST="EMACS=no \ ac_cv_path_M4=${TOOLCHAIN}/bin/m4 \ diff --git a/packages/devel/automake/package.mk b/packages/devel/automake/package.mk index 0e75520e04..25e764c5c0 100644 --- a/packages/devel/automake/package.mk +++ b/packages/devel/automake/package.mk @@ -9,7 +9,7 @@ PKG_SITE="http://sources.redhat.com/automake/" PKG_URL="http://ftpmirror.gnu.org/automake/${PKG_NAME}-${PKG_VERSION}.tar.xz" PKG_DEPENDS_HOST="ccache:host autoconf:host" PKG_LONGDESC="A GNU tool for automatically creating Makefiles." -PKG_BUILD_FLAGS="-parallel" +PKG_BUILD_FLAGS="-parallel -cfg-libs:host" PKG_CONFIGURE_OPTS_HOST="--target=${TARGET_NAME} --disable-silent-rules" diff --git a/packages/devel/bison/package.mk b/packages/devel/bison/package.mk index 1eba27df2b..1ae4a04185 100644 --- a/packages/devel/bison/package.mk +++ b/packages/devel/bison/package.mk @@ -10,7 +10,7 @@ PKG_SITE="http://www.gnu.org/software/bison/" PKG_URL="http://ftpmirror.gnu.org/bison/${PKG_NAME}-${PKG_VERSION}.tar.xz" PKG_DEPENDS_HOST="ccache:host m4:host" PKG_LONGDESC="A general-purpose parser generator." -PKG_BUILD_FLAGS="-parallel" +PKG_BUILD_FLAGS="-parallel -cfg-libs:host" PKG_CONFIGURE_OPTS_HOST="--disable-rpath --with-gnu-ld" diff --git a/packages/devel/intltool/package.mk b/packages/devel/intltool/package.mk index 4fb8320d10..fefcb2299b 100644 --- a/packages/devel/intltool/package.mk +++ b/packages/devel/intltool/package.mk @@ -9,6 +9,7 @@ PKG_SITE="http://www.gnome.org" PKG_URL="http://launchpad.net/intltool/trunk/${PKG_VERSION}/+download/${PKG_NAME}-${PKG_VERSION}.tar.gz" PKG_DEPENDS_HOST="ccache:host" PKG_LONGDESC="Tools to translate strings from various source files (.xml.in, .glade, .desktop.in, .server.in, .oaf.in)." +PKG_BUILD_FLAGS="-cfg-libs:host" post_makeinstall_host() { mkdir -p ${SYSROOT_PREFIX}/usr/share/aclocal diff --git a/packages/devel/libfstrcmp/package.mk b/packages/devel/libfstrcmp/package.mk index 7347ce692d..d464d03957 100644 --- a/packages/devel/libfstrcmp/package.mk +++ b/packages/devel/libfstrcmp/package.mk @@ -9,6 +9,7 @@ PKG_SITE="http://fstrcmp.sourceforge.net/" PKG_URL="https://downloads.sourceforge.net/project/fstrcmp/fstrcmp/$(get_pkg_version_maj_min)/fstrcmp-${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="The fstrcmp project provides a library that is used to make fuzzy comparisons of strings and byte arrays, including multi-byte character strings." +PKG_BUILD_FLAGS="-cfg-libs" pre_configure_target() { cd "${PKG_BUILD}" diff --git a/packages/devel/m4/package.mk b/packages/devel/m4/package.mk index 328a79a8c8..3e430de17c 100644 --- a/packages/devel/m4/package.mk +++ b/packages/devel/m4/package.mk @@ -9,6 +9,7 @@ PKG_SITE="http://www.gnu.org/software/m4/" PKG_URL="http://ftpmirror.gnu.org/m4/${PKG_NAME}-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_HOST="ccache:host" PKG_LONGDESC="The m4 macro processor." +PKG_BUILD_FLAGS="-cfg-libs:host" PKG_CONFIGURE_OPTS_HOST="gl_cv_func_gettimeofday_clobber=no --target=${TARGET_NAME}" diff --git a/packages/devel/make/package.mk b/packages/devel/make/package.mk index e9a4793e6f..3e410d0fc1 100644 --- a/packages/devel/make/package.mk +++ b/packages/devel/make/package.mk @@ -10,7 +10,7 @@ PKG_SITE="https://www.gnu.org/software/make/" PKG_URL="http://ftpmirror.gnu.org/make/${PKG_NAME}-${PKG_VERSION}.tar.gz" PKG_DEPENDS_HOST="" PKG_LONGDESC="Utility to maintain groups of programs." -PKG_BUILD_FLAGS="+local-cc" +PKG_BUILD_FLAGS="+local-cc -cfg-libs:host" post_makeinstall_host() { ln -sf make ${TOOLCHAIN}/bin/gmake diff --git a/packages/devel/patchelf/package.mk b/packages/devel/patchelf/package.mk index 7c8c66aea6..f8c6f17406 100644 --- a/packages/devel/patchelf/package.mk +++ b/packages/devel/patchelf/package.mk @@ -10,3 +10,4 @@ PKG_URL="https://github.com/NixOS/patchelf/releases/download/${PKG_VERSION}/patc PKG_DEPENDS_HOST="autotools:host" PKG_LONGDESC="A small utility to modify the dynamic linker and RPATH of ELF executables" PKG_TOOLCHAIN="autotools" +PKG_BUILD_FLAGS="-cfg-libs:host" diff --git a/packages/devel/slang/package.mk b/packages/devel/slang/package.mk index b91d98051e..31cb371a5e 100644 --- a/packages/devel/slang/package.mk +++ b/packages/devel/slang/package.mk @@ -10,7 +10,7 @@ PKG_SITE="http://www.jedsoft.org/slang/" PKG_URL="https://www.jedsoft.org/releases/slang/${PKG_NAME}-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="A library designed to allow a developer to create robust multi-platform software." -PKG_BUILD_FLAGS="-parallel" +PKG_BUILD_FLAGS="-parallel -cfg-libs" PKG_CONFIGURE_OPTS_TARGET="--without-pcre \ --without-onig" diff --git a/packages/network/cifs-utils/package.mk b/packages/network/cifs-utils/package.mk index 0470b82497..b63430a3ac 100644 --- a/packages/network/cifs-utils/package.mk +++ b/packages/network/cifs-utils/package.mk @@ -9,6 +9,7 @@ PKG_SITE="https://wiki.samba.org/index.php/LinuxCIFS_utils" PKG_URL="https://download.samba.org/pub/linux-cifs/cifs-utils/cifs-utils-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="Linux CIFS userspace utilities" +PKG_BUILD_FLAGS="-cfg-libs" PKG_CONFIGURE_OPTS_TARGET="ac_cv_func_malloc_0_nonnull=yes \ ac_cv_func_realloc_0_nonnull=yes \ diff --git a/packages/network/ethtool/package.mk b/packages/network/ethtool/package.mk index 466502ff46..b6cabf49e0 100644 --- a/packages/network/ethtool/package.mk +++ b/packages/network/ethtool/package.mk @@ -10,3 +10,4 @@ PKG_SITE="https://www.kernel.org/pub/software/network/ethtool/" PKG_URL="https://www.kernel.org/pub/software/network/ethtool/${PKG_NAME}-${PKG_VERSION}.tar.xz" PKG_DEPENDS_TARGET="toolchain libmnl" PKG_LONGDESC="Ethtool is used for querying settings of an ethernet device and changing them." +PKG_BUILD_FLAGS="-cfg-libs" diff --git a/packages/network/openssh/package.mk b/packages/network/openssh/package.mk index ad0b402d0c..5fa6c4e498 100644 --- a/packages/network/openssh/package.mk +++ b/packages/network/openssh/package.mk @@ -11,7 +11,7 @@ PKG_URL="https://cdn.openbsd.org/pub/OpenBSD/OpenSSH/portable/${PKG_NAME}-${PKG_ PKG_DEPENDS_TARGET="toolchain openssl zlib" PKG_LONGDESC="An open re-implementation of the SSH package." PKG_TOOLCHAIN="autotools" -PKG_BUILD_FLAGS="+lto" +PKG_BUILD_FLAGS="+lto -cfg-libs" PKG_CONFIGURE_OPTS_TARGET="ac_cv_header_rpc_types_h=no \ --sysconfdir=/etc/ssh \ diff --git a/packages/network/rpcbind/package.mk b/packages/network/rpcbind/package.mk index 162eef3463..1c430edd28 100644 --- a/packages/network/rpcbind/package.mk +++ b/packages/network/rpcbind/package.mk @@ -10,6 +10,7 @@ PKG_SITE="http://rpcbind.sourceforge.net/" PKG_URL="${SOURCEFORGE_SRC}/rpcbind/rpcbind/${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain libtirpc systemd" PKG_LONGDESC="The rpcbind utility is a server that converts RPC program numbers into universal addresses." +PKG_BUILD_FLAGS="-cfg-libs" PKG_CONFIGURE_OPTS_TARGET="ac_cv_header_rpcsvc_mount_h=no \ --disable-warmstarts \ diff --git a/packages/security/nspr/package.mk b/packages/security/nspr/package.mk index 299c1190ef..8e4ab4b588 100644 --- a/packages/security/nspr/package.mk +++ b/packages/security/nspr/package.mk @@ -11,7 +11,7 @@ PKG_DEPENDS_TARGET="autotools:host gcc:host nss:host nspr:host" PKG_DEPENDS_UNPACK="nss" PKG_LONGDESC="Netscape Portable Runtime (NSPR) provides a platform-neutral API for system level and libc like functions" PKG_TOOLCHAIN="configure" -PKG_BUILD_FLAGS="-parallel" +PKG_BUILD_FLAGS="-parallel -cfg-libs" if [ "${TARGET_ARCH}" = "x86_64" ]; then TARGET_USE_64="--enable-64bit" diff --git a/packages/sysutils/dosfstools/package.mk b/packages/sysutils/dosfstools/package.mk index 8295c3ff46..0dc5c98dbd 100644 --- a/packages/sysutils/dosfstools/package.mk +++ b/packages/sysutils/dosfstools/package.mk @@ -12,6 +12,7 @@ PKG_DEPENDS_HOST="toolchain:host" PKG_DEPENDS_TARGET="toolchain" PKG_DEPENDS_INIT="toolchain" PKG_LONGDESC="dosfstools contains utilities for making and checking MS-DOS FAT filesystems." +PKG_BUILD_FLAGS="-cfg-libs -cfg-libs:host -cfg-libs:init" PKG_CONFIGURE_OPTS_TARGET="--enable-compat-symlinks" PKG_MAKE_OPTS_TARGET="PREFIX=/usr" diff --git a/packages/sysutils/e2fsprogs/package.mk b/packages/sysutils/e2fsprogs/package.mk index 67235cdc49..8a43de793c 100644 --- a/packages/sysutils/e2fsprogs/package.mk +++ b/packages/sysutils/e2fsprogs/package.mk @@ -12,7 +12,7 @@ PKG_DEPENDS_HOST="autotools:host" PKG_DEPENDS_TARGET="autotools:host gcc:host" PKG_DEPENDS_INIT="autotools:host gcc:host" PKG_LONGDESC="The filesystem utilities for the EXT2 filesystem, including e2fsck, mke2fs, dumpe2fs, fsck, and others." -PKG_BUILD_FLAGS="-parallel" +PKG_BUILD_FLAGS="-parallel -cfg-libs -cfg-libs:host -cfg-libs:init" PKG_CONFIGURE_OPTS_HOST="--prefix=${TOOLCHAIN}/ \ --bindir=${TOOLCHAIN}/bin \ diff --git a/packages/sysutils/eventlircd/package.mk b/packages/sysutils/eventlircd/package.mk index 2bac6d268a..bef801e727 100644 --- a/packages/sysutils/eventlircd/package.mk +++ b/packages/sysutils/eventlircd/package.mk @@ -11,6 +11,7 @@ PKG_URL="https://github.com/LibreELEC/eventlircd/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain systemd lirc" PKG_LONGDESC="The eventlircd daemon provides four functions for LIRC devices" PKG_TOOLCHAIN="autotools" +PKG_BUILD_FLAGS="-cfg-libs" PKG_CONFIGURE_OPTS_TARGET="--with-udev-dir=/usr/lib/udev \ --with-lircd-socket=/run/lirc/lircd" diff --git a/packages/sysutils/sed/package.mk b/packages/sysutils/sed/package.mk index 2886321803..d0e5966445 100644 --- a/packages/sysutils/sed/package.mk +++ b/packages/sysutils/sed/package.mk @@ -10,5 +10,6 @@ PKG_SITE="http://www.gnu.org/software/sed/" PKG_URL="https://mirrors.kernel.org/gnu/sed/${PKG_NAME}-${PKG_VERSION}.tar.xz" PKG_DEPENDS_HOST="ccache:host" PKG_LONGDESC="The sed (Stream EDitor) editor is a stream or batch (non-interactive) editor." +PKG_BUILD_FLAGS="-cfg-libs:host" PKG_CONFIGURE_OPTS_HOST="--disable-nls --disable-acl --without-selinux" diff --git a/packages/textproc/xmlstarlet/package.mk b/packages/textproc/xmlstarlet/package.mk index 59c859cdac..6921747fe5 100644 --- a/packages/textproc/xmlstarlet/package.mk +++ b/packages/textproc/xmlstarlet/package.mk @@ -10,6 +10,7 @@ PKG_URL="http://netcologne.dl.sourceforge.net/project/xmlstar/${PKG_NAME}/${PKG_ PKG_DEPENDS_HOST="libxml2:host libxslt:host" PKG_DEPENDS_TARGET="toolchain libxml2 libxslt" PKG_LONGDESC="XMLStarlet is a command-line XML utility which allows the modification and validation of XML documents." +PKG_BUILD_FLAGS="-cfg-libs -cfg-libs:host" PKG_CONFIGURE_OPTS_HOST=" ac_cv_func_malloc_0_nonnull=yes \ ac_cv_func_realloc_0_nonnull=yes \ diff --git a/packages/tools/grub/package.mk b/packages/tools/grub/package.mk index fe2492805a..9d32772898 100755 --- a/packages/tools/grub/package.mk +++ b/packages/tools/grub/package.mk @@ -13,6 +13,7 @@ PKG_DEPENDS_TARGET="toolchain flex freetype:host gettext:host grub:host" PKG_DEPENDS_UNPACK="gnulib" PKG_LONGDESC="GRUB is a Multiboot boot loader." PKG_TOOLCHAIN="configure" +PKG_BUILD_FLAGS="-cfg-libs -cfg-libs:host" pre_configure_host() { unset CFLAGS diff --git a/packages/tools/mtools/package.mk b/packages/tools/mtools/package.mk index ed7e58752e..923ca9b249 100644 --- a/packages/tools/mtools/package.mk +++ b/packages/tools/mtools/package.mk @@ -11,3 +11,4 @@ PKG_URL="http://ftpmirror.gnu.org/${PKG_NAME}/${PKG_NAME}-${PKG_VERSION}.tar.bz2 PKG_DEPENDS_HOST="toolchain:host" PKG_LONGDESC="mtools: A collection of utilities to access MS-DOS disks" PKG_TOOLCHAIN="autotools" +PKG_BUILD_FLAGS="-cfg-libs:host" diff --git a/packages/tools/nano/package.mk b/packages/tools/nano/package.mk index 15a0c54f23..9bdee91dcf 100644 --- a/packages/tools/nano/package.mk +++ b/packages/tools/nano/package.mk @@ -10,6 +10,7 @@ PKG_SITE="https://www.nano-editor.org/" PKG_URL="https://www.nano-editor.org/dist/v${PKG_VERSION%%.*}/${PKG_NAME}-${PKG_VERSION}.tar.xz" PKG_DEPENDS_TARGET="toolchain ncurses" PKG_LONGDESC="Nano is an enhanced clone of the Pico text editor." +PKG_BUILD_FLAGS="-cfg-libs" PKG_CONFIGURE_OPTS_TARGET="--disable-utf8 \ --disable-nls \ diff --git a/packages/tools/newt/package.mk b/packages/tools/newt/package.mk index 6bdaca02a2..e0993d117b 100644 --- a/packages/tools/newt/package.mk +++ b/packages/tools/newt/package.mk @@ -10,6 +10,7 @@ PKG_URL="https://releases.pagure.org/newt/${PKG_NAME}-${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain slang popt" PKG_LONGDESC="Newt is a programming library for color text mode, widget based user interfaces." PKG_TOOLCHAIN="autotools" +PKG_BUILD_FLAGS="-cfg-libs" PKG_CONFIGURE_OPTS_TARGET="--disable-nls \ --without-python \ diff --git a/packages/x11/util/util-macros/package.mk b/packages/x11/util/util-macros/package.mk index e3b4a1b2fc..6d0369ef0a 100644 --- a/packages/x11/util/util-macros/package.mk +++ b/packages/x11/util/util-macros/package.mk @@ -10,6 +10,7 @@ PKG_SITE="https://www.X.org" PKG_URL="https://xorg.freedesktop.org/archive/individual/util/${PKG_NAME}-${PKG_VERSION}.tar.xz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="X.org autoconf utilities such as M4 macros." +PKG_BUILD_FLAGS="-cfg-libs" post_makeinstall_target() { rm -rf ${INSTALL}/usr From bc6eb1da3c0514d470bf20ab4398280c67309f00 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Sun, 15 Sep 2024 06:22:43 +0000 Subject: [PATCH 03/18] cleanup packages: use cfg-libs option --- .../system-tools-depends/mtpfs/package.mk | 3 +-- .../system-tools-depends/screen/package.mk | 6 +----- packages/addons/service/minisatip/package.mk | 3 +-- packages/devel/elfutils/package.mk | 10 +--------- packages/lang/nasm/package.mk | 5 +---- packages/network/rsync/package.mk | 10 +--------- 6 files changed, 6 insertions(+), 31 deletions(-) diff --git a/packages/addons/addon-depends/system-tools-depends/mtpfs/package.mk b/packages/addons/addon-depends/system-tools-depends/mtpfs/package.mk index 15eb9d5c4c..b8e0057980 100644 --- a/packages/addons/addon-depends/system-tools-depends/mtpfs/package.mk +++ b/packages/addons/addon-depends/system-tools-depends/mtpfs/package.mk @@ -10,12 +10,11 @@ PKG_URL="https://github.com/cjd/mtpfs/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain fuse glib libmtp" PKG_LONGDESC="MTPfs is a FUSE filesystem that supports reading and writing from any MTP device." PKG_TOOLCHAIN="autotools" -PKG_BUILD_FLAGS="-sysroot" +PKG_BUILD_FLAGS="-sysroot -cfg-libs" PKG_CONFIGURE_OPTS_TARGET="--disable-mad" # TODO: mtpfs runs host utils while building, fix and set pre_configure_target() { export LIBS="-lusb-1.0 -ludev" - TARGET_CONFIGURE_OPTS=$(echo ${TARGET_CONFIGURE_OPTS} | sed -e "s|--disable-static||" -e "s|--enable-shared||") } diff --git a/packages/addons/addon-depends/system-tools-depends/screen/package.mk b/packages/addons/addon-depends/system-tools-depends/screen/package.mk index 9004e63225..65402b112d 100644 --- a/packages/addons/addon-depends/system-tools-depends/screen/package.mk +++ b/packages/addons/addon-depends/system-tools-depends/screen/package.mk @@ -9,14 +9,10 @@ PKG_SITE="https://www.gnu.org/software/screen/" PKG_URL="https://ftpmirror.gnu.org/screen/${PKG_NAME}-${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain ncurses" PKG_LONGDESC="Screen is a window manager that multiplexes a physical terminal between several processes" -PKG_BUILD_FLAGS="-sysroot -parallel" +PKG_BUILD_FLAGS="-sysroot -parallel -cfg-libs" PKG_TOOLCHAIN="autotools" PKG_CONFIGURE_OPTS_TARGET="ac_cv_header_utempter_h=no \ --disable-pam \ --disable-telnet \ --disable-socket-dir" - -pre_configure_target() { - TARGET_CONFIGURE_OPTS=$(echo ${TARGET_CONFIGURE_OPTS} | sed -e "s|--disable-static||" -e "s|--enable-shared||") -} diff --git a/packages/addons/service/minisatip/package.mk b/packages/addons/service/minisatip/package.mk index 84940c5dad..8d045d2b13 100644 --- a/packages/addons/service/minisatip/package.mk +++ b/packages/addons/service/minisatip/package.mk @@ -13,7 +13,7 @@ PKG_DEPENDS_TARGET="toolchain libdvbcsa libxml2 openssl" PKG_SECTION="service" PKG_SHORTDESC="minisatip: a Sat>IP streaming server for Linux" PKG_LONGDESC="minisatip(${PKG_VERSION_NUMBER}): is a Sat>IP streaming server for Linux supporting DVB-C, DVB-S/S2, DVB-T/T2, ATSC and ISDB-T" -PKG_BUILD_FLAGS="-sysroot" +PKG_BUILD_FLAGS="-sysroot -cfg-libs" PKG_IS_ADDON="yes" PKG_ADDON_NAME="Minisatip" @@ -26,7 +26,6 @@ PKG_CONFIGURE_OPTS_TARGET="--enable-static \ --with-xml2=$(get_install_dir libxml2)/usr/include/libxml2" pre_configure_target() { - TARGET_CONFIGURE_OPTS=$(echo ${TARGET_CONFIGURE_OPTS} | sed -e "s|--disable-static||" -e "s|--enable-shared||") cd ${PKG_BUILD} rm -rf .${TARGET_NAME} } diff --git a/packages/devel/elfutils/package.mk b/packages/devel/elfutils/package.mk index 830df56e69..1d96d17ad7 100644 --- a/packages/devel/elfutils/package.mk +++ b/packages/devel/elfutils/package.mk @@ -12,7 +12,7 @@ PKG_DEPENDS_HOST="autoconf:host automake:host m4:host make:host zlib:host" PKG_DEPENDS_TARGET="toolchain zlib elfutils:host" PKG_LONGDESC="A collection of utilities to handle ELF objects." PKG_TOOLCHAIN="autotools" -PKG_BUILD_FLAGS="+pic" +PKG_BUILD_FLAGS="+pic -cfg-libs -cfg-libs:host" if [ "${LIBREELEC_VERSION}" = "devel" ]; then PKG_PROGRAMS="--enable-programs --program-prefix=" @@ -40,14 +40,6 @@ PKG_CONFIGURE_OPTS_TARGET="utrace_cv_cc_biarch=false \ --without-bzlib \ --without-lzma" -pre_configure_host() { - HOST_CONFIGURE_OPTS=$(echo ${HOST_CONFIGURE_OPTS} | sed -e "s|--disable-static||" -e "s|--enable-shared||") -} - -pre_configure_target() { - TARGET_CONFIGURE_OPTS=$(echo ${TARGET_CONFIGURE_OPTS} | sed -e "s|--disable-static||" -e "s|--enable-shared||") -} - post_makeinstall_target() { # don't install progs into sysroot rm -fr ${SYSROOT_PREFIX}/usr/bin diff --git a/packages/lang/nasm/package.mk b/packages/lang/nasm/package.mk index 18d7506449..091bc02151 100644 --- a/packages/lang/nasm/package.mk +++ b/packages/lang/nasm/package.mk @@ -11,7 +11,4 @@ PKG_SITE="https://www.nasm.us/" PKG_URL="https://www.nasm.us/pub/nasm/releasebuilds/${PKG_VERSION}/nasm-${PKG_VERSION}.tar.xz" PKG_DEPENDS_HOST="ccache:host" PKG_LONGDESC="The Netwide Assembler, NASM, is an 80x86 and x86-64 assembler designed for portability and modularity." - -pre_configure_host() { - HOST_CONFIGURE_OPTS=$(echo ${HOST_CONFIGURE_OPTS} | sed -e "s|--disable-static||" -e "s|--enable-shared||") -} +PKG_BUILD_FLAGS="-cfg-libs:host" diff --git a/packages/network/rsync/package.mk b/packages/network/rsync/package.mk index 2933d24784..cd20b4c037 100644 --- a/packages/network/rsync/package.mk +++ b/packages/network/rsync/package.mk @@ -10,7 +10,7 @@ PKG_URL="https://download.samba.org/pub/rsync/src/${PKG_NAME}-${PKG_VERSION}.tar PKG_DEPENDS_HOST="autotools:host zlib:host" PKG_DEPENDS_TARGET="toolchain zlib openssl" PKG_LONGDESC="A very fast method for bringing remote files into sync." -PKG_BUILD_FLAGS="-sysroot" +PKG_BUILD_FLAGS="-sysroot -cfg-libs -cfg-libs:host" PKG_CONFIGURE_OPTS_HOST="--disable-md2man \ --disable-ipv6 \ @@ -34,14 +34,6 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-acl-support \ --with-included-popt \ --without-included-zlib" -pre_configure_host() { - HOST_CONFIGURE_OPTS=$(echo ${HOST_CONFIGURE_OPTS} | sed -e "s|--disable-static||" -e "s|--enable-shared||") -} - -pre_configure_target() { - TARGET_CONFIGURE_OPTS=$(echo ${TARGET_CONFIGURE_OPTS} | sed -e "s|--disable-static||" -e "s|--enable-shared||") -} - pre_make_host() { # do not detect LE git version echo "#define RSYNC_GITVER \"${PKG_VERSION}\"" >git-version.h From d161095bceaffe0792e96165fb08abd6b52d872f Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Sun, 15 Sep 2024 14:45:48 +0000 Subject: [PATCH 04/18] cleanup addon packages: use cfg-libs option --- .../addons/addon-depends/dvb-tools-depends/dvbsnoop/package.mk | 2 +- .../addons/addon-depends/dvb-tools-depends/mumudvb/package.mk | 2 +- .../addons/addon-depends/dvb-tools-depends/t2scan/package.mk | 2 +- .../addons/addon-depends/dvb-tools-depends/w_scan/package.mk | 2 +- .../addons/addon-depends/lcdd-depends/serdisplib/package.mk | 1 + .../addon-depends/network-tools-depends/bwm-ng/package.mk | 2 +- .../addons/addon-depends/network-tools-depends/iftop/package.mk | 2 +- .../addons/addon-depends/network-tools-depends/ngrep/package.mk | 2 +- .../addon-depends/network-tools-depends/rar2fs/package.mk | 2 +- .../addon-depends/network-tools-depends/tcpdump/package.mk | 2 +- packages/addons/addon-depends/snapcast-depends/asio/package.mk | 2 +- packages/addons/addon-depends/snapcast-depends/nqptp/package.mk | 2 +- .../addon-depends/snapcast-depends/shairport-sync/package.mk | 2 +- .../addon-depends/system-tools-depends/diffutils/package.mk | 2 +- .../addons/addon-depends/system-tools-depends/dtach/package.mk | 2 +- .../addons/addon-depends/system-tools-depends/evtest/package.mk | 2 +- .../addons/addon-depends/system-tools-depends/fdupes/package.mk | 2 +- .../addon-depends/system-tools-depends/hddtemp/package.mk | 2 +- .../addons/addon-depends/system-tools-depends/patch/package.mk | 2 +- .../addons/addon-depends/system-tools-depends/sdparm/package.mk | 2 +- .../addon-depends/system-tools-depends/smartmontools/package.mk | 2 +- .../addons/addon-depends/system-tools-depends/vim/package.mk | 2 +- packages/addons/service/lcdd/package.mk | 2 +- packages/devel/libpthread-stubs/package.mk | 1 + packages/network/sshpass/package.mk | 1 + packages/x11/lib/xtrans/package.mk | 1 + packages/x11/proto/xcb-proto/package.mk | 1 + 27 files changed, 27 insertions(+), 22 deletions(-) diff --git a/packages/addons/addon-depends/dvb-tools-depends/dvbsnoop/package.mk b/packages/addons/addon-depends/dvb-tools-depends/dvbsnoop/package.mk index d1392e7983..3219c62df1 100644 --- a/packages/addons/addon-depends/dvb-tools-depends/dvbsnoop/package.mk +++ b/packages/addons/addon-depends/dvb-tools-depends/dvbsnoop/package.mk @@ -10,4 +10,4 @@ PKG_URL="https://github.com/Duckbox-Developers/dvbsnoop/archive/${PKG_VERSION}.t PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="dvbsnoop is a DVB/MPEG stream analyzer program" PKG_TOOLCHAIN="autotools" -PKG_BUILD_FLAGS="-sysroot" +PKG_BUILD_FLAGS="-sysroot -cfg-libs" diff --git a/packages/addons/addon-depends/dvb-tools-depends/mumudvb/package.mk b/packages/addons/addon-depends/dvb-tools-depends/mumudvb/package.mk index 07b5b3a699..9dcec7e37b 100644 --- a/packages/addons/addon-depends/dvb-tools-depends/mumudvb/package.mk +++ b/packages/addons/addon-depends/dvb-tools-depends/mumudvb/package.mk @@ -10,4 +10,4 @@ PKG_URL="https://github.com/braice/MuMuDVB/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain libdvbcsa" PKG_LONGDESC="MuMuDVB (Multi Multicast DVB) is a program that streams from DVB on a network using multicasting or unicast" PKG_TOOLCHAIN="autotools" -PKG_BUILD_FLAGS="-sysroot" +PKG_BUILD_FLAGS="-sysroot -cfg-libs" diff --git a/packages/addons/addon-depends/dvb-tools-depends/t2scan/package.mk b/packages/addons/addon-depends/dvb-tools-depends/t2scan/package.mk index 651a8c42de..8521b9e7f3 100644 --- a/packages/addons/addon-depends/dvb-tools-depends/t2scan/package.mk +++ b/packages/addons/addon-depends/dvb-tools-depends/t2scan/package.mk @@ -9,4 +9,4 @@ PKG_SITE="https://github.com/mighty-p/t2scan" PKG_URL="https://github.com/mighty-p/t2scan/archive/v${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="A small channel scan tool which generates DVB-T/T2 channels.conf files." -PKG_BUILD_FLAGS="-sysroot" +PKG_BUILD_FLAGS="-sysroot -cfg-libs" diff --git a/packages/addons/addon-depends/dvb-tools-depends/w_scan/package.mk b/packages/addons/addon-depends/dvb-tools-depends/w_scan/package.mk index 0f611c5db2..a065bf877c 100644 --- a/packages/addons/addon-depends/dvb-tools-depends/w_scan/package.mk +++ b/packages/addons/addon-depends/dvb-tools-depends/w_scan/package.mk @@ -10,4 +10,4 @@ PKG_URL="https://www.gen2vdr.de/wirbel/w_scan/w_scan-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="A channel scan tool which generates ATSC, DVB-C, DVB-S/S2 and DVB-T channels.conf files." PKG_TOOLCHAIN="autotools" -PKG_BUILD_FLAGS="-sysroot" +PKG_BUILD_FLAGS="-sysroot -cfg-libs" diff --git a/packages/addons/addon-depends/lcdd-depends/serdisplib/package.mk b/packages/addons/addon-depends/lcdd-depends/serdisplib/package.mk index 9cb0f47831..a91c46336e 100644 --- a/packages/addons/addon-depends/lcdd-depends/serdisplib/package.mk +++ b/packages/addons/addon-depends/lcdd-depends/serdisplib/package.mk @@ -10,6 +10,7 @@ PKG_SITE="http://serdisplib.sourceforge.net/" PKG_URL="${SOURCEFORGE_SRC}/${PKG_NAME}/${PKG_NAME}-${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain libusb-compat" PKG_LONGDESC="Library to drive serial/parallel/usb displays with built-in controllers." +PKG_BUILD_FLAGS="-cfg-libs" PKG_CONFIGURE_OPTS_TARGET="--prefix=${SYSROOT_PREFIX}/usr \ --bindir=${SYSROOT_PREFIX}/usr/bin \ diff --git a/packages/addons/addon-depends/network-tools-depends/bwm-ng/package.mk b/packages/addons/addon-depends/network-tools-depends/bwm-ng/package.mk index 6e0c785f7f..61a39ad62e 100644 --- a/packages/addons/addon-depends/network-tools-depends/bwm-ng/package.mk +++ b/packages/addons/addon-depends/network-tools-depends/bwm-ng/package.mk @@ -10,7 +10,7 @@ PKG_URL="https://github.com/vgropp/bwm-ng/archive/v${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain ncurses libstatgrab" PKG_LONGDESC="A small and simple console-based live network and disk io bandwidth monitor." PKG_TOOLCHAIN="autotools" -PKG_BUILD_FLAGS="-sysroot" +PKG_BUILD_FLAGS="-sysroot -cfg-libs" PKG_CONFIGURE_OPTS_TARGET="--with-libstatgrab \ --with-time \ diff --git a/packages/addons/addon-depends/network-tools-depends/iftop/package.mk b/packages/addons/addon-depends/network-tools-depends/iftop/package.mk index 27e52f51ac..372fde8388 100644 --- a/packages/addons/addon-depends/network-tools-depends/iftop/package.mk +++ b/packages/addons/addon-depends/network-tools-depends/iftop/package.mk @@ -10,7 +10,7 @@ PKG_URL="https://code.blinkace.com/pdw/iftop/-/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain ncurses libpcap libnl" PKG_LONGDESC="A tool to display bandwidth usage on an interface." PKG_TOOLCHAIN="autotools" -PKG_BUILD_FLAGS="-sysroot" +PKG_BUILD_FLAGS="-sysroot -cfg-libs" pre_build_target() { mkdir -p ${PKG_BUILD}/.${TARGET_NAME} diff --git a/packages/addons/addon-depends/network-tools-depends/ngrep/package.mk b/packages/addons/addon-depends/network-tools-depends/ngrep/package.mk index 003cab18dc..7698032ad9 100644 --- a/packages/addons/addon-depends/network-tools-depends/ngrep/package.mk +++ b/packages/addons/addon-depends/network-tools-depends/ngrep/package.mk @@ -10,7 +10,7 @@ PKG_URL="https://github.com/jpr5/ngrep/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain libpcap pcre2" PKG_LONGDESC="A tool like GNU grep applied to the network layer." PKG_TOOLCHAIN="autotools" -PKG_BUILD_FLAGS="-sysroot -parallel" +PKG_BUILD_FLAGS="-sysroot -parallel -cfg-libs" PKG_CONFIGURE_OPTS_TARGET="--with-pcap-includes=${SYSROOT_PREFIX}/usr/include \ --enable-ipv6 \ diff --git a/packages/addons/addon-depends/network-tools-depends/rar2fs/package.mk b/packages/addons/addon-depends/network-tools-depends/rar2fs/package.mk index 38f3696309..8ef78af5af 100644 --- a/packages/addons/addon-depends/network-tools-depends/rar2fs/package.mk +++ b/packages/addons/addon-depends/network-tools-depends/rar2fs/package.mk @@ -9,7 +9,7 @@ PKG_SITE="https://github.com/hasse69/rar2fs" PKG_URL="https://github.com/hasse69/rar2fs/archive/refs/tags/v${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain fuse unrar" PKG_LONGDESC="FUSE file system for reading RAR archives" -PKG_BUILD_FLAGS="-sysroot" +PKG_BUILD_FLAGS="-sysroot -cfg-libs" PKG_TOOLCHAIN="autotools" pre_configure_target() { diff --git a/packages/addons/addon-depends/network-tools-depends/tcpdump/package.mk b/packages/addons/addon-depends/network-tools-depends/tcpdump/package.mk index 9f6c43658f..4b18224b07 100644 --- a/packages/addons/addon-depends/network-tools-depends/tcpdump/package.mk +++ b/packages/addons/addon-depends/network-tools-depends/tcpdump/package.mk @@ -8,7 +8,7 @@ PKG_SITE="https://www.tcpdump.org/" PKG_URL="https://www.tcpdump.org/release/tcpdump-${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain libpcap libtirpc" PKG_LONGDESC="A program that allows you to dump the traffic on a network." -PKG_BUILD_FLAGS="-sysroot" +PKG_BUILD_FLAGS="-sysroot -cfg-libs" # use configure, not cmake. review cmake in future release. PKG_TOOLCHAIN="configure" diff --git a/packages/addons/addon-depends/snapcast-depends/asio/package.mk b/packages/addons/addon-depends/snapcast-depends/asio/package.mk index fef7ad147d..10747f1971 100644 --- a/packages/addons/addon-depends/snapcast-depends/asio/package.mk +++ b/packages/addons/addon-depends/snapcast-depends/asio/package.mk @@ -11,7 +11,7 @@ PKG_SOURCE_DIR="asio-asio-${PKG_VERSION//./-}" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="Asio C++ Library." PKG_TOOLCHAIN="autotools" -PKG_BUILD_FLAGS="-sysroot" +PKG_BUILD_FLAGS="-sysroot -cfg-libs" PKG_CONFIGURE_OPTS_TARGET="--without-boost --without-openssl" diff --git a/packages/addons/addon-depends/snapcast-depends/nqptp/package.mk b/packages/addons/addon-depends/snapcast-depends/nqptp/package.mk index f9bacce368..9f54e38204 100644 --- a/packages/addons/addon-depends/snapcast-depends/nqptp/package.mk +++ b/packages/addons/addon-depends/snapcast-depends/nqptp/package.mk @@ -10,6 +10,6 @@ PKG_URL="https://github.com/mikebrady/nqptp/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="Not Quite PTP" PKG_TOOLCHAIN="autotools" -PKG_BUILD_FLAGS="-sysroot" +PKG_BUILD_FLAGS="-sysroot -cfg-libs" PKG_CONFIGURE_OPTS_TARGET="--with-systemd-startup" diff --git a/packages/addons/addon-depends/snapcast-depends/shairport-sync/package.mk b/packages/addons/addon-depends/snapcast-depends/shairport-sync/package.mk index bf506c9fe0..f06c27ccc9 100644 --- a/packages/addons/addon-depends/snapcast-depends/shairport-sync/package.mk +++ b/packages/addons/addon-depends/snapcast-depends/shairport-sync/package.mk @@ -10,7 +10,7 @@ PKG_URL="https://github.com/mikebrady/shairport-sync/archive/${PKG_VERSION}.tar. PKG_DEPENDS_TARGET="toolchain alsa-lib avahi ffmpeg libconfig libdaemon libgcrypt libplist libsndfile libsodium nqptp openssl popt pulseaudio soxr util-linux xxd:host" PKG_LONGDESC="AirPlay audio player." PKG_TOOLCHAIN="autotools" -PKG_BUILD_FLAGS="-sysroot" +PKG_BUILD_FLAGS="-sysroot -cfg-libs" PKG_CONFIGURE_OPTS_TARGET="--with-alsa \ --with-avahi \ diff --git a/packages/addons/addon-depends/system-tools-depends/diffutils/package.mk b/packages/addons/addon-depends/system-tools-depends/diffutils/package.mk index 0717419456..ad16ad7802 100644 --- a/packages/addons/addon-depends/system-tools-depends/diffutils/package.mk +++ b/packages/addons/addon-depends/system-tools-depends/diffutils/package.mk @@ -10,7 +10,7 @@ PKG_URL="http://ftpmirror.gnu.org/diffutils/${PKG_NAME}-${PKG_VERSION}.tar.xz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="A package of several programs related to finding differences between files." PKG_TOOLCHAIN="autotools" -PKG_BUILD_FLAGS="-sysroot" +PKG_BUILD_FLAGS="-sysroot -cfg-libs" PKG_CONFIGURE_OPTS_TARGET="--disable-nls \ --without-libsigsegv-prefix \ diff --git a/packages/addons/addon-depends/system-tools-depends/dtach/package.mk b/packages/addons/addon-depends/system-tools-depends/dtach/package.mk index 4bdb8c8d74..7a641672b8 100644 --- a/packages/addons/addon-depends/system-tools-depends/dtach/package.mk +++ b/packages/addons/addon-depends/system-tools-depends/dtach/package.mk @@ -9,7 +9,7 @@ PKG_SITE="http://dtach.sourceforge.net" PKG_URL="https://github.com/crigler/dtach/archive/v${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="A program that emulates the detach feature of screen." -PKG_BUILD_FLAGS="-sysroot" +PKG_BUILD_FLAGS="-sysroot -cfg-libs" makeinstall_target() { mkdir -p ${INSTALL}/usr/bin diff --git a/packages/addons/addon-depends/system-tools-depends/evtest/package.mk b/packages/addons/addon-depends/system-tools-depends/evtest/package.mk index 7acea50241..a70ea7db05 100644 --- a/packages/addons/addon-depends/system-tools-depends/evtest/package.mk +++ b/packages/addons/addon-depends/system-tools-depends/evtest/package.mk @@ -10,4 +10,4 @@ PKG_URL="https://repo.or.cz/evtest.git/snapshot/evtest-${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain libxml2" PKG_LONGDESC="A simple tool for input event debugging." PKG_TOOLCHAIN="autotools" -PKG_BUILD_FLAGS="-sysroot" +PKG_BUILD_FLAGS="-sysroot -cfg-libs" diff --git a/packages/addons/addon-depends/system-tools-depends/fdupes/package.mk b/packages/addons/addon-depends/system-tools-depends/fdupes/package.mk index 9a70cc1b7c..c3f24fa121 100644 --- a/packages/addons/addon-depends/system-tools-depends/fdupes/package.mk +++ b/packages/addons/addon-depends/system-tools-depends/fdupes/package.mk @@ -9,7 +9,7 @@ PKG_SITE="https://github.com/adrianlopezroche/fdupes" PKG_URL="https://github.com/adrianlopezroche/fdupes/releases/download/v${PKG_VERSION}/fdupes-${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain ncurses sqlite" PKG_LONGDESC="A program for identifying or deleting duplicate files residing within specified directories." -PKG_BUILD_FLAGS="-sysroot" +PKG_BUILD_FLAGS="-sysroot -cfg-libs" PKG_CONFIGURE_OPTS_TARGET="--without-ncurses" PKG_MAKE_OPTS_TARGET="PREFIX=/usr" diff --git a/packages/addons/addon-depends/system-tools-depends/hddtemp/package.mk b/packages/addons/addon-depends/system-tools-depends/hddtemp/package.mk index 447d325f31..41ab3dbec9 100644 --- a/packages/addons/addon-depends/system-tools-depends/hddtemp/package.mk +++ b/packages/addons/addon-depends/system-tools-depends/hddtemp/package.mk @@ -9,7 +9,7 @@ PKG_SITE="https://savannah.nongnu.org/projects/hddtemp" PKG_URL="https://github.com/vitlav/hddtemp/archive/v${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="A utility that gives you the temperature of your hard drive by reading S.M.A.R.T.." -PKG_BUILD_FLAGS="-sysroot" +PKG_BUILD_FLAGS="-sysroot -cfg-libs" PKG_TOOLCHAIN="autotools" PKG_CONFIGURE_OPTS_TARGET="--with-db-path=/storage/.kodi/addons/virtual.system-tools/data/hddtemp.db" diff --git a/packages/addons/addon-depends/system-tools-depends/patch/package.mk b/packages/addons/addon-depends/system-tools-depends/patch/package.mk index e06545a118..25ec9b486b 100644 --- a/packages/addons/addon-depends/system-tools-depends/patch/package.mk +++ b/packages/addons/addon-depends/system-tools-depends/patch/package.mk @@ -9,6 +9,6 @@ PKG_SITE="http://savannah.gnu.org/projects/patch/" PKG_URL="http://ftpmirror.gnu.org/patch/${PKG_NAME}-${PKG_VERSION}.tar.xz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="Patch takes a patch file containing a difference listing produced by the diff." -PKG_BUILD_FLAGS="-sysroot" +PKG_BUILD_FLAGS="-sysroot -cfg-libs" PKG_CONFIGURE_OPTS_TARGET="--disable-xattr" diff --git a/packages/addons/addon-depends/system-tools-depends/sdparm/package.mk b/packages/addons/addon-depends/system-tools-depends/sdparm/package.mk index 25a785ce16..6576a15040 100644 --- a/packages/addons/addon-depends/system-tools-depends/sdparm/package.mk +++ b/packages/addons/addon-depends/system-tools-depends/sdparm/package.mk @@ -9,4 +9,4 @@ PKG_SITE="https://sg.danny.cz/sg/sdparm.html" PKG_URL="https://sg.danny.cz/sg/p/sdparm-${PKG_VERSION}.tar.xz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="The sdparm utility accesses SCSI device parameters." -PKG_BUILD_FLAGS="-sysroot" +PKG_BUILD_FLAGS="-sysroot -cfg-libs" diff --git a/packages/addons/addon-depends/system-tools-depends/smartmontools/package.mk b/packages/addons/addon-depends/system-tools-depends/smartmontools/package.mk index ecb78ff7c1..6d1a698a28 100644 --- a/packages/addons/addon-depends/system-tools-depends/smartmontools/package.mk +++ b/packages/addons/addon-depends/system-tools-depends/smartmontools/package.mk @@ -9,7 +9,7 @@ PKG_SITE="https://www.smartmontools.org" PKG_URL="https://downloads.sourceforge.net/sourceforge/smartmontools/smartmontools-${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="Control and monitor storage systems using S.M.A.R.T." -PKG_BUILD_FLAGS="-sysroot" +PKG_BUILD_FLAGS="-sysroot -cfg-libs" PKG_CONFIGURE_OPTS_TARGET="--prefix=/usr \ --without-initscriptdir \ diff --git a/packages/addons/addon-depends/system-tools-depends/vim/package.mk b/packages/addons/addon-depends/system-tools-depends/vim/package.mk index 0f1066eb1e..4271bebd5f 100644 --- a/packages/addons/addon-depends/system-tools-depends/vim/package.mk +++ b/packages/addons/addon-depends/system-tools-depends/vim/package.mk @@ -9,7 +9,7 @@ PKG_SITE="http://www.vim.org/" PKG_URL="https://github.com/vim/vim/archive/v${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain ncurses" PKG_LONGDESC="Vim is a highly configurable text editor built to enable efficient text editing." -PKG_BUILD_FLAGS="-sysroot" +PKG_BUILD_FLAGS="-sysroot -cfg-libs" PKG_CONFIGURE_OPTS_TARGET="vim_cv_getcwd_broken=no \ vim_cv_memmove_handles_overlap=yes \ diff --git a/packages/addons/service/lcdd/package.mk b/packages/addons/service/lcdd/package.mk index ad9010e194..da7890f04a 100644 --- a/packages/addons/service/lcdd/package.mk +++ b/packages/addons/service/lcdd/package.mk @@ -15,7 +15,7 @@ PKG_SECTION="service" PKG_SHORTDESC="LCDproc: Software to display system information from your Linux/*BSD box on a LCD" PKG_LONGDESC="LCDproc (${PKG_VERSION}) is a piece of software that displays real-time system information from your Linux/*BSD box on a LCD. The server supports several serial devices: Matrix Orbital, Crystal Fontz, Bayrad, LB216, LCDM001 (kernelconcepts.de), Wirz-SLI, Cwlinux(.com) and PIC-an-LCD; and some devices connected to the LPT port: HD44780, STV5730, T6963, SED1520 and SED1330. Various clients are available that display things like CPU load, system load, memory usage, uptime, and a lot more." PKG_TOOLCHAIN="autotools" -PKG_BUILD_FLAGS="-parallel" +PKG_BUILD_FLAGS="-parallel -cfg-libs" PKG_IS_ADDON="yes" PKG_ADDON_NAME="LCDproc" diff --git a/packages/devel/libpthread-stubs/package.mk b/packages/devel/libpthread-stubs/package.mk index d96258e089..c3d5f9359b 100644 --- a/packages/devel/libpthread-stubs/package.mk +++ b/packages/devel/libpthread-stubs/package.mk @@ -9,3 +9,4 @@ PKG_SITE="http://xcb.freedesktop.org/" PKG_URL="http://xcb.freedesktop.org/dist/${PKG_NAME}-${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="A library providing weak aliases for pthread functions." +PKG_BUILD_FLAGS="-cfg-libs" diff --git a/packages/network/sshpass/package.mk b/packages/network/sshpass/package.mk index 81c7a65402..e67e65450c 100644 --- a/packages/network/sshpass/package.mk +++ b/packages/network/sshpass/package.mk @@ -9,6 +9,7 @@ PKG_SITE="https://sourceforge.net/p/sshpass" PKG_URL="https://downloads.sourceforge.net/sshpass/sshpass-${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="sshpass: a tool for non-interactive ssh password auth" +PKG_BUILD_FLAGS="-cfg-libs" pre_configure_target() { export ac_cv_func_malloc_0_nonnull=yes diff --git a/packages/x11/lib/xtrans/package.mk b/packages/x11/lib/xtrans/package.mk index 6be2bb946b..cc8a3c388b 100644 --- a/packages/x11/lib/xtrans/package.mk +++ b/packages/x11/lib/xtrans/package.mk @@ -10,6 +10,7 @@ PKG_SITE="https://www.X.org" PKG_URL="https://xorg.freedesktop.org/archive/individual/lib/${PKG_NAME}-${PKG_VERSION}.tar.xz" PKG_DEPENDS_TARGET="toolchain util-macros" PKG_LONGDESC="Abstract network code for X." +PKG_BUILD_FLAGS="-cfg-libs" PKG_CONFIGURE_OPTS_TARGET="--without-xmlto" diff --git a/packages/x11/proto/xcb-proto/package.mk b/packages/x11/proto/xcb-proto/package.mk index af65426b04..422cc1b3a8 100644 --- a/packages/x11/proto/xcb-proto/package.mk +++ b/packages/x11/proto/xcb-proto/package.mk @@ -10,6 +10,7 @@ PKG_SITE="https://www.X.org" PKG_URL="https://xorg.freedesktop.org/archive/individual/proto/${PKG_NAME}-${PKG_VERSION}.tar.xz" PKG_DEPENDS_TARGET="toolchain util-macros Python3:host" PKG_LONGDESC="X C-language Bindings protocol headers." +PKG_BUILD_FLAGS="-cfg-libs" post_makeinstall_target() { python_remove_source From 054f06c1dc74f6f95a11f655171882adfa0f1a36 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Sun, 15 Sep 2024 12:13:41 +0000 Subject: [PATCH 05/18] libcap-ng: drop obsolete python configure option and use cfg-libs option add PKG_BUILD_FLAGS="-cfg-libs" as libcap-ng is built with the follow override PKG_CONFIGURE_OPTS_TARGET="--enable-static --disable-shared" --- packages/devel/libcap-ng/package.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/devel/libcap-ng/package.mk b/packages/devel/libcap-ng/package.mk index 2df22a608e..77be842ab5 100644 --- a/packages/devel/libcap-ng/package.mk +++ b/packages/devel/libcap-ng/package.mk @@ -10,5 +10,6 @@ PKG_URL="https://github.com/stevegrubb/libcap-ng/archive/v${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="Libcap-ng is a library for Linux that makes using posix capabilities easy." PKG_TOOLCHAIN="autotools" +PKG_BUILD_FLAGS="-cfg-libs" -PKG_CONFIGURE_OPTS_TARGET="--enable-static --disable-shared --with-python=no --with-python3=no" +PKG_CONFIGURE_OPTS_TARGET="--enable-static --disable-shared --with-python3=no" From 134ec253f3cf6d50df7ad8f1c1afa6092d944aab Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Sun, 15 Sep 2024 12:28:16 +0000 Subject: [PATCH 06/18] openvpn: drop obsolete configure options --- packages/network/openvpn/package.mk | 2 -- 1 file changed, 2 deletions(-) diff --git a/packages/network/openvpn/package.mk b/packages/network/openvpn/package.mk index 798f55608b..3cee49be3c 100644 --- a/packages/network/openvpn/package.mk +++ b/packages/network/openvpn/package.mk @@ -13,12 +13,10 @@ PKG_LONGDESC="A full featured SSL VPN software solution that integrates OpenVPN PKG_TOOLCHAIN="configure" PKG_CONFIGURE_OPTS_TARGET="ac_cv_have_decl_TUNSETPERSIST=no \ - --disable-server \ --disable-plugins \ --enable-iproute2 IPROUTE=/sbin/ip \ --enable-management \ --enable-fragment \ - --disable-multihome \ --disable-port-share \ --disable-debug" From 8c580bf4d388aa7c8e10c55d950cf92a8fb1bf53 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Sun, 15 Sep 2024 12:35:17 +0000 Subject: [PATCH 07/18] gnutls: drop obsolete guile configure option since 3.8.0 --- packages/security/gnutls/package.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/security/gnutls/package.mk b/packages/security/gnutls/package.mk index 5247f4493d..7f2222fdbe 100644 --- a/packages/security/gnutls/package.mk +++ b/packages/security/gnutls/package.mk @@ -14,7 +14,6 @@ PKG_LONGDESC="A library which provides a secure layer over a reliable transport PKG_CONFIGURE_OPTS_COMMON="--disable-doc \ --disable-full-test-suite \ - --disable-guile \ --disable-libdane \ --disable-padlock \ --disable-rpath \ From 46bd670a951c9957857e277de800a149c483c9e6 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Sun, 15 Sep 2024 13:11:31 +0000 Subject: [PATCH 08/18] flac: drop obsolete configure options and use cfg-libs option sse was removed in 1.4.2 - https://github.com/xiph/flac/commit/e7b584eaf979be9d07dcdcc30c54f5fcac95ebac altivec was removes in 1.4.3 - https://github.com/xiph/flac/commit/ba5172e554fa830ebbdc8221f2631297a3b25f74 xmms was removed in 1.4.2 - https://github.com/xiph/flac/commit/8fbeff238c41464fe220cd23c45861c9302d1172 add PKG_BUILD_FLAGS="-cfg-libs" as libcap-ng is built with the follow override PKG_CONFIGURE_OPTS_TARGET="--enable-static --disable-shared" --- packages/audio/flac/package.mk | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/packages/audio/flac/package.mk b/packages/audio/flac/package.mk index db8b51b0d8..4970eb5a38 100644 --- a/packages/audio/flac/package.mk +++ b/packages/audio/flac/package.mk @@ -12,27 +12,19 @@ PKG_DEPENDS_TARGET="toolchain libogg" PKG_LONGDESC="An Free Lossless Audio Codec." PKG_TOOLCHAIN="autotools" # flac-1.3.1 dont build with LTO support -PKG_BUILD_FLAGS="+pic" +PKG_BUILD_FLAGS="+pic -cfg-libs" # package specific configure options PKG_CONFIGURE_OPTS_TARGET="--enable-static \ --disable-shared \ --disable-rpath \ - --disable-altivec \ --disable-doxygen-docs \ --disable-thorough-tests \ --disable-cpplibs \ - --disable-xmms-plugin \ --disable-oggtest \ --with-ogg=${SYSROOT_PREFIX}/usr \ --with-gnu-ld" -if target_has_feature sse; then - PKG_CONFIGURE_OPTS_TARGET+=" --enable-sse" -else - PKG_CONFIGURE_OPTS_TARGET+=" --disable-sse" -fi - post_makeinstall_target() { rm -rf ${INSTALL}/usr/bin } From bab5c9db479fc72c332b4f7a81717ebac5bd707b Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Tue, 17 Sep 2024 07:14:45 +0000 Subject: [PATCH 09/18] cxxtools: atomictype configure option was dropped when C++11 was mandated git repository is at - https://github.com/maekitalo/cxxtools --- packages/addons/addon-depends/cxxtools/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/addons/addon-depends/cxxtools/package.mk b/packages/addons/addon-depends/cxxtools/package.mk index 552fbc7e1f..ac6be38966 100644 --- a/packages/addons/addon-depends/cxxtools/package.mk +++ b/packages/addons/addon-depends/cxxtools/package.mk @@ -13,8 +13,8 @@ PKG_DEPENDS_TARGET="toolchain cxxtools:host openssl" PKG_LONGDESC="Cxxtools is a collection of general-purpose C++ classes." PKG_BUILD_FLAGS="+pic" -PKG_CONFIGURE_OPTS_HOST="--disable-demos --with-atomictype=pthread --disable-unittest" -PKG_CONFIGURE_OPTS_TARGET="--enable-static --disable-shared --disable-demos --with-atomictype=pthread --disable-unittest" +PKG_CONFIGURE_OPTS_HOST="--disable-demos --disable-unittest" +PKG_CONFIGURE_OPTS_TARGET="--enable-static --disable-shared --disable-demos --disable-unittest" post_makeinstall_host() { rm -rf ${TOOLCHAIN}/bin/cxxtools-config From 5d3b33205e59e054e9be38fce88632034ccf36dd Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Tue, 17 Sep 2024 07:28:54 +0000 Subject: [PATCH 10/18] tntnet: update configure options inline with version 3.0 git repository is at: - https://github.com/maekitalo/tntnet --- .../addons/addon-depends/tntnet/package.mk | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/packages/addons/addon-depends/tntnet/package.mk b/packages/addons/addon-depends/tntnet/package.mk index 5b94fceb0a..013a8040c7 100644 --- a/packages/addons/addon-depends/tntnet/package.mk +++ b/packages/addons/addon-depends/tntnet/package.mk @@ -13,21 +13,15 @@ PKG_DEPENDS_TARGET="toolchain tntnet:host libtool cxxtools zlib" PKG_LONGDESC="A web application server for C++." PKG_CONFIGURE_OPTS_HOST="--disable-unittest \ - --with-server=no \ - --with-sdk=yes \ - --with-demos=no \ - --with-epoll=yes \ - --with-ssl=no \ - --with-stressjob=no" + --disable-server \ + --enable-sdk \ + --disable-demos" PKG_CONFIGURE_OPTS_TARGET="--disable-unittest \ --with-sysroot=${SYSROOT_PREFIX} \ - --with-server=no \ - --with-sdk=no \ - --with-demos=no \ - --with-epoll=yes \ - --with-ssl=no \ - --with-stressjob=no" + --disable-server \ + --disable-sdk \ + --disable-demos" post_configure_target() { libtool_remove_rpath libtool From fde14f5da122af00447d0de05634f11161498d8a Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Tue, 17 Sep 2024 08:01:19 +0000 Subject: [PATCH 11/18] libpcap: drop obsolete configure options and use cfg-libs option --- .../network-tools-depends/depends/libpcap/package.mk | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/packages/addons/addon-depends/network-tools-depends/depends/libpcap/package.mk b/packages/addons/addon-depends/network-tools-depends/depends/libpcap/package.mk index a21cb34af3..673ad4e4fc 100644 --- a/packages/addons/addon-depends/network-tools-depends/depends/libpcap/package.mk +++ b/packages/addons/addon-depends/network-tools-depends/depends/libpcap/package.mk @@ -11,16 +11,15 @@ PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="A portable framework for low-level network monitoring." # use configure, not cmake. review cmake in future release. PKG_TOOLCHAIN="configure" +PKG_BUILD_FLAGS="-cfg-libs" PKG_CONFIGURE_OPTS_TARGET="LIBS=-lpthread \ ac_cv_header_libusb_1_0_libusb_h=no \ --disable-shared \ --with-pcap=linux \ --disable-bluetooth \ - --disable-can \ --without-libnl \ - --disable-dbus \ - --disable-canusb" + --disable-dbus" pre_configure_target() { # When cross-compiling, configure can't set linux version From de5677e5f6aadaf383925c40048da70bc248bacc Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Tue, 17 Sep 2024 08:08:45 +0000 Subject: [PATCH 12/18] libopenmpt: drop obsolete configure options --- packages/audio/libopenmpt/package.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/audio/libopenmpt/package.mk b/packages/audio/libopenmpt/package.mk index 38435ec7bd..9c34c469a1 100644 --- a/packages/audio/libopenmpt/package.mk +++ b/packages/audio/libopenmpt/package.mk @@ -20,7 +20,6 @@ PKG_CONFIGURE_OPTS_TARGET="--enable-static \ --without-pulseaudio \ --without-portaudio \ --without-portaudiocpp \ - --without-sdl \ --without-sdl2 \ --without-sndfile \ --without-flac" From 78efec4842cecca2cfed3bbf922fb6294f8a7e14 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Tue, 17 Sep 2024 08:13:20 +0000 Subject: [PATCH 13/18] pv: drop obsolete configure options and use cfg-libs option --- .../addons/addon-depends/system-tools-depends/pv/package.mk | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/packages/addons/addon-depends/system-tools-depends/pv/package.mk b/packages/addons/addon-depends/system-tools-depends/pv/package.mk index 249f8dfbfb..a58888631c 100644 --- a/packages/addons/addon-depends/system-tools-depends/pv/package.mk +++ b/packages/addons/addon-depends/system-tools-depends/pv/package.mk @@ -9,6 +9,4 @@ PKG_SITE="http://www.ivarch.com/programs/pv.shtml" PKG_URL="http://www.ivarch.com/programs/sources/pv-${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="Pipe Viewer can be inserted into any normal pipeline between two processes." -PKG_BUILD_FLAGS="-sysroot" - -PKG_CONFIGURE_OPTS_TARGET="--enable-static-nls" +PKG_BUILD_FLAGS="-sysroot -cfg-libs" From 23e0ea6fc08b9c4412a800a2729c2fbc71e79d1f Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Tue, 17 Sep 2024 08:53:42 +0000 Subject: [PATCH 14/18] minidlna: use cfg-libs option and use --disable-static to build a shared binary executable --- packages/addons/service/minidlna/package.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/addons/service/minidlna/package.mk b/packages/addons/service/minidlna/package.mk index 5fe0a8433a..dc963586cf 100644 --- a/packages/addons/service/minidlna/package.mk +++ b/packages/addons/service/minidlna/package.mk @@ -14,6 +14,7 @@ PKG_SECTION="service" PKG_SHORTDESC="MiniDLNA (ReadyMedia): a fully compliant DLNA/UPnP-AV server" PKG_LONGDESC="MiniDLNA (${PKG_VERSION_DATE}) (ReadyMedia) is a media server, with the aim of being fully compliant with DLNA/UPnP-AV clients." PKG_TOOLCHAIN="autotools" +PKG_BUILD_FLAGS="-sysroot -cfg-libs" PKG_IS_ADDON="yes" PKG_ADDON_NAME="MiniDLNA (ReadyMedia)" From 553138a277595dceceac010345ddd7143ed92d87 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Tue, 17 Sep 2024 08:59:03 +0000 Subject: [PATCH 15/18] htop: use cfg-libs option and use --disable-static to build a shared binary executable --- .../addons/addon-depends/system-tools-depends/htop/package.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/addons/addon-depends/system-tools-depends/htop/package.mk b/packages/addons/addon-depends/system-tools-depends/htop/package.mk index 20e973d4c7..ad494588dc 100644 --- a/packages/addons/addon-depends/system-tools-depends/htop/package.mk +++ b/packages/addons/addon-depends/system-tools-depends/htop/package.mk @@ -10,9 +10,10 @@ PKG_URL="https://github.com/htop-dev/htop/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain ncurses" PKG_LONGDESC="An interactive process viewer for Unix." PKG_TOOLCHAIN="autotools" -PKG_BUILD_FLAGS="-sysroot" +PKG_BUILD_FLAGS="-sysroot -cfg-libs" PKG_CONFIGURE_OPTS_TARGET="--disable-unicode \ + --disable-static \ HTOP_NCURSES_CONFIG_SCRIPT=ncurses-config" pre_configure_target() { From 8eed0bc720058ba453991027517ceb7984684cc8 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Tue, 17 Sep 2024 08:59:34 +0000 Subject: [PATCH 16/18] comskip: use cfg-libs option and default to --disable-static to build a shared binary executable --- packages/addons/addon-depends/comskip/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/addons/addon-depends/comskip/package.mk b/packages/addons/addon-depends/comskip/package.mk index 09d1d1984e..de66e7a88d 100644 --- a/packages/addons/addon-depends/comskip/package.mk +++ b/packages/addons/addon-depends/comskip/package.mk @@ -11,7 +11,7 @@ PKG_DEPENDS_TARGET="toolchain argtable2 ffmpegx" PKG_DEPENDS_CONFIG="argtable2 ffmpegx" PKG_LONGDESC="Comskip detects commercial breaks from a video stream. It can be used for post-processing recordings." PKG_TOOLCHAIN="autotools" -PKG_BUILD_FLAGS="-sysroot" +PKG_BUILD_FLAGS="-sysroot -cfg-libs" pre_configure_target() { # pass ffmpegx to build From a247d0919eb558586098f411823c95372a19fa70 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Sun, 6 Oct 2024 02:09:04 +0000 Subject: [PATCH 17/18] itstool: use cfg-libs option --- packages/textproc/itstool/package.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/textproc/itstool/package.mk b/packages/textproc/itstool/package.mk index b569e04ef9..32329210e4 100644 --- a/packages/textproc/itstool/package.mk +++ b/packages/textproc/itstool/package.mk @@ -9,4 +9,5 @@ PKG_SITE="http://itstool.org" PKG_URL="http://files.itstool.org/itstool/itstool-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_HOST="toolchain libxml2:host" PKG_LONGDESC="ITS Tool allows you to translate your XML documents with PO files." +PKG_BUILD_FLAGS="-cfg-libs:host" PKG_TOOLCHAIN="autotools" From 9febb950c11e5c7dd1eb530ccfe6a88e794d326b Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Thu, 10 Oct 2024 11:22:05 +0000 Subject: [PATCH 18/18] Python3: use cfg-libs option and use --enable-shared to enable building a shared Python library --- packages/lang/Python3/package.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/lang/Python3/package.mk b/packages/lang/Python3/package.mk index a87cd1acd5..efed40c950 100644 --- a/packages/lang/Python3/package.mk +++ b/packages/lang/Python3/package.mk @@ -11,6 +11,7 @@ PKG_URL="https://www.python.org/ftp/python/${PKG_VERSION}/${PKG_NAME::-1}-${PKG_ PKG_DEPENDS_HOST="zlib:host bzip2:host libffi:host util-linux:host xz:host autoconf-archive:host" PKG_DEPENDS_TARGET="autotools:host gcc:host Python3:host sqlite expat zlib bzip2 xz openssl libffi readline ncurses util-linux" PKG_LONGDESC="Python3 is an interpreted object-oriented programming language." +PKG_BUILD_FLAGS="-cfg-libs -cfg-libs:host" PKG_TOOLCHAIN="autotools" PKG_PYTHON_VERSION="python3.12" @@ -48,6 +49,7 @@ PKG_CONFIGURE_OPTS_HOST="ac_cv_prog_HAS_HG=/bin/false --with-system-ffi --without-pymalloc --with-ensurepip=no + --enable-shared " PKG_CONFIGURE_OPTS_TARGET="ac_cv_prog_HAS_HG=/bin/false @@ -94,6 +96,7 @@ PKG_CONFIGURE_OPTS_TARGET="ac_cv_prog_HAS_HG=/bin/false --without-ensurepip --enable-ipv6 --with-build-python=${TOOLCHAIN}/bin/python + --enable-shared " pre_configure_host() {