From 5c129661d91595f3d54b135ac1716714b972d068 Mon Sep 17 00:00:00 2001 From: Ingvar Hagelund Date: Wed, 7 Nov 2018 12:05:11 +0100 Subject: [PATCH] added updated patch for ld_library_patch for varnish-6.1.1 --- ...1.1_fix_ld_library_path_in_doc_build.patch | 68 +++++++++++++++++++ 1 file changed, 68 insertions(+) create mode 100644 varnish-6.1.1_fix_ld_library_path_in_doc_build.patch diff --git a/varnish-6.1.1_fix_ld_library_path_in_doc_build.patch b/varnish-6.1.1_fix_ld_library_path_in_doc_build.patch new file mode 100644 index 0000000..8a5917e --- /dev/null +++ b/varnish-6.1.1_fix_ld_library_path_in_doc_build.patch @@ -0,0 +1,68 @@ +--- doc/sphinx/Makefile.in.orig 2018-11-06 16:46:59.403632379 +0100 ++++ doc/sphinx/Makefile.in 2018-11-06 16:48:28.011784013 +0100 +@@ -643,10 +643,12 @@ + rm -rf $(BUILDDIR) + + include/cli.rst: $(top_builddir)/bin/varnishd/varnishd ++ LD_LIBRARY_PATH=$(top_builddir)/lib/libvarnishapi/.libs \ + $(top_builddir)/bin/varnishd/varnishd -x cli > ${@}_ + mv ${@}_ ${@} + + include/params.rst: $(top_builddir)/bin/varnishd/varnishd ++ LD_LIBRARY_PATH=$(top_builddir)/lib/libvarnishapi/.libs \ + $(top_builddir)/bin/varnishd/varnishd -x parameter > ${@}_ + mv ${@}_ ${@} + +@@ -660,41 +662,52 @@ + # XXX add varnishstat here when it's been _opt2rst'ed + + include/varnishncsa_options.rst: $(top_builddir)/bin/varnishncsa/varnishncsa ++ LD_LIBRARY_PATH=$(top_builddir)/lib/libvarnishapi/.libs \ + $(top_builddir)/bin/varnishncsa/varnishncsa --options > ${@}_ + mv ${@}_ ${@} + include/varnishncsa_synopsis.rst: $(top_builddir)/bin/varnishncsa/varnishncsa ++ LD_LIBRARY_PATH=$(top_builddir)/lib/libvarnishapi/.libs \ + $(top_builddir)/bin/varnishncsa/varnishncsa --synopsis > ${@}_ + mv ${@}_ ${@} + + include/varnishlog_options.rst: $(top_builddir)/bin/varnishlog/varnishlog ++ LD_LIBRARY_PATH=$(top_builddir)/lib/libvarnishapi/.libs \ + $(top_builddir)/bin/varnishlog/varnishlog --options > ${@}_ + mv ${@}_ ${@} + include/varnishlog_synopsis.rst: $(top_builddir)/bin/varnishlog/varnishlog ++ LD_LIBRARY_PATH=$(top_builddir)/lib/libvarnishapi/.libs \ + $(top_builddir)/bin/varnishlog/varnishlog --synopsis > ${@}_ + mv ${@}_ ${@} + + include/varnishtop_options.rst: $(top_builddir)/bin/varnishtop/varnishtop ++ LD_LIBRARY_PATH=$(top_builddir)/lib/libvarnishapi/.libs \ + $(top_builddir)/bin/varnishtop/varnishtop --options > ${@}_ + mv ${@}_ ${@} + include/varnishtop_synopsis.rst: $(top_builddir)/bin/varnishtop/varnishtop ++ LD_LIBRARY_PATH=$(top_builddir)/lib/libvarnishapi/.libs \ + $(top_builddir)/bin/varnishtop/varnishtop --synopsis > ${@}_ + mv ${@}_ ${@} + + include/varnishhist_options.rst: $(top_builddir)/bin/varnishhist/varnishhist ++ LD_LIBRARY_PATH=$(top_builddir)/lib/libvarnishapi/.libs \ + $(top_builddir)/bin/varnishhist/varnishhist --options > ${@}_ + mv ${@}_ ${@} + include/varnishhist_synopsis.rst: $(top_builddir)/bin/varnishhist/varnishhist ++ LD_LIBRARY_PATH=$(top_builddir)/lib/libvarnishapi/.libs \ + $(top_builddir)/bin/varnishhist/varnishhist --synopsis > ${@}_ + mv ${@}_ ${@} + + include/varnishstat_options.rst: $(top_builddir)/bin/varnishstat/varnishstat ++ LD_LIBRARY_PATH=$(top_builddir)/lib/libvarnishapi/.libs \ + $(top_builddir)/bin/varnishstat/varnishstat --options > ${@}_ + mv ${@}_ ${@} + include/varnishstat_synopsis.rst: $(top_builddir)/bin/varnishstat/varnishstat ++ LD_LIBRARY_PATH=$(top_builddir)/lib/libvarnishapi/.libs \ + $(top_builddir)/bin/varnishstat/varnishstat --synopsis > ${@}_ + mv ${@}_ ${@} + + include/vsl-tags.rst: $(top_builddir)/lib/libvarnishapi/vsl2rst ++ LD_LIBRARY_PATH=$(top_builddir)/lib/libvarnishapi/.libs \ + $(top_builddir)/lib/libvarnishapi/vsl2rst > ${@}_ + mv ${@}_ ${@} + include/vtc-syntax.rst: vtc-syntax.py $(VTCSYN_SRC)