From bc6813534a01bb4eb0dd15442672af080a48ac12 Mon Sep 17 00:00:00 2001 From: James Le Cuirot Date: Wed, 15 Sep 2021 23:02:45 +0100 Subject: [PATCH] app-doc/doxygen: Patch to add missing header dependency for 1.9.1 It was failing to build with Ninja, but only on m68k for some bizarre reason. Probably just luck. Signed-off-by: James Le Cuirot --- app-doc/doxygen/doxygen-1.9.1.ebuild | 1 + app-doc/doxygen/doxygen-9999.ebuild | 1 + .../files/doxygen-1.9.1-header-dep.patch | 25 +++++++++++++++++++ 3 files changed, 27 insertions(+) create mode 100644 app-doc/doxygen/files/doxygen-1.9.1-header-dep.patch diff --git a/app-doc/doxygen/doxygen-1.9.1.ebuild b/app-doc/doxygen/doxygen-1.9.1.ebuild index feb75a0f08a1a..836656783af6d 100644 --- a/app-doc/doxygen/doxygen-1.9.1.ebuild +++ b/app-doc/doxygen/doxygen-1.9.1.ebuild @@ -59,6 +59,7 @@ PATCHES=( "${FILESDIR}/${PN}-1.8.16-link_with_pthread.patch" "${FILESDIR}/${PN}-1.8.17-ensure_static_support_libraries.patch" "${FILESDIR}/${PN}-1.9.1-ignore-bad-encoding.patch" + "${FILESDIR}/${PN}-1.9.1-header-dep.patch" ) DOCS=( LANGUAGE.HOWTO README.md ) diff --git a/app-doc/doxygen/doxygen-9999.ebuild b/app-doc/doxygen/doxygen-9999.ebuild index 16ef846e3b6b7..4ab0c394c0629 100644 --- a/app-doc/doxygen/doxygen-9999.ebuild +++ b/app-doc/doxygen/doxygen-9999.ebuild @@ -59,6 +59,7 @@ PATCHES=( "${FILESDIR}/${PN}-1.8.16-link_with_pthread.patch" "${FILESDIR}/${PN}-1.8.17-ensure_static_support_libraries.patch" "${FILESDIR}/${PN}-1.9.1-ignore-bad-encoding.patch" + "${FILESDIR}/${PN}-1.9.1-header-dep.patch" ) DOCS=( LANGUAGE.HOWTO README.md ) diff --git a/app-doc/doxygen/files/doxygen-1.9.1-header-dep.patch b/app-doc/doxygen/files/doxygen-1.9.1-header-dep.patch new file mode 100644 index 0000000000000..66e647cf53b54 --- /dev/null +++ b/app-doc/doxygen/files/doxygen-1.9.1-header-dep.patch @@ -0,0 +1,25 @@ +From 6ea1b4104fe2524c9c1f2cdd5f7de8c1a48f3f87 Mon Sep 17 00:00:00 2001 +From: James Le Cuirot +Date: Tue, 14 Sep 2021 20:56:20 +0100 +Subject: [PATCH] Fix missing dependency on configvalues.h + +It's referenced by config.h, which is referenced by most things. + +This was failing to build for me with Ninja on the m68k Linux platform. I don't know why it works elsewhere, could just be luck. + +--- + src/CMakeLists.txt | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 18406488dd..0e0c5f78de 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -215,6 +215,7 @@ add_library(doxymain STATIC + ${GENERATED_SRC}/ce_parse.cpp + # custom generated files + ${GENERATED_SRC}/lang_cfg.h ++ ${GENERATED_SRC}/configvalues.h + ${GENERATED_SRC}/ce_parse.h + ${GENERATED_SRC}/resources.cpp + #