Fix architecture-specific issues not present upstream (openzfs#616)

Signed-off-by: Paul Dagnelie <[email protected]>
pcd1193182 · Sep 16, 2022 · f00261a · f00261a
1 parent 028e6cd
commit f00261a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/cmd/zfs_file.c b/cmd/zfs_file.c
@@ -81,7 +81,7 @@ zfs_do_file(const char *filename)
 int
 main(int argc, char **argv)
 {
-	char c;
+	int c;
 	while ((c = getopt(argc, argv, "p")) != -1) {
 		switch (c) {
 		case 'p':

diff --git a/lib/libicp/Makefile.am b/lib/libicp/Makefile.am
@@ -42,8 +42,8 @@ nodist_libicp_la_SOURCES = \
 
 if TARGET_CPU_AARCH64
 nodist_libicp_la_SOURCES += \
-	module/icp/asm-aarch64/blake3/b3_aarch64_sse2.S \
-	module/icp/asm-aarch64/blake3/b3_aarch64_sse41.S
+	../module/icp/asm-aarch64/blake3/b3_aarch64_sse2.S \
+	../module/icp/asm-aarch64/blake3/b3_aarch64_sse41.S
 endif
 
 if TARGET_CPU_POWERPC

diff --git a/lib/libnvpair/Makefile.am b/lib/libnvpair/Makefile.am
@@ -3,8 +3,8 @@ libnvpair_la_CFLAGS += $(LIBTIRPC_CFLAGS)
 libnvpair_la_CFLAGS += -fvisibility=hidden
 
 # wchar_t is undefined-signedness, but we compare to >=0; this warns with unsigned wchar_t
-libnvpair_la-libnvpair_json.$(OBJEXT) : CFLAGS += -Wno-type-limits
-libnvpair_la-libnvpair_json.l$(OBJEXT): CFLAGS += -Wno-type-limits
+%D%/la-libnvpair_json.$(OBJEXT) : CFLAGS += -Wno-type-limits
+%D%/la-libnvpair_json.l$(OBJEXT): CFLAGS += -Wno-type-limits
 
 lib_LTLIBRARIES += libnvpair.la
 CPPCHECKTARGETS += libnvpair.la