diff options
| author |  tsdgeos <aacid@kde.org> | 2022-07-06 05:30:51 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2022-07-06 13:30:51 +1000 |
| commit | 6afccf95f0afe466e7070a2e0c6076a0abdf233f (patch) | |
| tree | 4b68cd0ab959e4c1d2ee62901260b4f6823950a7 | |
| parent | bcf1fcd990c17903d443113083daeed8b46b297e (diff) | |
Fix poppler build (#7945)
| -rwxr-xr-x | projects/poppler/build.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/projects/poppler/build.sh b/projects/poppler/build.sh index fa7ee316..a2e14a42 100755 --- a/projects/poppler/build.sh +++ b/projects/poppler/build.sh @@ -84,7 +84,8 @@ make install mkdir -p $SRC/openjpeg/build pushd $SRC/openjpeg/build -cmake .. -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX=$PREFIX +sed -i "s#\${LCMS_LIBNAME}#-L$PREFIX/lib \${LCMS_LIBNAME}#" ../src/bin/jp2/CMakeLists.txt +PKG_CONFIG=`which pkg-config` cmake .. -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX=$PREFIX make -j$(nproc) install if [ "$SANITIZER" != "memory" ]; then @@ -131,7 +132,7 @@ if [ "$SANITIZER" != "memory" ]; then popd pushd $SRC/pango - meson \ + CFLAGS="$CFLAGS -fno-sanitize=vptr" CXXFLAGS="$CXXFLAGS -fno-sanitize=vptr" meson \ -Ddefault_library=static \ --prefix=$PREFIX \ --libdir=lib \ |