Skip to content
This repository has been archived by the owner on Jun 24, 2022. It is now read-only.

Commit

Permalink
Fix tools::util-linux on Ubuntu-20.04
Browse files Browse the repository at this point in the history
  • Loading branch information
trueroad authored and PhilHolmes committed Apr 11, 2021
1 parent 9ab36d6 commit eec57b7
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 0 deletions.
1 change: 1 addition & 0 deletions gub/specs/util-linux.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
class Util_linux__tools (tools.AutoBuild):
source = 'https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v2.16/util-linux-ng-2.16.tar.gz'
dependencies = ['libtool', 'bash']
patches = ['util-linux-2.16-sysmacro.patch']
configure_flags = (tools.AutoBuild.configure_flags
+ ' --disable-tls'
+ ' --disable-makeinstall-chown'
Expand Down
20 changes: 20 additions & 0 deletions patches/util-linux-2.16-sysmacro.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
--- util-linux-2.16/shlibs/blkid/src/devname.c.org
+++ util-linux-2.16/shlibs/blkid/src/devname.c
@@ -25,6 +25,7 @@
#if HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
+#include <sys/sysmacros.h>
#include <dirent.h>
#if HAVE_SYS_STAT_H
#include <sys/stat.h>
--- util-linux-2.16/shlibs/blkid/src/evaluate.c.org
+++ util-linux-2.16/shlibs/blkid/src/evaluate.c
@@ -17,6 +17,7 @@
#include <fcntl.h>
#include <ctype.h>
#include <sys/types.h>
+#include <sys/sysmacros.h>
#ifdef HAVE_SYS_STAT_H
#include <sys/stat.h>
#endif

0 comments on commit eec57b7

Please sign in to comment.