Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Minor third-party bumps #1409

Merged
merged 3 commits into from
Sep 11, 2021
Merged

Minor third-party bumps #1409

merged 3 commits into from
Sep 11, 2021

Conversation

NiLuJe
Copy link
Member

@NiLuJe NiLuJe commented Sep 11, 2021 •
edited by Frenzie
Loading

This change is Reviewable

Frenzie
Frenzie approved these changes Sep 11, 2021
View reviewed changes
Copy link
Member

@Frenzie Frenzie left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Meant to do that a few days ago — the HB that is, not tagging something in KoboUSBMS :-P

@Frenzie
Copy link
Member

Frenzie commented Sep 11, 2021

Before you merge, looks like the Android builds failed.

@NiLuJe
Copy link
Member Author

NiLuJe commented Sep 11, 2021

Looks like yet another CircleCI brainfart:

/bin/sh: 1:  && sed -i -e "s|DIST_SUBDIRS = libdjvu.*|DIST_SUBDIRS = libdjvu|g" Makefile && sed -i -e "s|SUBDIRS = libdjvu tools share \$(am__append_1) \$(am__append_2)|SUBDIRS = libdjvu share \$(am__append_1) \$(am__append_2)|g" Makefile && sh /home/ko/base/thirdparty/djvulibre/../cmake_modules/patch-wrapper.sh /home/ko/base/thirdparty/djvulibre/android.patch: not found
ninja: build stopped: subcommand failed.
Makefile.third:163: recipe for target 'build/arm-linux-androideabi/libs/libdjvulibre.so.21' failed

That:

  • Doesn't make any sense
  • Is completely unrelated to this PR

:?

@Frenzie
Copy link
Member

Frenzie commented Sep 11, 2021

Is it my fault? #1404

@Frenzie
Copy link
Member

Frenzie commented Sep 11, 2021

On phone, bit hard to check

@NiLuJe NiLuJe merged commit 369640b into koreader:master Sep 11, 2021
NiLuJe added a commit to NiLuJe/koreader that referenced this pull request Sep 11, 2021
@NiLuJe
Bump base
db3018f 
koreader/koreader-base#1409
@NiLuJe NiLuJe mentioned this pull request Sep 11, 2021
Merged
NiLuJe added a commit to koreader/koreader that referenced this pull request Sep 11, 2021
@NiLuJe
Bump base (#8208)
ca1d0ef 
koreader/koreader-base#1409
Frenzie
Frenzie reviewed Sep 12, 2021
View reviewed changes
thirdparty/djvulibre/CMakeLists.txt
@@ -32,6 +32,8 @@ if($ENV{ANDROID})
set(CFG_CMD "${CFG_CMD} && ${ISED} 's|soname_spec=.*|soname_spec=\"\\\\\$libname\\\\\$release\\\\\$shared_ext\\\\\$major\"|' libtool")
endif()

# Apparently CMake is scoped.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think what I wrote late last night makes sense given that else is just as scoped as if. :-P

I don't get it though; $ENV{ANDROID} should always combine with NOT $ENV{WIN32}.

@NiLuJe NiLuJe mentioned this pull request Sep 12, 2021
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Frenzie Frenzie Frenzie approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@NiLuJe @Frenzie