From c35207be70922766d59c9f1f919d2c57c3e611f2 Mon Sep 17 00:00:00 2001
From: baizg1107 <preloyalwhite@163.com>
Date: Wed, 16 Jun 2021 10:06:47 +0800
Subject: [PATCH] add build requires for resolving building errors

---
 hfsplus-tools-sysctl.patch | 48 ++++++++++++++++++++++++++++++++++++++
 hfsplus-tools.spec         | 10 ++++++--
 2 files changed, 56 insertions(+), 2 deletions(-)
 create mode 100644 hfsplus-tools-sysctl.patch

diff --git a/hfsplus-tools-sysctl.patch b/hfsplus-tools-sysctl.patch
new file mode 100644
index 0000000..73af78e
--- /dev/null
+++ b/hfsplus-tools-sysctl.patch
@@ -0,0 +1,48 @@
+diff -up diskdev_cmds-540.1.linux3/fsck_hfs.tproj/dfalib/Scavenger.h.jx diskdev_cmds-540.1.linux3/fsck_hfs.tproj/dfalib/Scavenger.h
+--- diskdev_cmds-540.1.linux3/fsck_hfs.tproj/dfalib/Scavenger.h.jx	2012-02-01 12:17:19.000000000 -0500
++++ diskdev_cmds-540.1.linux3/fsck_hfs.tproj/dfalib/Scavenger.h	2020-08-11 13:15:46.195975153 -0400
+@@ -48,7 +48,7 @@
+ #endif
+ #include <sys/errno.h>
+ #include <sys/param.h>
+-#include <sys/sysctl.h>
++#include <linux/sysctl.h>
+ #include <sys/mount.h>
+ #include <hfs/hfs_mount.h>
+ 
+diff -up diskdev_cmds-540.1.linux3/fsck_hfs.tproj/fsck_hfs.c.jx diskdev_cmds-540.1.linux3/fsck_hfs.tproj/fsck_hfs.c
+--- diskdev_cmds-540.1.linux3/fsck_hfs.tproj/fsck_hfs.c.jx	2012-02-16 14:59:54.000000000 -0500
++++ diskdev_cmds-540.1.linux3/fsck_hfs.tproj/fsck_hfs.c	2020-08-11 13:15:51.661087132 -0400
+@@ -30,7 +30,7 @@
+ #include <sys/ioctl.h>
+ #if !LINUX
+ #include <sys/disk.h>
+-#include <sys/sysctl.h>
++#include <linux/sysctl.h>
+ #include <setjmp.h>
+ #endif
+ #include <hfs/hfs_mount.h>
+diff -up diskdev_cmds-540.1.linux3/fsck_hfs.tproj/utilities.c.jx diskdev_cmds-540.1.linux3/fsck_hfs.tproj/utilities.c
+--- diskdev_cmds-540.1.linux3/fsck_hfs.tproj/utilities.c.jx	2020-08-11 13:14:39.000000000 -0400
++++ diskdev_cmds-540.1.linux3/fsck_hfs.tproj/utilities.c	2020-08-11 13:15:55.631168473 -0400
+@@ -70,7 +70,7 @@
+ #include <string.h>
+ #include <unistd.h> 
+ #include <stdlib.h>
+-#include <sys/sysctl.h>
++#include <linux/sysctl.h>
+ 
+ #include "fsck_hfs.h"
+ 
+diff -up diskdev_cmds-540.1.linux3/newfs_hfs.tproj/makehfs.c.jx diskdev_cmds-540.1.linux3/newfs_hfs.tproj/makehfs.c
+--- diskdev_cmds-540.1.linux3/newfs_hfs.tproj/makehfs.c.jx	2012-02-02 17:36:59.000000000 -0500
++++ diskdev_cmds-540.1.linux3/newfs_hfs.tproj/makehfs.c	2020-08-11 13:15:59.767253216 -0400
+@@ -38,7 +38,7 @@
+ #endif
+ #include <sys/errno.h>
+ #include <sys/stat.h>
+-#include <sys/sysctl.h>
++#include <linux/sysctl.h>
+ #if !LINUX
+ #include <sys/vmmeter.h>
+ #endif
diff --git a/hfsplus-tools.spec b/hfsplus-tools.spec
index e14d090..1a1a8ad 100644
--- a/hfsplus-tools.spec
+++ b/hfsplus-tools.spec
@@ -1,6 +1,6 @@
 Name:          hfsplus-tools
 Version:       540.1.linux3
-Release:       17
+Release:       18
 Summary:       Tools to create/check Apple HFS+ filesystems
 License:       APSL 2.0
 URL:           http://gentoo-wiki.com/HOWTO_hfsplus
@@ -8,8 +8,9 @@ Source0:       http://cavan.codon.org.uk/~mjg59/diskdev_cmds/diskdev_cmds-%{vers
 Source1:       http://www.opensource.org/licenses/apsl-2.0.txt
 Patch0:        hfsplus-tools-no-blocks.patch
 Patch1:        hfsplus-tools-learn-to-stdarg.patch
+Patch2:		   hfsplus-tools-sysctl.patch
 
-BuildRequires: openssl-devel, libuuid-devel
+BuildRequires: openssl-devel, libuuid-devel, gcc
 Conflicts:     hfsplusutils
 
 %define _exec_prefix /
@@ -61,5 +62,10 @@ ln -s fsck.hfsplus.8 fsck.hfs.8
 %{_mandir}/man*/*
 
 %changelog
+* Mon Jun 7 2021 baizhonggui <baizhonggui@huawei.com> - 540.1.linux3-18
+- Fix building error: make[1]: cc: No such file or directory
+- Add gcc in BuildRequires 
+- Add hfsplus-tools-sysctl.patch
+
 * Fri Dec 13 2019 openEuler Buildteam <buildteam@openeuler.org> - 540.1.linux3-17
 - Package init