Differential D34338 Diff 104202 textproc/libxml2/files/patch-CMakeLists.txt

Changeset View

Standalone View

textproc/libxml2/files/patch-CMakeLists.txt

This file was added.

				--- CMakeLists.txt.orig 2022-02-19 16:23:47 UTC
				+++ CMakeLists.txt
				@@ -691,7 +691,7 @@ if(LIBXML2_WITH_PYTHON)
				configure_file(python/setup.py.in setup.py @ONLY)
				endif()

				-set(XML_INCLUDEDIR "-I\${includedir}/libxml2")
				+set(XML_INCLUDEDIR "-I\${includedir}/libxml2 -I\${includedir}")
				set(XML_LIBDIR "-L\${libdir}")
				tcbernerUnsubmitted Not Done Inline Actions why? tcberner: why?
				diizzyAuthorUnsubmitted Not Done Inline Actions This seems more consistent with other projects at least looking on my textbox and is also the same behaviour of the current version of port using autotools diizzy: This seems more consistent with other projects at least looking on my textbox and is also the…
				tcbernerUnsubmitted Not Done Inline Actions looks unnecessary to me -- does anything break without this patch? tcberner: looks unnecessary to me -- does anything break without this patch?
				set(XML_LIBS "-lxml2")
				set(XML_PRIVATE_LIBS "${Z_LIBS} ${LZMA_LIBS} ${THREAD_LIBS} ${ICONV_LIBS} ${ICU_LIBS} ${M_LIBS}")
				@@ -699,14 +699,14 @@ set(XML_PRIVATE_LIBS "${Z_LIBS} ${LZMA_LIBS} ${THREAD_
				file(RELATIVE_PATH PACKAGE_RELATIVE_PATH "${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig" "${CMAKE_INSTALL_PREFIX}")
				tcbernerUnsubmitted Not Done Inline Actions ^that should not be necessary tcberner: ^that should not be necessary
				string(REGEX REPLACE "/$" "" PACKAGE_RELATIVE_PATH "${PACKAGE_RELATIVE_PATH}")

				-set(prefix "\${pcfiledir}/${PACKAGE_RELATIVE_PATH}")
				+set(prefix ${CMAKE_INSTALL_PREFIX})
				set(exec_prefix "\${prefix}")
				set(libdir "\${prefix}/${CMAKE_INSTALL_LIBDIR}")
				set(includedir "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}")
				configure_file(libxml-2.0.pc.in libxml-2.0.pc @ONLY)
				-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libxml-2.0.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig COMPONENT development)
				+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libxml-2.0.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}data/pkgconfig COMPONENT development)

				-set(prefix "\$(cd \"\$(dirname \"\$0\")\"; pwd -P)/..")
				+set(prefix ${CMAKE_INSTALL_PREFIX})
				configure_file(xml2-config.in xml2-config @ONLY)
				install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/xml2-config DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT development)