sergiotarxz/termux-packages
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

libbsd: update to 0.10.0

Browse Source
This commit is contained in:
Leonid Pliushch 2019-08-11 18:07:48 +03:00
parent 826c217cc3
commit 7434688856
3 changed files with 15 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/libbsd/build.sh
View File

@ -1,10 +1,9 @@
TERMUX_PKG_HOMEPAGE=https://libbsd.freedesktop.org
TERMUX_PKG_DESCRIPTION="utility functions from BSD systems"
TERMUX_PKG_LICENSE="BSD 3-Clause"
TERMUX_PKG_VERSION=0.9.1
TERMUX_PKG_REVISION=1
TERMUX_PKG_VERSION=0.10.0
TERMUX_PKG_SRCURL=https://libbsd.freedesktop.org/releases/libbsd-$TERMUX_PKG_VERSION.tar.xz
TERMUX_PKG_SHA256=56d835742327d69faccd16955a60b6dcf30684a8da518c4eca0ac713b9e0a7a4
TERMUX_PKG_SHA256=34b8adc726883d0e85b3118fa13605e179a62b31ba51f676136ecb2d0bc1a887
TERMUX_PKG_BREAKS="libbsd-dev"
TERMUX_PKG_REPLACES="libbsd-dev"
TERMUX_PKG_BUILD_IN_SRC=yes

25
packages/libbsd/endian.h.patch
View File

@ -1,17 +1,18 @@
--- ../cache/libbsd-0.9.1/include/bsd/sys/endian.h 2017-06-06 02:21:05.000000000 +0000
+++ ./include/bsd/sys/endian.h 2018-10-16 02:59:14.582440259 +0000
@@ -25,12 +25,13 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
-
+#if !defined(__ANDROID__)
diff -uNr libbsd-0.10.0/include/bsd/sys/endian.h libbsd-0.10.0.mod/include/bsd/sys/endian.h
--- libbsd-0.10.0/include/bsd/sys/endian.h 2019-08-08 01:00:44.000000000 +0300
+++ libbsd-0.10.0.mod/include/bsd/sys/endian.h 2019-08-11 20:23:57.120370524 +0300
@@ -28,12 +28,12 @@
#ifdef LIBBSD_OVERLAY
#include <sys/cdefs.h>
-#if __has_include_next(<endian.h>)
+#if __has_include_next(<endian.h>) && !defined(__ANDROID__)
#include_next <endian.h>
#endif
#else
#include <bsd/sys/cdefs.h>
-#if __has_include(<endian.h>)
+#if __has_include(<endian.h>) && !defined(__ANDROID__)
#include <endian.h>
#endif
+#endif
#ifndef LIBBSD_SYS_ENDIAN_H
#define LIBBSD_SYS_ENDIAN_H
#endif

20
packages/libbsd/vis.c.patch
View File

@ -1,20 +0,0 @@
--- ../cache/libbsd-0.9.1/src/vis.c 2018-05-22 14:07:42.000000000 +0000
+++ ./src/vis.c 2018-10-16 03:14:02.997723611 +0000
@@ -305,7 +305,7 @@
/* See comment in istrsenvisx() output loop, below. */
wmsk = 0;
for (i = sizeof(wmsk) - 1; i >= 0; i--) {
- shft = i * NBBY;
+ shft = i * CHAR_BIT;
bmsk = (uint64_t)0xffLL << shft;
wmsk |= bmsk;
if ((c & wmsk) || i == 0)
@@ -536,7 +536,7 @@
clen = 0;
wmsk = 0;
for (i = sizeof(wmsk) - 1; i >= 0; i--) {
- shft = i * NBBY;
+ shft = i * CHAR_BIT;
bmsk = (uint64_t)0xffLL << shft;
wmsk |= bmsk;
if ((*dst & wmsk) || i == 0)