summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGunnar Beutner <gbeutner@serenityos.org>2021-05-08 05:51:55 +0200
committerAndreas Kling <kling@serenityos.org>2021-05-08 19:14:09 +0200
commitbe724f184bd12e198fdda915601c22944a76e3b1 (patch)
treed482ee0e39ead1ad0be2d959f7c1ae567104ae85
parent611019e938626f65d23b99fe4ea94b410c17f151 (diff)
downloadserenity-be724f184bd12e198fdda915601c22944a76e3b1.zip
Ports: Link libtiff against libjpeg
Apparently libtiff uses symbols from libjpeg when that port was previously built.
-rwxr-xr-xPorts/libtiff/package.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/Ports/libtiff/package.sh b/Ports/libtiff/package.sh
index e6a9b351d0..61745d200f 100755
--- a/Ports/libtiff/package.sh
+++ b/Ports/libtiff/package.sh
@@ -7,11 +7,11 @@ http://download.osgeo.org/libtiff/tiff-${version}.tar.gz.sig tiff-${version}.tar
auth_type="sig"
auth_import_key="EBDFDB21B020EE8FD151A88DE301047DE1198975"
auth_opts="tiff-${version}.tar.gz.sig tiff-${version}.tar.gz"
-depends="zstd xz"
+depends="libjpeg zstd xz"
install() {
run make DESTDIR=${SERENITY_INSTALL_ROOT} $installopts install
- ${CC} -shared -o ${SERENITY_INSTALL_ROOT}/usr/local/lib/libtiff.so -Wl,-soname,libtiff.so -Wl,--whole-archive ${SERENITY_INSTALL_ROOT}/usr/local/lib/libtiff.a -Wl,--no-whole-archive -lzstd -llzma
- ${CC} -shared -o ${SERENITY_INSTALL_ROOT}/usr/local/lib/libtiffxx.so -Wl,-soname,libtiffxx.so -Wl,--whole-archive ${SERENITY_INSTALL_ROOT}/usr/local/lib/libtiffxx.a -Wl,--no-whole-archive -lzstd -llzma
+ ${CC} -shared -o ${SERENITY_INSTALL_ROOT}/usr/local/lib/libtiff.so -Wl,-soname,libtiff.so -Wl,--whole-archive ${SERENITY_INSTALL_ROOT}/usr/local/lib/libtiff.a -Wl,--no-whole-archive -lzstd -llzma -ljpeg
+ ${CC} -shared -o ${SERENITY_INSTALL_ROOT}/usr/local/lib/libtiffxx.so -Wl,-soname,libtiffxx.so -Wl,--whole-archive ${SERENITY_INSTALL_ROOT}/usr/local/lib/libtiffxx.a -Wl,--no-whole-archive -lzstd -llzma -ljpeg
rm -f ${SERENITY_INSTALL_ROOT}/usr/local/lib/libtiff.la ${SERENITY_INSTALL_ROOT}/usr/local/lib/libtiffxx.la
}