library_path.patch 2.1 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657
  1. diff -Nuar aufs-util.orig/fhsm/Makefile aufs-util/fhsm/Makefile
  2. --- aufs-util.orig/fhsm/Makefile 2016-07-23 21:55:47.853968465 +0300
  3. +++ aufs-util/fhsm/Makefile 2016-07-23 22:46:11.418882478 +0300
  4. @@ -42,9 +42,9 @@
  5. .NOTPARALLEL: ${LibFhsm}
  6. ${TgtObj}: %.o: %.c ${LibFhsmHdr} $(addprefix ../, ${LibUtilHdr}) ${LibFhsm}
  7. -#${Tgt}: override LDFLAGS += -static
  8. -${Tgt}: override LDFLAGS += -s
  9. -${Tgt}: override LDLIBS += -L. -lfhsm -L.. -lautil -lrt
  10. +#${Tgt}: override LDFLAGS +=tatic
  11. +${Tgt}: override LDFLAGS +=
  12. +${Tgt}: override LDLIBS += -L. -lfhsm -L.. -lautil -lrt
  13. ########################################
  14. diff -Nuar aufs-util.orig/libau/Makefile aufs-util/libau/Makefile
  15. --- aufs-util.orig/libau/Makefile 2016-07-23 21:55:47.854968465 +0300
  16. +++ aufs-util/libau/Makefile 2016-07-23 22:45:59.081882829 +0300
  17. @@ -37,14 +37,14 @@
  18. ln -sf $< $@
  19. ${LibSo}.${LibSoMajor}: ${LibSo}.${LibSoMajor}.${LibSoMinor}
  20. ln -sf $< $@
  21. -${LibSo}.${LibSoMajor}.${LibSoMinor}: override LDFLAGS += -s
  22. +${LibSo}.${LibSoMajor}.${LibSoMinor}: override LDFLAGS +=
  23. ${LibSo}.${LibSoMajor}.${LibSoMinor}: override LDLIBS += -ldl -lpthread
  24. ${LibSo}.${LibSoMajor}.${LibSoMinor}: ${LibSoObj}
  25. ${CC} --shared -Wl,-soname,${LibSo}.${LibSoMajor} ${LDFLAGS} \
  26. -o $@ $^ ${LDLIBS}
  27. install_ulib: File = ${LibSo}.${LibSoMajor}.${LibSoMinor}
  28. -install_ulib: Tgt = ${DESTDIR}/usr/lib
  29. +install_ulib: Tgt = ${DESTDIR}/usr/
  30. install_ulib: ${File}
  31. ${INSTALL} -d ${Tgt}
  32. ${Install} -m 644 ${File} ${Tgt}
  33. diff -Nuar aufs-util.orig/Makefile aufs-util/Makefile
  34. --- aufs-util.orig/Makefile 2016-07-23 21:55:47.852968465 +0300
  35. +++ aufs-util/Makefile 2016-07-23 22:45:33.723883550 +0300
  36. @@ -19,7 +19,7 @@
  37. override CPPFLAGS += -D_GNU_SOURCE
  38. override CPPFLAGS += -I./libau
  39. override CPPFLAGS += -DAUFHSM_CMD=\"/usr/bin/aufhsm\"
  40. -override CFLAGS += -O -Wall
  41. +override CFLAGS += -Wall
  42. INSTALL ?= install
  43. Install = ${INSTALL} -o root -g root -p
  44. ManDir = /usr/share/man
  45. @@ -76,7 +76,6 @@
  46. ver_test: ver
  47. ./ver
  48. -${Bin}: override LDFLAGS += -static -s
  49. ${Bin}: LDLIBS = -L. -lautil
  50. ${BinObj}: %.o: %.c ${LibUtilHdr} ${LibUtil}