Skip to content

Commit

Permalink
util-linux: Fix Python3 uuid build/rebuild issues
Browse files Browse the repository at this point in the history
1) Python3 needs the util-linux:host dependency otherwise uuid support will
   leak over from the build host during a clean build, only to use util-linux:host
   for uuid support during a subsequent rebuild (which fails, because of #2)

2) util-linux:host needs -fPIC as this is what Python3 requires (clean builds
   work because of #1...)

3) Remove toolchain from util-linux:host to avoid a circular toolchain
   reference now that Python3 is also part of toolchain (via meson)
  • Loading branch information
MilhouseVH committed Sep 12, 2018
1 parent 5c961f9 commit bd049eb
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
2 changes: 1 addition & 1 deletion packages/lang/Python3/package.mk
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ PKG_LICENSE="OSS"
PKG_SITE="http://www.python.org/"
PKG_URL="http://www.python.org/ftp/python/$PKG_VERSION/${PKG_NAME::-1}-$PKG_VERSION.tar.xz"
PKG_SOURCE_DIR="${PKG_NAME::-1}-$PKG_VERSION*"
PKG_DEPENDS_HOST="zlib:host bzip2:host libffi:host"
PKG_DEPENDS_HOST="zlib:host bzip2:host libffi:host util-linux:host"
PKG_DEPENDS_TARGET="toolchain sqlite expat zlib bzip2 openssl Python3:host readline ncurses"
PKG_SECTION="lang"
PKG_SHORTDESC="python3: The Python3 programming language"
Expand Down
4 changes: 3 additions & 1 deletion packages/sysutils/util-linux/package.mk
Original file line number Diff line number Diff line change
@@ -1,19 +1,21 @@
# SPDX-License-Identifier: GPL-2.0-or-later
# Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)

PKG_NAME="util-linux"
PKG_VERSION="2.31"
PKG_SHA256="f9be7cdcf4fc5c5064a226599acdda6bdf3d86c640152ba01ea642d91108dc8a"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_URL="http://www.kernel.org/pub/linux/utils/util-linux/v${PKG_VERSION%-*}/$PKG_NAME-$PKG_VERSION.tar.xz"
PKG_DEPENDS_HOST="toolchain"
PKG_DEPENDS_HOST=""
PKG_DEPENDS_TARGET="toolchain"
PKG_DEPENDS_INIT="toolchain"
PKG_SECTION="system"
PKG_SHORTDESC="util-linux: Miscellaneous system utilities for Linux"
PKG_LONGDESC="The util-linux package contains a large variety of low-level system utilities that are necessary for a Linux system to function. Among many features, Util-linux contains the fdisk configuration tool and the login program."
PKG_TOOLCHAIN="autotools"
PKG_BUILD_FLAGS="+pic:host"

UTILLINUX_CONFIG_DEFAULT="--disable-gtk-doc \
--disable-nls \
Expand Down

0 comments on commit bd049eb

Please sign in to comment.