[mingw] Update for Fedora mingw installation location

Also adds --with-uniscribe by default.

Part of https://github.com/harfbuzz/harfbuzz/issues/1728
This commit is contained in:
Behdad Esfahbod 2019-05-25 11:15:15 -04:00
parent e7ed85de95
commit 5cf2e648a6
2 changed files with 10 additions and 8 deletions

View File

@ -14,9 +14,10 @@ unset PKG_CONFIG_PATH
# Removed -static from the following # Removed -static from the following
export CFLAGS="-static-libgcc" export CFLAGS="-static-libgcc"
export CXXFLAGS="-static-libgcc -static-libstdc++" export CXXFLAGS="-static-libgcc -static-libstdc++"
export CPPFLAGS="-I$HOME/.local/$target/include -O2" export CPPFLAGS="-I$HOME/.local/$target/include"
export LDFLAGS=-L$HOME/.local/$target/lib export LDFLAGS=-L$HOME/.local/$target/lib
export PKG_CONFIG_LIBDIR=$HOME/.local/$target/lib/pkgconfig export PKG_CONFIG_LIBDIR=$HOME/.local/$target/lib/pkgconfig:/usr/$target/sys-root/mingw/lib/pkgconfig/
export PATH=$HOME/.local/$target/bin:$PATH export PKG_CONFIG_PATH=$HOME/.local/$target/share/pkgconfig:/usr/$target/sys-root/mingw/share/pkgconfig/
export PATH=$HOME/.local/$target/bin:/usr/$target/sys-root/mingw/bin:/usr/$target/bin:$PATH
../configure --build=`../config.guess` --host=$target --prefix=$HOME/.local/$target "$@" ../configure --build=`../config.guess` --host=$target --prefix=$HOME/.local/$target --with-uniscribe "$@"

View File

@ -14,9 +14,10 @@ unset PKG_CONFIG_PATH
# Removed -static from the following # Removed -static from the following
export CFLAGS="-static-libgcc" export CFLAGS="-static-libgcc"
export CXXFLAGS="-static-libgcc -static-libstdc++" export CXXFLAGS="-static-libgcc -static-libstdc++"
export CPPFLAGS="-I$HOME/.local/$target/include -O2" export CPPFLAGS="-I$HOME/.local/$target/include"
export LDFLAGS=-L$HOME/.local/$target/lib export LDFLAGS=-L$HOME/.local/$target/lib
export PKG_CONFIG_LIBDIR=$HOME/.local/$target/lib/pkgconfig export PKG_CONFIG_LIBDIR=$HOME/.local/$target/lib/pkgconfig:/usr/$target/sys-root/mingw/lib/pkgconfig/
export PATH=$HOME/.local/$target/bin:$PATH export PKG_CONFIG_PATH=$HOME/.local/$target/share/pkgconfig:/usr/$target/sys-root/mingw/share/pkgconfig/
export PATH=$HOME/.local/$target/bin:/usr/$target/sys-root/mingw/bin:/usr/$target/bin:$PATH
../configure --build=`../config.guess` --host=$target --prefix=$HOME/.local/$target "$@" ../configure --build=`../config.guess` --host=$target --prefix=$HOME/.local/$target --with-uniscribe "$@"