enhance(main/util-linux): build libuuid and utils as well
Put library, header and pkgconfig file in libuuid subpackage, which replaces our standalone libuuid package, and utils in uuid-utils subpackage. uuid-utils contains, among other things, uuidgen, which is needed to be able to compile some packages on device (have forgotten which one(s) though, has been a few months since I ran into this issue). Building util-linux with libuuid is also required if we are to enable other util-linux utilities, like fdisk.
This commit is contained in:
parent
7d0d9ea1a1
commit
48051c0eb7
|
@ -1,10 +0,0 @@
|
|||
TERMUX_PKG_HOMEPAGE=https://sourceforge.net/projects/libuuid/
|
||||
TERMUX_PKG_DESCRIPTION="Portable uuid C library"
|
||||
TERMUX_PKG_LICENSE="BSD 3-Clause"
|
||||
TERMUX_PKG_MAINTAINER="@termux"
|
||||
TERMUX_PKG_VERSION=1.0.3
|
||||
TERMUX_PKG_REVISION=5
|
||||
TERMUX_PKG_SRCURL=https://downloads.sourceforge.net/project/libuuid/libuuid-${TERMUX_PKG_VERSION}.tar.gz
|
||||
TERMUX_PKG_SHA256=46af3275291091009ad7f1b899de3d0cea0252737550e7919d17237997db5644
|
||||
TERMUX_PKG_BREAKS="libuuid-dev"
|
||||
TERMUX_PKG_REPLACES="libuuid-dev"
|
|
@ -1,20 +0,0 @@
|
|||
diff -u -r ../libuuid-1.0.3/gen_uuid.c ./gen_uuid.c
|
||||
--- ../libuuid-1.0.3/gen_uuid.c 2014-08-12 10:07:18.000000000 +0200
|
||||
+++ ./gen_uuid.c 2017-07-07 01:46:59.528994512 +0200
|
||||
@@ -38,6 +38,8 @@
|
||||
*/
|
||||
#define _SVID_SOURCE
|
||||
|
||||
+#include "c.h"
|
||||
+
|
||||
#ifdef _WIN32
|
||||
#define _WIN32_WINNT 0x0500
|
||||
#include <windows.h>
|
||||
@@ -91,7 +97,6 @@
|
||||
#include "uuidP.h"
|
||||
#include "uuidd.h"
|
||||
#include "randutils.h"
|
||||
-#include "c.h"
|
||||
|
||||
#ifdef HAVE_TLS
|
||||
#define THREAD_LOCAL static __thread
|
|
@ -1,12 +0,0 @@
|
|||
diff -uNr libuuid-1.0.3/uuidP.h libuuid-1.0.3.mod/uuidP.h
|
||||
--- libuuid-1.0.3/uuidP.h 2014-08-12 11:07:18.000000000 +0300
|
||||
+++ libuuid-1.0.3.mod/uuidP.h 2018-06-19 16:34:52.864262517 +0300
|
||||
@@ -37,7 +37,7 @@
|
||||
|
||||
#include "uuid.h"
|
||||
|
||||
-#define LIBUUID_CLOCK_FILE "/var/lib/libuuid/clock.txt"
|
||||
+#define LIBUUID_CLOCK_FILE "@TERMUX_PREFIX@/var/lib/libuuid/clock.txt"
|
||||
|
||||
/*
|
||||
* Offset between 15-Oct-1582 and 1-Jan-70
|
|
@ -37,7 +37,6 @@ ac_cv_func_uselocale=no
|
|||
--disable-ipcs
|
||||
--disable-kill
|
||||
--disable-last
|
||||
--disable-libuuid
|
||||
--disable-logger
|
||||
--disable-mesg
|
||||
--disable-nologin
|
||||
|
|
|
@ -0,0 +1,9 @@
|
|||
TERMUX_SUBPKG_DESCRIPTION="Library for handling universally unique identifiers"
|
||||
TERMUX_SUBPKG_BREAKS="libuuid-dev"
|
||||
TERMUX_SUBPKG_REPLACES="libuuid-dev"
|
||||
TERMUX_SUBPKG_DEPEND_ON_PARENT="no"
|
||||
TERMUX_SUBPKG_INCLUDE="
|
||||
lib/pkgconfig/uuid.pc
|
||||
lib/libuuid.so
|
||||
include/uuid/uuid.h
|
||||
"
|
|
@ -0,0 +1,26 @@
|
|||
TERMUX_SUBPKG_DESCRIPTION="Utilities for handling universally unique identifiers"
|
||||
TERMUX_SUBPKG_DEPENDS="libsmartcols, libuuid (>> 2.38.1)"
|
||||
TERMUX_SUBPKG_DEPEND_ON_PARENT="no"
|
||||
TERMUX_SUBPKG_INCLUDE="
|
||||
share/man/man3/uuid_copy.3.gz
|
||||
share/man/man3/uuid_generate.3.gz
|
||||
share/man/man3/uuid.3.gz
|
||||
share/man/man3/uuid_generate_time_safe.3.gz
|
||||
share/man/man3/uuid_is_null.3.gz
|
||||
share/man/man3/uuid_compare.3.gz
|
||||
share/man/man3/uuid_parse.3.gz
|
||||
share/man/man3/uuid_time.3.gz
|
||||
share/man/man3/uuid_generate_time.3.gz
|
||||
share/man/man3/uuid_generate_random.3.gz
|
||||
share/man/man3/uuid_clear.3.gz
|
||||
share/man/man3/uuid_unparse.3.gz
|
||||
share/man/man1/uuidgen.1.gz
|
||||
share/man/man1/uuidparse.1.gz
|
||||
share/man/man8/uuidd.8.gz
|
||||
share/bash-completion/completions/uuidd
|
||||
share/bash-completion/completions/uuidgen
|
||||
share/bash-completion/completions/uuidparse
|
||||
bin/uuidd
|
||||
bin/uuidgen
|
||||
bin/uuidparse
|
||||
"
|
Loading…
Reference in New Issue