diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2021-12-05 02:47:11 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2021-12-05 02:47:11 +0000 |
| commit | 2771f79232c273bc2a57d23bf335dd81ccf6af28 (patch) | |
| tree | c8af0fd04194aed03cf067d44e53c7edd3e9ab84 /dev-libs/liborcus/files | |
| parent | e9d044d4b9b71200a96adfa280848858c0f468c9 (diff) | |
gentoo resync : 05.12.2021
Diffstat (limited to 'dev-libs/liborcus/files')
| -rw-r--r-- | dev-libs/liborcus/files/liborcus-0.17.0-test-fix.patch | 51 |
1 files changed, 51 insertions, 0 deletions
diff --git a/dev-libs/liborcus/files/liborcus-0.17.0-test-fix.patch b/dev-libs/liborcus/files/liborcus-0.17.0-test-fix.patch new file mode 100644 index 000000000000..1de33a7e3f4c --- /dev/null +++ b/dev-libs/liborcus/files/liborcus-0.17.0-test-fix.patch @@ -0,0 +1,51 @@ +# https://bugs.gentoo.org/713586 + +[PATCH] Build orcus-env-dump unconditionally + +The rule for `orcus-env-dump.o` is guarded by `if WITH_TOOLS` however, +the rule for the executable `orcus-env-dump` is not. This leads to +linking errors when running the test suite without tools. + +Move the rule for `orcus-env-dump.o` out of the if WITH_TOOLS block to +always build it. +--- + src/Makefile.am | 20 ++++++++++---------- + 1 file changed, 10 insertions(+), 10 deletions(-) + +diff --git a/src/Makefile.am b/src/Makefile.am +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -25,6 +25,16 @@ orcus_test_xml_LDADD = \ + + orcus_test_xml_CPPFLAGS = -I$(top_builddir)/lib/liborcus/liborcus.la $(AM_CPPFLAGS) -DSRCDIR=\""$(top_srcdir)"\" + ++#---------------------------------------------------------------------------- ++ ++# orcus-env-dump ++ ++orcus_env_dump_SOURCES = orcus_env_dump.cpp ++orcus_env_dump_LDADD = \ ++ parser/liborcus-parser-@ORCUS_API_VERSION@.la \ ++ liborcus/liborcus-@ORCUS_API_VERSION@.la ++orcus_env_dump_CPPFLAGS = -I$(top_builddir)/lib/liborcus/liborcus.la $(AM_CPPFLAGS) ++ + + TESTS = \ + orcus-test-xml \ +@@ -136,16 +146,6 @@ orcus_detect_CPPFLAGS = -I$(top_builddir)/lib/liborcus/liborcus.la $(AM_CPPFLAGS + + #---------------------------------------------------------------------------- + +-# orcus-env-dump +- +-orcus_env_dump_SOURCES = orcus_env_dump.cpp +-orcus_env_dump_LDADD = \ +- parser/liborcus-parser-@ORCUS_API_VERSION@.la \ +- liborcus/liborcus-@ORCUS_API_VERSION@.la +-orcus_env_dump_CPPFLAGS = -I$(top_builddir)/lib/liborcus/liborcus.la $(AM_CPPFLAGS) +- +-#---------------------------------------------------------------------------- +- + if BUILD_SPREADSHEET_MODEL + + orcus_json_LDADD += \ |