aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CREDITS3
-rw-r--r--ChangeLog5
-rwxr-xr-xconfigure2
-rw-r--r--configure.ac2
4 files changed, 8 insertions, 4 deletions
diff --git a/CREDITS b/CREDITS
index 7d0781f8..f989da79 100644
--- a/CREDITS
+++ b/CREDITS
@@ -45,6 +45,9 @@ Eric Seppanen <eric @ purestorage dot com> borrowed ideas from alternate
Eric Youngdale <eric at andante dot org> author of scsi_info on which sginfo
is based.
+Fabrice Fontaine <fontaine dot fabrice at gmail dot com>
+ various build fixes [20211116]
+
Frank Jansen <fjansen at egenera dot com>: additions to sg_scan; contributed
code for '--alloc-length=' option in sg_persist [20090402]
diff --git a/ChangeLog b/ChangeLog
index abfc3722..e5702285 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,9 +2,10 @@ Each utility has its own version number, date of last change and
some description at the top of its ".c" file. All utilities in the main
directory have their own "man" pages. There is also a sg3_utils man page.
-Changelog for pre-release sg3_utils-1.48 [20211115] [svn: r921]
- - rev 921 is a bugfix rev on release 1.47 [r919,920]
+Changelog for pre-release sg3_utils-1.48 [20211116] [svn: r922]
+ - rev 921+922 are bugfix revs on release 1.47 [r919,920]
- configure.ac: map msys to mingw
+ - repeat tweak to accept uclinux as linux
- sg_dd: change uint type to uint32_t
- sg_pt_dummy.c: remove problematic include
diff --git a/configure b/configure
index 84460e62..31bf161d 100755
--- a/configure
+++ b/configure
@@ -12754,7 +12754,7 @@ _ACEOF
check_for_getrandom
CFLAGS="$CFLAGS -D__USE_MINGW_ANSI_STDIO";;
- *-*-linux-gnu* | *-*-linux*)
+ *-*-linux-gnu* | *-*-linux* | *-*-uclinux-gnu* | *-*-uclinux*)
cat >>confdefs.h <<_ACEOF
#define SG_LIB_LINUX 1
diff --git a/configure.ac b/configure.ac
index 0a65d940..23378ad6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -107,7 +107,7 @@ case "${host}" in
AC_DEFINE_UNQUOTED(HAVE_NVME, 1, [Found NVMe])
check_for_getrandom
CFLAGS="$CFLAGS -D__USE_MINGW_ANSI_STDIO";;
- *-*-linux-gnu* | *-*-linux*)
+ *-*-linux-gnu* | *-*-linux* | *-*-uclinux-gnu* | *-*-uclinux*)
AC_DEFINE_UNQUOTED(SG_LIB_LINUX, 1, [sg3_utils on linux])
check_for_linux_sg_v4_hdr
check_for_getrandom