OpenZFS 2.1.6 Support

For OpenZFS 2.1.6, the minimal MacOS version that is supported is 10.12, since time.h typedefs an incompatible clockid_t on earlier versions. The header search path needs to be extended to find OS specific headers in libspl. Update ZFSWrapper to newest version.
cbreak-black · Dec 4, 2022 · 82304d1 · 82304d1
1 parent 00c4403
commit 82304d1
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/ZFSWrapper b/ZFSWrapper
diff --git a/ZetaWatch.xcodeproj/project.pbxproj b/ZetaWatch.xcodeproj/project.pbxproj
@@ -873,10 +873,10 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				LIBRARY_SEARCH_PATHS = "$(ZFS_DIR)/lib";
-				MACOSX_DEPLOYMENT_TARGET = 10.9;
+				MACOSX_DEPLOYMENT_TARGET = 10.12;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = macosx;
-				ZETA_VERSION = 49;
+				ZETA_VERSION = 50;
 				ZFS_DIR = /usr/local/zfs;
 			};
 			name = Debug;
@@ -926,9 +926,9 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				LIBRARY_SEARCH_PATHS = "$(ZFS_DIR)/lib";
-				MACOSX_DEPLOYMENT_TARGET = 10.9;
+				MACOSX_DEPLOYMENT_TARGET = 10.12;
 				SDKROOT = macosx;
-				ZETA_VERSION = 49;
+				ZETA_VERSION = 50;
 				ZFS_DIR = /usr/local/zfs;
 			};
 			name = Release;
@@ -993,11 +993,12 @@
 					ZFSW_HAS_ZPOOL_STATUS_COMPATIBILITY_ERR,
 					ZFSW_HAS_ZPOOL_STATUS_INCOMPATIBLE_FEAT,
 				);
-				GCC_SYMBOLS_PRIVATE_EXTERN = YES;
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
 				HEADER_SEARCH_PATHS = (
 					"$(ZFS_DIR)/include",
 					"$(ZFS_DIR)/include/libzfs",
 					"$(ZFS_DIR)/include/libspl",
+					"$(ZFS_DIR)/include/libspl/os/macos",
 				);
 				LIBRARY_SEARCH_PATHS = "$(ZFS_DIR)/lib";
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -1021,11 +1022,12 @@
 					ZFSW_HAS_ZPOOL_STATUS_COMPATIBILITY_ERR,
 					ZFSW_HAS_ZPOOL_STATUS_INCOMPATIBLE_FEAT,
 				);
-				GCC_SYMBOLS_PRIVATE_EXTERN = YES;
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
 				HEADER_SEARCH_PATHS = (
 					"$(ZFS_DIR)/include",
 					"$(ZFS_DIR)/include/libzfs",
 					"$(ZFS_DIR)/include/libspl",
+					"$(ZFS_DIR)/include/libspl/os/macos",
 				);
 				LIBRARY_SEARCH_PATHS = "$(ZFS_DIR)/lib";
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -1049,6 +1051,7 @@
 					"$(ZFS_DIR)/include",
 					"$(ZFS_DIR)/include/libzfs",
 					"$(ZFS_DIR)/include/libspl",
+					"$(ZFS_DIR)/include/libspl/os/macos",
 				);
 				INFOPLIST_FILE = ZFSWrapper/misc/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
@@ -1078,6 +1081,7 @@
 					"$(ZFS_DIR)/include",
 					"$(ZFS_DIR)/include/libzfs",
 					"$(ZFS_DIR)/include/libspl",
+					"$(ZFS_DIR)/include/libspl/os/macos",
 				);
 				INFOPLIST_FILE = ZFSWrapper/misc/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+4 −1		CMakeLists.txt
+3 −0		src/ZFSNVList.cpp
+3 −0		src/ZFSStrings.cpp
+24 −11		src/ZFSUtils.cpp