Date: Fri, 6 Aug 2021 09:22:32 GMT From: "Tobias C. Berner" <tcberner@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 9b85ac05288b - main - astro/phd2: fix build after ef8f58197aaa874dc087fe0d9f7942a2f12922fd Message-ID: <202108060922.1769MWLn034960@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by tcberner: URL: https://cgit.FreeBSD.org/ports/commit/?id=9b85ac05288b10c354d70fd4548407f6e445deac commit 9b85ac05288b10c354d70fd4548407f6e445deac Author: Tobias C. Berner <tcberner@FreeBSD.org> AuthorDate: 2021-08-06 09:20:28 +0000 Commit: Tobias C. Berner <tcberner@FreeBSD.org> CommitDate: 2021-08-06 09:20:28 +0000 astro/phd2: fix build after ef8f58197aaa874dc087fe0d9f7942a2f12922fd - This was failure detected during the freetype2 exp-run but is unrelated to freetype. PR: 251512 --- astro/phd2/files/patch-thirdparty_thirdparty.cmake | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/astro/phd2/files/patch-thirdparty_thirdparty.cmake b/astro/phd2/files/patch-thirdparty_thirdparty.cmake new file mode 100644 index 000000000000..27dee2b08db2 --- /dev/null +++ b/astro/phd2/files/patch-thirdparty_thirdparty.cmake @@ -0,0 +1,20 @@ +Fix compilation against libidngi 1.9.1 + +In file included from /wrkdirs/usr/ports/astro/phd2/work/phd2-2.6.9dev5/stepguider_sxao_indi.cpp:40: +In file included from /wrkdirs/usr/ports/astro/phd2/work/phd2-2.6.9dev5/phdindiclient.h:37: +/usr/local/include/libindi/baseclient.h:27:10: error: 'indimacros.h' file not found with <angled> include; use "quotes" instead +#include <indimacros.h> + ^ +1 warning and 1 error generated. + +--- thirdparty/thirdparty.cmake.orig 2021-08-06 09:18:28 UTC ++++ thirdparty/thirdparty.cmake +@@ -660,7 +660,7 @@ else() + find_package(INDI 0.9 REQUIRED) + # source files include <libindi/baseclient.h> so we need the libindi parent directory in the include directories + get_filename_component(INDI_INCLUDE_PARENT_DIR ${INDI_INCLUDE_DIR} DIRECTORY) +- include_directories(${INDI_INCLUDE_PARENT_DIR}) ++ include_directories(${INDI_INCLUDE_PARENT_DIR} ${INDI_INCLUDE_DIR}) + if(INDI_VERSION VERSION_LESS "1.4") + set(PHD_LINK_EXTERNAL ${PHD_LINK_EXTERNAL} ${INDI_CLIENT_LIBRARIES} ${INDI_LIBRARIES}) + else(INDI_VERSION VERSION_LESS "1.4")
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202108060922.1769MWLn034960>