From 41504f1579817fb84e8b146619d3fe1518bfa612 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Mon, 10 Aug 2020 13:15:14 -0700 Subject: [PATCH] hfsprogs: fix compilation without sys/cdefs sys/cdefs.h does not come with musl. It's also deprecated. Signed-off-by: Rosen Penev --- utils/hfsprogs/Makefile | 2 +- utils/hfsprogs/patches/030-no-cdefs.patch | 199 ++++++++++++++++++++++ 2 files changed, 200 insertions(+), 1 deletion(-) create mode 100644 utils/hfsprogs/patches/030-no-cdefs.patch diff --git a/utils/hfsprogs/Makefile b/utils/hfsprogs/Makefile index a31571176..15d3bad2e 100644 --- a/utils/hfsprogs/Makefile +++ b/utils/hfsprogs/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=hfsprogs PKG_VERSION:=332.25 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).orig.tar.gz PKG_SOURCE_URL:=http://archive.ubuntu.com/ubuntu/pool/universe/h/$(PKG_NAME) diff --git a/utils/hfsprogs/patches/030-no-cdefs.patch b/utils/hfsprogs/patches/030-no-cdefs.patch new file mode 100644 index 000000000..2469e1371 --- /dev/null +++ b/utils/hfsprogs/patches/030-no-cdefs.patch @@ -0,0 +1,199 @@ +--- a/disklib/dump.h ++++ b/disklib/dump.h +@@ -110,9 +110,7 @@ extern long dev_bsize; /* block size of underlying disk device */ + extern int dev_bshift; /* log2(dev_bsize) */ + extern int tp_bshift; /* log2(TP_BSIZE) */ + +-#ifndef __P +-#include +-#endif ++#define __P(x) x + + /* operator interface functions */ + void broadcast __P((char *message)); +--- a/dump.tproj/unctime.c ++++ b/dump.tproj/unctime.c +@@ -64,9 +64,7 @@ + #include + #endif + +-#ifndef __P +-#include +-#endif ++#define __P(x) x + + /* + * Convert a ctime(3) format string into a system format date. +--- a/fdisk.tproj/getrawpartition.c ++++ b/fdisk.tproj/getrawpartition.c +@@ -59,7 +59,6 @@ + * POSSIBILITY OF SUCH DAMAGE. + */ + +-#include + #if defined(LIBC_SCCS) && !defined(lint) + __RCSID("$NetBSD: getrawpartition.c,v 1.4 1999/07/02 15:49:12 simonb Exp $"); + #endif +--- a/fdisk.tproj/util.h ++++ b/fdisk.tproj/util.h +@@ -59,9 +59,10 @@ + #ifndef _UTIL_H_ + #define _UTIL_H_ + +-#include + #include + ++#define __P(x) x ++ + /* + * fparseln() specific operation flags. + */ +--- a/fsck_hfs.tproj/fsck_hfs.h ++++ b/fsck_hfs.tproj/fsck_hfs.h +@@ -24,7 +24,7 @@ + + #include "cache.h" + +-#include ++#define __P(x) x + + const extern char *cdevname; /* name of device being checked */ + extern char *progname; +--- a/fsck_msdos.tproj/boot.c ++++ b/fsck_msdos.tproj/boot.c +@@ -54,8 +54,6 @@ + */ + + +-#include +- + #include + #include + #include +--- a/fsck_msdos.tproj/check.c ++++ b/fsck_msdos.tproj/check.c +@@ -54,8 +54,6 @@ + */ + + +-#include +- + #include + #include + #include +--- a/fsck_msdos.tproj/dir.c ++++ b/fsck_msdos.tproj/dir.c +@@ -56,8 +56,6 @@ + */ + + +-#include +- + #include + #include + #include +@@ -109,6 +107,7 @@ + #define DD_YEAR_MASK 0xFE00 /* year - 1980 */ + #define DD_YEAR_SHIFT 9 + ++#define __P(x) x + + /* dir.c */ + static struct dosDirEntry *newDosDirEntry __P((void)); +--- a/fsck_msdos.tproj/fat.c ++++ b/fsck_msdos.tproj/fat.c +@@ -54,8 +54,6 @@ + */ + + +-#include +- + #include + #include + #include +@@ -67,6 +65,8 @@ + #include "ext.h" + #include "fsutil.h" + ++#define __P(x) x ++ + /* + * The following value should be a multiple of the sector size in bytes. The + * Microsoft supported sector sizes are 512, 1024, 2048, and 4096, which means +--- a/fsck_msdos.tproj/fsutil.c ++++ b/fsck_msdos.tproj/fsutil.c +@@ -54,8 +54,6 @@ + * SUCH DAMAGE. + */ + +-#include +- + #include + #include + #include +@@ -74,6 +72,8 @@ + #include "ext.h" + #include "fsutil.h" + ++#define __P(x) x ++ + static const char *dev = NULL; + static int hot = 0; + /*static int preen = 0;*/ +--- a/fsck_msdos.tproj/main.c ++++ b/fsck_msdos.tproj/main.c +@@ -54,8 +54,6 @@ + */ + + +-#include +- + #include + #include + #include +@@ -68,6 +66,8 @@ + #include + #endif + ++#define __P(x) x ++ + #include "fsutil.h" + #include "ext.h" + +--- a/newfs_hfs.tproj/makehfs.c ++++ b/newfs_hfs.tproj/makehfs.c +@@ -28,7 +28,6 @@ + + */ + +-#include + #include + #include + #include +@@ -80,6 +79,7 @@ extern Boolean _CFStringGetFileSystemRepresentation(CFStringRef string, UInt8 *b + + #define kJournalFileType 0x6a726e6c /* 'jrnl' */ + ++#define __P(x) x + + typedef HFSMasterDirectoryBlock HFS_MDB; + +--- a/newfs_hfs.tproj/newfs_hfs.c ++++ b/newfs_hfs.tproj/newfs_hfs.c +@@ -34,7 +34,6 @@ + #include + #include + +-#include + #include + #include + #include +@@ -62,6 +61,8 @@ + + #define ROUNDUP(x,y) (((x)+(y)-1)/(y)*(y)) + ++#define __P(x) x ++ + static void getnodeopts __P((char* optlist)); + static void getclumpopts __P((char* optlist)); + static gid_t a_gid __P((char *));