0001-Do-not-use-includedir-as-include-search-path-for-bui.patch 2.0 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162
  1. From fbc9b7c3b83a99ac996c0a268487d1f800630328 Mon Sep 17 00:00:00 2001
  2. From: Julien Viard de Galbert <julien@vdg.name>
  3. Date: Wed, 8 Feb 2017 21:26:58 +0100
  4. Subject: [PATCH] Do not use includedir as include search path for build
  5. --includedir is not used to specify where a program should
  6. look for headers of libraries, but to tell where it should
  7. install its own headers.
  8. Signed-off-by: Julien Viard de Galbert <julien@vdg.name>
  9. ---
  10. configure.ac | 6 +++---
  11. dieharder/Makefile.am | 2 +-
  12. libdieharder/Makefile.am | 2 +-
  13. 3 files changed, 5 insertions(+), 5 deletions(-)
  14. diff --git a/configure.ac b/configure.ac
  15. index b336115..91f7c64 100644
  16. --- a/configure.ac
  17. +++ b/configure.ac
  18. @@ -96,9 +96,9 @@ AC_TYPE_SIZE_T
  19. AC_C_VOLATILE
  20. AC_C_INLINE
  21. -DIEHARDER_CFLAGS="-I$includedir"
  22. -dieharder_CFLAGS="-std=c99 -Wall -pedantic -I$includedir"
  23. -libdieharder_lo_CFLAGS="-Wall -pedantic -I$includedir"
  24. +DIEHARDER_CFLAGS=""
  25. +dieharder_CFLAGS="-std=c99 -Wall -pedantic"
  26. +libdieharder_lo_CFLAGS="-Wall -pedantic"
  27. DIEHARDER_LIBS="-L$libdir -ldieharder"
  28. ACLOCAL_AMFLAGS="-I m4"
  29. diff --git a/dieharder/Makefile.am b/dieharder/Makefile.am
  30. index e6fbff2..7bdac5c 100644
  31. --- a/dieharder/Makefile.am
  32. +++ b/dieharder/Makefile.am
  33. @@ -64,7 +64,7 @@ DEFINES = -DVERSION=$(VERSION)
  34. # CC = gcc
  35. # Compile flags (use fairly standard -O3 as default)
  36. -AM_CPPFLAGS = -I ${top_srcdir}/include $(DEFINES) -I ${includedir}
  37. +AM_CPPFLAGS = -I ${top_srcdir}/include $(DEFINES)
  38. AM_CFLAGS = -O3
  39. # Load flags (optional)
  40. diff --git a/libdieharder/Makefile.am b/libdieharder/Makefile.am
  41. index 5fd3396..0873f9c 100644
  42. --- a/libdieharder/Makefile.am
  43. +++ b/libdieharder/Makefile.am
  44. @@ -114,7 +114,7 @@ DEFINES = -DVERSION=$(VERSION) -DLITTLE_ENDIAN=$(LITTLE_ENDIAN)
  45. # CC = gcc
  46. # Compile flags (use fairly standard -O3 as default)
  47. -AM_CPPFLAGS = $(DEFINES) -I ${top_srcdir}/include -I ${includedir}
  48. +AM_CPPFLAGS = $(DEFINES) -I ${top_srcdir}/include
  49. AM_CFLAGS = -O3 -Wall -pedantic -Wno-unused-variable
  50. #========================================================================
  51. --
  52. 2.1.4