partclone: update to 0.3.17

This commit is contained in:
Nathan Owens 2020-11-15 18:58:40 -06:00 committed by Michael Aldridge
parent dc7474f4be
commit 3f654f6061
3 changed files with 43 additions and 26 deletions

View file

@ -0,0 +1,40 @@
From 3ea1aa99242204e3c1841ac11d9f7064591d3bff Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sun, 15 Nov 2020 18:53:54 -0600
Subject: [PATCH] musl
---
src/btrfs/kernel-lib/rbtree.h | 4 ++++
src/main.c | 1 -
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git src/btrfs/kernel-lib/rbtree.h src/btrfs/kernel-lib/rbtree.h
index 6d68907..affab1d 100644
--- src/btrfs/kernel-lib/rbtree.h
+++ src/btrfs/kernel-lib/rbtree.h
@@ -38,6 +38,10 @@
extern "C" {
#endif
+#ifndef __always_inline
+#define __always_inline inline__attribute__((always_inline))
+#endif
+
struct rb_node {
unsigned long __rb_parent_color;
struct rb_node *rb_right;
diff --git src/main.c src/main.c
index babcf0c..8a543f3 100644
--- src/main.c
+++ src/main.c
@@ -22,7 +22,6 @@
#include <sys/types.h>
#include <stdio.h>
#include <stdlib.h>
-#include <mcheck.h>
#include <stdint.h>
#include <stdarg.h>
#include <string.h>
--
2.29.2

View file

@ -1,23 +0,0 @@
--- src/main.c.orig
+++ src/main.c
@@ -20,7 +20,6 @@
#include <sys/types.h>
#include <stdio.h>
#include <stdlib.h>
-#include <mcheck.h>
#include <stdint.h>
#include <stdarg.h>
#include <string.h>
--- src/btrfs/rbtree.h.orig
+++ src/btrfs/rbtree.h
@@ -38,6 +38,10 @@
extern "C" {
#endif
+#ifndef __always_inline
+#define __always_inline inline __attribute__((always_inline))
+#endif
+
struct rb_node {
unsigned long __rb_parent_color;
struct rb_node *rb_right;

View file

@ -1,7 +1,7 @@
# Template file for 'partclone'
pkgname=partclone
version=0.3.14
revision=2
version=0.3.17
revision=1
build_style=gnu-configure
configure_args="--disable-rpath --enable-ncursesw --enable-f2fs
--enable-extfs --enable-hfsp --enable-fat --enable-exfat
@ -14,7 +14,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="http://www.partclone.org/"
distfiles="https://github.com/Thomas-Tsai/${pkgname}/archive/${version}.tar.gz"
checksum=c298d2e7a6da97660325ca9296174e94e78dfc161df01bfdb1ea36c7001a6879
checksum=ef1391db3801e4b3ef82fc9417f1d7f0542b7229b3394120072b2dfeae0bbbb0
CFLAGS="-DBTRFS_DISABLE_BACKTRACE"
pre_configure() {