From f30898d3e354ee6c4295c410dcc1d1e56ac149d4 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sun, 5 May 2019 15:31:38 -0700 Subject: [PATCH] hfsprogs: Fix compilation with uClibc-ng Replaced deprecated and unsupported valloc with posix_memalign. Signed-off-by: Rosen Penev (cherry-picked from 4639e208b3b159d8c85361682936b3941fb996b4) --- utils/hfsprogs/Makefile | 2 +- .../patches/010-valloc-to-memalign.patch | 20 +++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 utils/hfsprogs/patches/010-valloc-to-memalign.patch diff --git a/utils/hfsprogs/Makefile b/utils/hfsprogs/Makefile index 9300fbc0a7..e5184280e9 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:=1 +PKG_RELEASE:=2 PKG_LICENSE:=GPL-3.0+ PKG_LICENSE_FILES:=COPYING diff --git a/utils/hfsprogs/patches/010-valloc-to-memalign.patch b/utils/hfsprogs/patches/010-valloc-to-memalign.patch new file mode 100644 index 0000000000..c391e1dd57 --- /dev/null +++ b/utils/hfsprogs/patches/010-valloc-to-memalign.patch @@ -0,0 +1,20 @@ +--- a/newfs_hfs.tproj/makehfs.c ++++ b/newfs_hfs.tproj/makehfs.c +@@ -376,7 +376,7 @@ make_hfsplus(const DriveInfo *driveInfo, hfsparams_t *defaults) + if ( (temp & 0x01FF) != 0 ) + temp = (temp + kBytesPerSector) & 0xFFFFFE00; + +- nodeBuffer = valloc((size_t)temp); ++ (void)posix_memalign(&nodeBuffer, sysconf(_SC_PAGESIZE), (size_t)temp); + if (nodeBuffer == NULL) + err(1, NULL); + +@@ -1814,7 +1814,7 @@ ClearDisk(const DriveInfo *driveInfo, UInt64 startingSector, UInt32 numberOfSect + + bufferSize = bufferSizeInSectors << kLog2SectorSize; + +- tempBuffer = valloc((size_t)bufferSize); ++ (void)posix_memalign(&tempBuffer, sysconf(_SC_PAGESIZE), (size_t)bufferSize); + if (tempBuffer == NULL) + err(1, NULL); +