util-linux-2.38.patch 888 B

1234567891011121314151617181920212223242526
  1. From 127e40dcc2d62ad693cb4e03e1182d0a227d85e1 Mon Sep 17 00:00:00 2001
  2. From: Evangelos Foutras <evangelos@foutrelis.com>
  3. Date: Sat, 16 Apr 2022 08:24:58 +0300
  4. Subject: [PATCH] Fix uuid/uuid.h detection with util-linux 2.38
  5. util-linux commit 10f5f79485964ab52272ebe79c3b0047b1f84d82 changed the
  6. header guard in uuid/uuid.h from _UUID_UUID_H to _UL_LIBUUID_UUID_H as
  7. the former was too generic; fix guid.cc to also look for the new name.
  8. ---
  9. guid.cc | 2 +-
  10. 1 file changed, 1 insertion(+), 1 deletion(-)
  11. diff --git a/guid.cc b/guid.cc
  12. index 1e73ab7..d3e4fd5 100644
  13. --- a/guid.cc
  14. +++ b/guid.cc
  15. @@ -141,7 +141,7 @@ void GUIDData::Zero(void) {
  16. void GUIDData::Randomize(void) {
  17. int i, uuidGenerated = 0;
  18. -#ifdef _UUID_UUID_H
  19. +#if defined (_UUID_UUID_H) || defined (_UL_LIBUUID_UUID_H)
  20. uuid_generate(uuidData);
  21. ReverseBytes(&uuidData[0], 4);
  22. ReverseBytes(&uuidData[4], 2);