libosmocore: update to 1.0.0.
This commit is contained in:
parent
b3af70d3c0
commit
d778c95a60
3 changed files with 49 additions and 6 deletions
|
@ -1590,11 +1590,11 @@ libplibnet.so.1 plib-1.8.5_1
|
|||
libplibpsl.so.1 plib-1.8.5_1
|
||||
libplibpw.so.1 plib-1.8.5_1
|
||||
libode.so.8 libode-0.16_1
|
||||
libosmocore.so.11 libosmocore-0.12.1_1
|
||||
libosmocore.so.12 libosmocore-1.0.0_1
|
||||
libosmovty.so.4 libosmocore-0.10.2_1
|
||||
libosmosim.so.0 libosmocore-0.8.0_1
|
||||
libosmocodec.so.0 libosmocore-0.6.6_1
|
||||
libosmogsm.so.10 libosmocore-0.12.1_1
|
||||
libosmogsm.so.11 libosmocore-1.0.0_1
|
||||
libosmogb.so.6 libosmocore-0.12.1_1
|
||||
libosmoctrl.so.0 libosmocore-0.7.0_1
|
||||
libgtkglext-x11-1.0.so.0 gtkglext-1.2.0_4
|
||||
|
|
43
srcpkgs/libosmocore/patches/fix-musl.patch
Normal file
43
srcpkgs/libosmocore/patches/fix-musl.patch
Normal file
|
@ -0,0 +1,43 @@
|
|||
diff --git a/src/gsm/gsm_utils.c b/src/gsm/gsm_utils.c
|
||||
index 02cb3d5..5233b63 100644
|
||||
--- src/gsm/gsm_utils.c
|
||||
+++ src/gsm/gsm_utils.c
|
||||
@@ -100,7 +100,8 @@
|
||||
|
||||
#if (!EMBEDDED)
|
||||
/* FIXME: this can be removed once we bump glibc requirements to 2.25: */
|
||||
-#if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2,25)
|
||||
+#if defined(__GLIBC_PREREQ)
|
||||
+#if __GLIBC_PREREQ(2,25)
|
||||
#pragma message ("glibc " OSMO_STRINGIFY_VAL(__GLIBC__) "." OSMO_STRINGIFY_VAL(__GLIBC_MINOR__) " random detected")
|
||||
#include <sys/random.h>
|
||||
#undef USE_GNUTLS
|
||||
@@ -109,7 +110,8 @@
|
||||
#ifndef GRND_NONBLOCK
|
||||
#define GRND_NONBLOCK 0x0001
|
||||
#endif /* ifndef GRND_NONBLOCK */
|
||||
-#endif /* if __GLIBC_PREREQ */
|
||||
+#endif /* if defined( __GLIBC_PREREQ) */
|
||||
+#endif /* if __GLIB_PREREQ(2,24) */
|
||||
#endif /* !EMBEDDED */
|
||||
|
||||
#if (USE_GNUTLS)
|
||||
@@ -447,13 +449,15 @@ int osmo_get_rand_id(uint8_t *out, size_t len)
|
||||
if (len > OSMO_MAX_RAND_ID_LEN)
|
||||
return -E2BIG;
|
||||
#if (!EMBEDDED)
|
||||
-#if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2,25)
|
||||
+#if defined(__GLIBC_PREREQ)
|
||||
+#if __GLIBC_PREREQ(2,25)
|
||||
rc = getrandom(out, len, GRND_NONBLOCK);
|
||||
#elif HAVE_DECL_SYS_GETRANDOM
|
||||
#pragma message ("Using direct syscall access for getrandom(): consider upgrading to glibc >= 2.25")
|
||||
/* FIXME: this can be removed once we bump glibc requirements to 2.25: */
|
||||
rc = syscall(SYS_getrandom, out, len, GRND_NONBLOCK);
|
||||
-#endif
|
||||
+#endif /* if __GLIBC_PREREQ(2,25) */
|
||||
+#endif /* if defined(__GLIBC_PREREQ) */
|
||||
#endif /* !EMBEDDED */
|
||||
|
||||
/* getrandom() failed entirely: */
|
||||
|
|
@ -1,10 +1,10 @@
|
|||
# Template file for 'libosmocore'
|
||||
pkgname=libosmocore
|
||||
version=0.12.1
|
||||
version=1.0.0
|
||||
revision=1
|
||||
build_style=gnu-configure
|
||||
configure_args="--prefix=/usr --exec-prefix=/usr --libdir=/usr/lib --datadir=/usr/share
|
||||
--libexecdir=/usr/lib --localstatedir=/var --docdir=/usr/share/doc/libosmocore"
|
||||
configure_args="--exec-prefix=/usr --libexecdir=/usr/lib
|
||||
--docdir=/usr/share/doc/libosmocore"
|
||||
hostmakedepends="autoconf automake libtool git pkg-config python"
|
||||
makedepends="pcsclite-devel talloc-devel gnutls-devel"
|
||||
short_desc="Core libs for osmocom"
|
||||
|
@ -12,7 +12,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
|
|||
license="GPL-2.0-or-later"
|
||||
homepage="https://bb.osmocom.org/trac/wiki/libosmocore"
|
||||
distfiles="https://git.osmocom.org/libosmocore/snapshot/libosmocore-${version}.tar.gz"
|
||||
checksum=65672f48378cb6546d7ea76d2f86797cfa542a965241edcead1c69e0588a7529
|
||||
checksum=f63c222f315cc62d847e38813eab7f6e3c8108c0c126880d299f5f5031a114f7
|
||||
|
||||
pre_configure() {
|
||||
autoreconf -i
|
||||
|
|
Loading…
Reference in a new issue