Commit c78229b4e66acb48d28ce83bc4355a44508f3b9a
1 parent
f8e97e0e
Fix AppImage build: need LD_LIBRARY_PATH
I'm not sure why this is needed now and wasn't needed before since the cmake changes have been in main for a while and there don't appear to be recent changes to the appimage build tools. This change adds to lib directory to LD_LIBRARY_PATH so the appimage tools' ldd check will pass. This is an appropriate change since the directory that is added will be in the standard load path when installed.
Showing
2 changed files
with
17 additions
and
2 deletions
README-maintainer
| ... | ... | @@ -443,6 +443,16 @@ build-appimage, which passes them along to to docker. |
| 443 | 443 | Use -e SKIP_TESTS=1 to skip the test suite. |
| 444 | 444 | Use -ti -e RUN_SHELL=1 to run a shell instead of the build script. |
| 445 | 445 | |
| 446 | +To iterate on the scripts directly in the source tree, you can run | |
| 447 | + | |
| 448 | +docker build -t qpdfbuild appimage | |
| 449 | +docker run --privileged --rm -ti -e SKIP_TESTS=1 -e RUN_SHELL=1 \ | |
| 450 | + -v $PWD/..:/tmp/build ${1+"$@"} qpdfbuild | |
| 451 | + | |
| 452 | +This will put you at a shell prompt inside the container with your | |
| 453 | +current directory set to the top of the source tree and your uid equal | |
| 454 | +to the owner of the parent directory source tree. | |
| 455 | + | |
| 446 | 456 | |
| 447 | 457 | LOCAL WINDOWS TESTING PROCEDURE |
| 448 | 458 | ... | ... |
appimage/build-appimage
| ... | ... | @@ -21,7 +21,7 @@ |
| 21 | 21 | # into the 'CUSTOM_CONFIGURE' environment variable and exporting it |
| 22 | 22 | # before running this script. For example: |
| 23 | 23 | # |
| 24 | -# export CUSTOM_CONFIGURE=" --enable-test-compare-images [--more-other-options]" | |
| 24 | +# export CUSTOM_CONFIGURE=" -DSOME_OTHER_OPTION=1 [...]" | |
| 25 | 25 | # |
| 26 | 26 | # ATTENTION: |
| 27 | 27 | # |
| ... | ... | @@ -151,7 +151,12 @@ wget -c "https://github.com/probonopd/linuxdeployqt/releases/download/continuous |
| 151 | 151 | chmod a+x linuxdeployqt*.AppImage |
| 152 | 152 | |
| 153 | 153 | # Set up a clean environment: |
| 154 | -unset QTDIR; unset QT_PLUGIN_PATH; unset LD_LIBRARY_PATH | |
| 154 | +unset QTDIR; unset QT_PLUGIN_PATH | |
| 155 | + | |
| 156 | +# Since cmake strips runpath information for executables and we are | |
| 157 | +# installing with DESTDIR, we need to set LD_LIBRARY_PATH or else ldd | |
| 158 | +# will fail on the resulting executables | |
| 159 | +export LD_LIBRARY_PATH=$(dirname $(find $appdir -type l -name libqpdf.so.28)) | |
| 155 | 160 | |
| 156 | 161 | # Let 'linuxdeployqt' do its first stage of work: |
| 157 | 162 | ./linuxdeployqt*.AppImage appdir/usr/share/applications/*.desktop -bundle-non-qt-libs | ... | ... |