git Service of IN-Ulm e.V. Explore Help
Sign In
cbiedl
/
ykush-control
1
0
Fork 0
Files
Tree: b5fb26b624
Branches Tags
ykush-control
/
debian
/
patches
/
fix-build.patch

fix-build.patch 2.1 KB
History Raw

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556 
  1. Description: Several changes to make the build succeed
    2. 

  2. Author: Christoph Biedl <debian.axhn@manchmal.in-ulm.de>
    3. 

  3. 

  4.     * Use hidapi-libusb provided by Debian
    5. 

  5.     * Use the build flags to make hardening build succeed
    6. 

  6.     * Provide an install target
    7. 

  7.     * Don't abort from failing "make clean"
    8. 

  8. 

  9. --- a/Makefile
    10. 

  10. +++ b/Makefile
    11. 

  11. @@ -1,23 +1,21 @@
    12. 

  12. -CUR_PATH = $(shell echo $(PWD))
    13. 

  13.  OBJS = $(addprefix ykushcmd/objs/,ykushcmd.o commandParser.o usbcom.o)
    14. 

  14. -LIBS = -lhidapi-libusb -lusb-1.0 -ludev
    15. 

  15. -LOADPATHS = -L$(CUR_PATH)/ykushcmd/linux
    16. 

  16. -PREPROCESSOR_DEFS = -DLINUX
    17. 

  17. -CPP = g++
    18. 

  18. +LIBS = -lhidapi-libusb
    19. 

  19.  
    20. 

  20. -ykushcmd : $(OBJS)
    21. 

  21. -	$(CPP) $(LOADPATHS) -o bin/ykushcmd $(OBJS) $(LIBS)
    22. 

  22. +bin/ykushcmd : $(OBJS)
    23. 

  23. +	$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) -o bin/ykushcmd $(OBJS) $(LIBS)
    24. 

  24.  
    25. 

  25.  
    26. 

  26.  ykushcmd/objs/ykushcmd.o : ykushcmd/ykushcmd.cpp ykushcmd/commandParser.h
    27. 

  27. -	$(CPP) $(PREPROCESSOR_DEFS) -c ykushcmd/ykushcmd.cpp -o ykushcmd/objs/ykushcmd.o
    28. 

  28. +	$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) -c ykushcmd/ykushcmd.cpp -o ykushcmd/objs/ykushcmd.o
    29. 

  29.  
    30. 

  30. -ykushcmd/objs/commandParser.o : ykushcmd/commandParser.cpp ykushcmd/commandParser.h ykushcmd/usbcom.h 
    31. 

  31. -	$(CPP) $(PREPROCESSOR_DEFS) -c ykushcmd/commandParser.cpp -o ykushcmd/objs/commandParser.o
    32. 

  32. +ykushcmd/objs/commandParser.o : ykushcmd/commandParser.cpp ykushcmd/commandParser.h ykushcmd/usbcom.h
    33. 

  33. +	$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) -c ykushcmd/commandParser.cpp -o ykushcmd/objs/commandParser.o
    34. 

  34.  
    35. 

  35. -ykushcmd/objs/usbcom.o : ykushcmd/usbcom.cpp ykushcmd/linux/hidapi.h ykushcmd/usbcom.h
    36. 

  36. -	$(CPP) $(PREPROCESSOR_DEFS) -c ykushcmd/usbcom.cpp -o ykushcmd/objs/usbcom.o
    37. 

  37. +ykushcmd/objs/usbcom.o : ykushcmd/usbcom.cpp ykushcmd/usbcom.h
    38. 

  38. +	$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) -c ykushcmd/usbcom.cpp -o ykushcmd/objs/usbcom.o
    39. 

  39.  
    40. 

  40.  clean :
    41. 

  41. -	rm -f bin/ykushcmd $(OBJS)
    42. 

  42. +	-rm -f bin/ykushcmd $(OBJS)
    43. 

  43.  
    44. 

  44. +install:
    45. 

  45. +	install -D bin/ykushcmd $(DESTDIR)/usr/bin/ykushcmd
    46. 

  46. --- a/ykushcmd/usbcom.cpp
    47. 

  47. +++ b/ykushcmd/usbcom.cpp
    48. 

  48. @@ -59,7 +59,7 @@
    49. 

  49.  #ifndef LINUX
    50. 

  50.  	#include "windows\hidapi.h"
    51. 

  51.  #else
    52. 

  52. -	#include "linux/hidapi.h"
    53. 

  53. +	#include <hidapi/hidapi.h>
    54. 

  54.  #endif
    55. 

  55.  
    56. 

  56.  #include "usbcom.h"
    57.