From adab3da09c9584a849e180ff4580b90a417e2114 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Sat, 22 Sep 2018 23:10:16 -0300 Subject: [PATCH] parted: fix build with glibc >= 2.27 --- srcpkgs/parted/patches/fix-glibc-2.27.patch | 42 +++++++++++++++++++++ srcpkgs/parted/template | 4 +- 2 files changed, 44 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/parted/patches/fix-glibc-2.27.patch diff --git a/srcpkgs/parted/patches/fix-glibc-2.27.patch b/srcpkgs/parted/patches/fix-glibc-2.27.patch new file mode 100644 index 0000000000..b2ea15ce5f --- /dev/null +++ b/srcpkgs/parted/patches/fix-glibc-2.27.patch @@ -0,0 +1,42 @@ +From 5cb16c0474fd4b28ed58ac06fecfc76a7f1fa9fb Mon Sep 17 00:00:00 2001 +From: maxice8 +Date: Sat, 22 Sep 2018 23:08:51 -0300 +Subject: [PATCH] libparted/arch/linux.c: add missing sys/sysmacros.h include + for 'minor', 'major' + +otherwise fails on glibc >= 2.27 with + +arch/linux.c: In function '_dm_is_part': +arch/linux.c:551:28: warning: implicit declaration of function 'major' [-Wimplicit-function-declaration] + if (!_is_dm_major (major (deps->device[0]))) + ^~~~~ +arch/linux.c: In function '_device_probe_type': +arch/linux.c:648:44: warning: implicit declaration of function 'minor'; did you mean 'mknod'? [-Wimplicit-function-declaration] + arch_specific->minor = dev_minor = minor (dev_stat.st_rdev); + ^~~~~ + mknod + CCLD libparted.la + +../libparted/.libs/libparted.so: undefined reference to `major' +../libparted/.libs/libparted.so: undefined reference to `minor' +collect2: error: ld returned 1 exit status +--- + libparted/arch/linux.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/libparted/arch/linux.c b/libparted/arch/linux.c +index 0f18904..a15854f 100644 +--- libparted/arch/linux.c ++++ libparted/arch/linux.c +@@ -41,6 +41,7 @@ + #include /* for uname() */ + #include + #include ++#include + #ifdef ENABLE_DEVICE_MAPPER + #include + #endif +-- +2.19.0 + + diff --git a/srcpkgs/parted/template b/srcpkgs/parted/template index fe31483204..6b7afb5f48 100644 --- a/srcpkgs/parted/template +++ b/srcpkgs/parted/template @@ -4,14 +4,14 @@ version=3.2 revision=5 build_style=gnu-configure # parted wants off_t as 64bit type -configure_args="ac_cv_sizeof_off_t=8 --sbindir=/usr/bin" +configure_args="ac_cv_sizeof_off_t=8" hostmakedepends="pkg-config" makedepends="libuuid-devel libblkid-devel ncurses-devel readline-devel device-mapper-devel" short_desc="The GNU Parted disk partition resizing program" homepage="http://www.gnu.org/software/parted/" license="GPL-3" maintainer="Juan RP " -distfiles="${GNU_SITE}/$pkgname/$pkgname-$version.tar.xz" +distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz" checksum=858b589c22297cacdf437f3baff6f04b333087521ab274f7ab677cb8c6bb78e4 libparted_package() {