Commit 907baeb6 authored by Rye Mutt's avatar Rye Mutt 🍞
Browse files

Fix up linux build

parent 60392a80
Pipeline #299 passed with stages
in 1 minute and 10 seconds
......@@ -81,10 +81,8 @@
</map>
<key>manifest</key>
<array>
<string>lib/debug/*.so*</string>
<string>lib/debug/*.a</string>
<string>lib/debug/pkgconfig/*</string>
<string>lib/release/*.so*</string>
<string>lib/release/*.a</string>
<string>lib/release/pkgconfig/*</string>
</array>
......
......@@ -112,11 +112,23 @@ pushd "$LIBWEBP_SOURCE_DIR"
export CPPFLAGS="$TARGET_CPPFLAGS"
fi
# Fix up path for pkgconfig
if [ -d "$stage/packages/lib/release/pkgconfig" ]; then
fix_pkgconfig_prefix "$stage/packages"
fi
OLD_PKG_CONFIG_PATH="${PKG_CONFIG_PATH:-}"
# force regenerate autoconf
autoreconf -fvi
# debug configure and build
CFLAGS="$DEBUG_CFLAGS" CXXFLAGS="$DEBUG_CXXFLAGS" ./configure --enable-lib-only \
export PKG_CONFIG_PATH="$stage/packages/lib/release/pkgconfig:${OLD_PKG_CONFIG_PATH}"
CFLAGS="$DEBUG_CFLAGS" \
CXXFLAGS="$DEBUG_CXXFLAGS" \
./configure --enable-static --disable-shared \
--enable-libwebpmux --enable-libwebpdemux --enable-libwebpdecoder --enable-libwebpextras \
--prefix="\${AUTOBUILD_PACKAGES_DIR}" --includedir="\${prefix}/include" --libdir="\${prefix}/lib/debug"
make -j$JOBS
make check
......@@ -130,7 +142,12 @@ pushd "$LIBWEBP_SOURCE_DIR"
make distclean
# Release configure and build
CFLAGS="$RELEASE_CFLAGS" CXXFLAGS="$RELEASE_CXXFLAGS" ./configure --enable-lib-only \
export PKG_CONFIG_PATH="$stage/packages/lib/release/pkgconfig:${OLD_PKG_CONFIG_PATH}"
CFLAGS="$RELEASE_CFLAGS" \
CXXFLAGS="$RELEASE_CXXFLAGS" \
./configure --enable-static --disable-shared \
--enable-libwebpmux --enable-libwebpdemux --enable-libwebpdecoder --enable-libwebpextras \
--prefix="\${AUTOBUILD_PACKAGES_DIR}" --includedir="\${prefix}/include" --libdir="\${prefix}/lib/release"
make -j$JOBS
make check
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment