From 5b500b2adda69cbfe6f06a915386f168636c90d2 Mon Sep 17 00:00:00 2001 From: Max Rees Date: Thu, 6 Feb 2020 23:13:00 -0600 Subject: user/liborcus: fix corner case build error [06:14] <@awilfox> /usr/lib/gcc/powerpc64-foxkit-linux-musl/8.3.0/../../../../powerpc64-foxkit-linux-musl/bin/ld: liborcus/.libs/liborcus-0.15.so: undefined reference to `orcus::json_map_tree::node_child_default_position' [06:14] <@awilfox> collect2: error: ld returned 1 exit status [06:14] <@awilfox> make[3]: *** [Makefile:1421: orcus-css-dump] Error 1 https://stackoverflow.com/q/8016780 --- user/liborcus/APKBUILD | 7 +++++-- user/liborcus/sepples-is-a-sin.patch | 11 +++++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 user/liborcus/sepples-is-a-sin.patch diff --git a/user/liborcus/APKBUILD b/user/liborcus/APKBUILD index b52995ab1..378ff6bbd 100644 --- a/user/liborcus/APKBUILD +++ b/user/liborcus/APKBUILD @@ -11,7 +11,9 @@ depends="" depends_dev="boost-dev mdds~1.5 libixion-dev~0.15" makedepends="$depends_dev zlib-dev" subpackages="$pkgname-dev" -source="http://kohei.us/files/orcus/src/$pkgname-$pkgver.tar.xz" +source="http://kohei.us/files/orcus/src/$pkgname-$pkgver.tar.xz + sepples-is-a-sin.patch + " build() { ./configure \ @@ -33,4 +35,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="bb5495a64ac5f984e107feb36dfe5c801d2ce7e2fcbee8f8bc779d87001e1fcb1d1f70ee2695eb976f1553c59908a15f887ceeb7ccfc556d4476ea846c5036f2 liborcus-0.15.3.tar.xz" +sha512sums="bb5495a64ac5f984e107feb36dfe5c801d2ce7e2fcbee8f8bc779d87001e1fcb1d1f70ee2695eb976f1553c59908a15f887ceeb7ccfc556d4476ea846c5036f2 liborcus-0.15.3.tar.xz +a5eca9d173942926a2c2469b9a40099ae22f42e11c44590045b126c1acca07aedbf27af7ae336ae6f6e1271036f795ead0ca00e77e53c67581ed4c387600f9a9 sepples-is-a-sin.patch" diff --git a/user/liborcus/sepples-is-a-sin.patch b/user/liborcus/sepples-is-a-sin.patch new file mode 100644 index 000000000..210ef2c86 --- /dev/null +++ b/user/liborcus/sepples-is-a-sin.patch @@ -0,0 +1,11 @@ +--- liborcus-0.15.3/src/liborcus/json_map_tree.cpp 2019-08-02 19:31:14.000000000 -0400 ++++ liborcus-0.15.3/src/liborcus/json_map_tree.cpp 2020-02-06 23:35:09.274550724 -0500 +@@ -14,6 +14,8 @@ + + namespace orcus { + ++constexpr json_map_tree::child_position_type json_map_tree::node_child_default_position; ++ + namespace { + + void throw_path_error(const char* file, int line, const pstring& path) -- cgit v1.2.3-60-g2f50