sandbox-2.10-disable-same.patch 2.5 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778
  1. From 7a923f646ce10b7dec3c7ae5fe2079c10aa21752 Mon Sep 17 00:00:00 2001
  2. From: Mike Frysinger <vapier@gentoo.org>
  3. Date: Sun, 20 Dec 2015 16:08:16 -0500
  4. Subject: [PATCH] libsbutil: gnulib: hand disable same_name usage
  5. We don't provide same_name because the one caller we don't use, but it
  6. relies on gc-sections to avoid link errors. That flag doesn't work on
  7. ia64 though, so we need to hand delete the one caller. Ugh.
  8. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
  9. ---
  10. libsbutil/gnulib/hash-triple.c | 9 ---------
  11. libsbutil/gnulib/same.h | 25 -------------------------
  12. 2 files changed, 34 deletions(-)
  13. delete mode 100644 libsbutil/gnulib/same.h
  14. diff --git a/libsbutil/gnulib/hash-triple.c b/libsbutil/gnulib/hash-triple.c
  15. index c3b6d9f..06cfbdf 100644
  16. --- a/libsbutil/gnulib/hash-triple.c
  17. +++ b/libsbutil/gnulib/hash-triple.c
  18. @@ -24,7 +24,6 @@
  19. #include <string.h>
  20. #include "hash-pjw.h"
  21. -#include "same.h"
  22. #include "same-inode.h"
  23. #define STREQ(a, b) (strcmp (a, b) == 0)
  24. @@ -52,14 +51,6 @@ triple_hash_no_name (void const *x, size_t table_size)
  25. /* Compare two F_triple structs. */
  26. bool
  27. -triple_compare (void const *x, void const *y)
  28. -{
  29. - struct F_triple const *a = x;
  30. - struct F_triple const *b = y;
  31. - return (SAME_INODE (*a, *b) && same_name (a->name, b->name)) ? true : false;
  32. -}
  33. -
  34. -bool
  35. triple_compare_ino_str (void const *x, void const *y)
  36. {
  37. struct F_triple const *a = x;
  38. diff --git a/libsbutil/gnulib/same.h b/libsbutil/gnulib/same.h
  39. deleted file mode 100644
  40. index ee313c5..0000000
  41. --- a/libsbutil/gnulib/same.h
  42. +++ /dev/null
  43. @@ -1,25 +0,0 @@
  44. -/* Determine whether two file names refer to the same file.
  45. -
  46. - Copyright (C) 1997-2000, 2003-2004, 2009-2015 Free Software Foundation, Inc.
  47. -
  48. - This program is free software: you can redistribute it and/or modify
  49. - it under the terms of the GNU General Public License as published by
  50. - the Free Software Foundation; either version 3 of the License, or
  51. - (at your option) any later version.
  52. -
  53. - This program is distributed in the hope that it will be useful,
  54. - but WITHOUT ANY WARRANTY; without even the implied warranty of
  55. - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  56. - GNU General Public License for more details.
  57. -
  58. - You should have received a copy of the GNU General Public License
  59. - along with this program. If not, see <http://www.gnu.org/licenses/>. */
  60. -
  61. -#ifndef SAME_H_
  62. -# define SAME_H_ 1
  63. -
  64. -# include <stdbool.h>
  65. -
  66. -bool same_name (const char *source, const char *dest);
  67. -
  68. -#endif /* SAME_H_ */
  69. --
  70. 2.6.2