Support newest libjpeg-turbo on Oracle
This commit is contained in:
@@ -4,7 +4,7 @@ set -euo pipefail
|
||||
|
||||
build_and_install() {
|
||||
export MAKEFLAGS=-j`nproc`
|
||||
export CFLAGS="-fpic -flto"
|
||||
export CFLAGS="-fpic"
|
||||
cmake -DCMAKE_INSTALL_PREFIX=/usr/local -G"Unix Makefiles"
|
||||
make
|
||||
make install
|
||||
@@ -17,6 +17,10 @@ install_build_dependencies() {
|
||||
yum install -y cmake gcc
|
||||
return
|
||||
fi
|
||||
if [ "$DISTRO" = oracle ]; then
|
||||
dnf install -y cmake gcc
|
||||
return
|
||||
fi
|
||||
|
||||
apt-get update
|
||||
apt-get install -y cmake gcc
|
||||
@@ -27,6 +31,10 @@ ensure_libjpeg_is_fast() {
|
||||
yum install -y nasm
|
||||
return
|
||||
fi
|
||||
if [ "$DISTRO" = oracle ]; then
|
||||
dnf install -y nasm
|
||||
return
|
||||
fi
|
||||
|
||||
apt-get update
|
||||
apt-get install -y nasm
|
||||
|
||||
@@ -1,8 +1,10 @@
|
||||
#!/bin/bash
|
||||
|
||||
detect_distro() {
|
||||
if [ -f /etc/centos-release ]; then
|
||||
DISTRO=centos
|
||||
elif [ -f /etc/oracle-release ]; then
|
||||
DISTRO=oracle7
|
||||
DISTRO=oracle
|
||||
elif [ -f /usr/bin/zypper ]; then
|
||||
DISTRO=opensuse
|
||||
else
|
||||
|
||||
Reference in New Issue
Block a user