Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #8907 from neheb/hfs

Browse source 
hfsprogs: Fix compilation with uClibc-ng
This commit is contained in:
Rosen Penev 2019-05-11 12:12:26 -07:00 committed by GitHub
commit 5b742358b6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
utils/hfsprogs/Makefile
View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=hfsprogs PKG_NAME:=hfsprogs
PKG_VERSION:=332.25 PKG_VERSION:=332.25
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_LICENSE:=GPL-3.0+ PKG_LICENSE:=GPL-3.0+
PKG_LICENSE_FILES:=COPYING PKG_LICENSE_FILES:=COPYING

20
utils/hfsprogs/patches/010-valloc-to-memalign.patch Normal file
View file

@ -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);