Skip to content

Commit 9ae98c8

Browse files
author
Srikanth Kotagiri
committed
Trying to get fPIC working
1 parent c704e1b commit 9ae98c8

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

build-ffmpeg

+6-2
Original file line numberDiff line numberDiff line change
@@ -873,7 +873,7 @@ CONFIGURE_OPTIONS+=("--enable-libmp3lame")
873873
if build "opus" "1.4"; then
874874
download "https://downloads.xiph.org/releases/opus/opus-$CURRENT_PACKAGE_VERSION.tar.gz"
875875
if $SHARED_LIBRARIES; then
876-
execute ./configure --prefix="${WORKSPACE}" --enable-shared --disable-static
876+
execute ./configure --prefix="${WORKSPACE}" --enable-shared --disable-static --with-pic
877877
else
878878
execute ./configure --prefix="${WORKSPACE}" --disable-shared --enable-static
879879
fi
@@ -989,7 +989,11 @@ if build "libwebp" "1.2.2"; then
989989
# libwebp can fail to compile on Ubuntu if these flags were left set to CFLAGS
990990
CPPFLAGS=
991991
download "https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-$CURRENT_PACKAGE_VERSION.tar.gz" "libwebp-$CURRENT_PACKAGE_VERSION.tar.gz"
992-
execute ./configure --prefix="${WORKSPACE}" --disable-shared --enable-static --disable-dependency-tracking --disable-gl --with-zlib-include="${WORKSPACE}"/include/ --with-zlib-lib="${WORKSPACE}"/lib
992+
if $SHARED_LIBRARIES; then
993+
execute ./configure --prefix="${WORKSPACE}" --enable-shared --disable-static --disable-dependency-tracking --disable-gl --with-zlib-include="${WORKSPACE}"/include/ --with-zlib-lib="${WORKSPACE}"/lib
994+
else
995+
execute ./configure --prefix="${WORKSPACE}" --disable-shared --enable-static --disable-dependency-tracking --disable-gl --with-zlib-include="${WORKSPACE}"/include/ --with-zlib-lib="${WORKSPACE}"/lib
996+
fi
993997
make_dir build
994998
cd build || exit
995999
execute cmake -DCMAKE_INSTALL_PREFIX="${WORKSPACE}" -DCMAKE_INSTALL_LIBDIR=lib -DCMAKE_INSTALL_BINDIR=bin -DCMAKE_INSTALL_INCLUDEDIR=include -DENABLE_SHARED=OFF -DENABLE_STATIC=ON ../

0 commit comments

Comments
 (0)