Skip to content

Commit

Permalink
app-doc/doxygen: Patch to add missing header dependency for 1.9.1
Browse files Browse the repository at this point in the history
It was failing to build with Ninja, but only on m68k for some bizarre
reason. Probably just luck.

Signed-off-by: James Le Cuirot <[email protected]>
  • Loading branch information
chewi committed Sep 15, 2021
1 parent 4381c98 commit bc68135
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 0 deletions.
1 change: 1 addition & 0 deletions app-doc/doxygen/doxygen-1.9.1.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -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 )
Expand Down
1 change: 1 addition & 0 deletions app-doc/doxygen/doxygen-9999.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -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 )
Expand Down
25 changes: 25 additions & 0 deletions app-doc/doxygen/files/doxygen-1.9.1-header-dep.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
From 6ea1b4104fe2524c9c1f2cdd5f7de8c1a48f3f87 Mon Sep 17 00:00:00 2001
From: James Le Cuirot <[email protected]>
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
#

0 comments on commit bc68135

Please sign in to comment.