diff options
| author | dianlujitao <dianlujitao@gmail.com> | 2020-08-08 19:14:01 +0800 |
|---|---|---|
| committer | dianlujitao <dianlujitao@gmail.com> | 2020-08-12 15:15:45 +0800 |
| commit | a375cf357d893d14810e1c68d2ccd14f1738a716 (patch) | |
| tree | b2680ede498ffdf5bdd068b4e11b6dd1cf812ef7 /tools | |
| parent | da92c12fe38fb025030fd161054271a7c654d90c (diff) | |
[depends] Explicitly install libjpeg to lib
It uses GNUInstallDirs to determine the libdir, on some distros (Arch in
my case) the destination is lib64, but the Makefile of its dependencies
expect it to be in lib, thus failed to link. Always install to lib to
avoid changing them.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/depends/native/libjpeg-turbo/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/depends/native/libjpeg-turbo/Makefile b/tools/depends/native/libjpeg-turbo/Makefile index 761be37c6f..e1914acced 100644 --- a/tools/depends/native/libjpeg-turbo/Makefile +++ b/tools/depends/native/libjpeg-turbo/Makefile @@ -20,7 +20,7 @@ $(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS) rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM) cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) cd $(PLATFORM); patch -p1 -i ../01-disable-executables.patch - cd $(PLATFORM); $(CMAKE) -B build -DCMAKE_TOOLCHAIN_FILE= -DCMAKE_ASM_NASM_COMPILER:FILEPATH=$(NATIVEPREFIX)/bin/yasm -DENABLE_SHARED:BOOL=OFF -DWITH_JPEG8:BOOL=ON + cd $(PLATFORM); $(CMAKE) -B build -DCMAKE_TOOLCHAIN_FILE= -DCMAKE_ASM_NASM_COMPILER:FILEPATH=$(NATIVEPREFIX)/bin/yasm -DENABLE_SHARED:BOOL=OFF -DWITH_JPEG8:BOOL=ON -DCMAKE_INSTALL_LIBDIR:STRING=lib $(LIBDYLIB): $(PLATFORM) $(MAKE) -C $(PLATFORM)/build |