Added support for 'config.site' files
Now users don't need to override installation prefix for MinGW programs and 'configure' scripts use more compatible triplet 'x86_64-w64-mingw32` automatically instead of 'x86_64-pc-mingw64`.
This commit is contained in:
Karlson2k
parent
a924e620f1
commit
84555bb798
@ -1,9 +1,10 @@
|
||||
# Maintainer: Alexey Pavlov <alexpux@gmail.com>
|
||||
# Contributor: Renato Silva <br.renatosilva@gmail.com>
|
||||
# Contributor: Karlson2k (Evgeny Grin) <k2k@narod.ru>
|
||||
|
||||
pkgname=filesystem
|
||||
pkgver=2016.05
|
||||
pkgrel=3
|
||||
pkgver=2016.06
|
||||
pkgrel=1
|
||||
pkgdesc='Base filesystem'
|
||||
arch=('i686' 'x86_64')
|
||||
license=('BSD')
|
||||
@ -42,7 +43,11 @@ source=('bash.bash_logout'
|
||||
'06-windows-files.post'
|
||||
'07-pacman-key.post'
|
||||
'08-xml-catalog.post'
|
||||
'cygwin.ldif')
|
||||
'cygwin.ldif'
|
||||
'main-config.site'
|
||||
'mingw64-config.site'
|
||||
'mingw32-config.site'
|
||||
'redirect-config.site')
|
||||
sha256sums=('6d651f6b0b2d173961a3fa21acd9d44c783ed9cd73a031687698c8b9ed1f6dee'
|
||||
'b985a05176a940bfd46c33ac1a1f78b3b09508d8b7c28f8e23e542975e09e0e2'
|
||||
'99eae6e37081edd73b399009c85f4a67a0c14481241ee4937ab45c4178b540fb'
|
||||
@ -55,7 +60,7 @@ sha256sums=('6d651f6b0b2d173961a3fa21acd9d44c783ed9cd73a031687698c8b9ed1f6dee'
|
||||
'9620bdf1c82ea3f14c3553c44a2006ea61ff3f5a775a2a053130a59cc186daf5'
|
||||
'7d6994d7caf52a459b562cfb0da1d758a4b7bca478d1df00de3a96686e59008e'
|
||||
'45bdfd620e81e6c0ff0bc0e7d9fa1bc4efebe7382c37e8affc29e306fe3fe7b7'
|
||||
'dbad95826d6302294aa7cfbafdefb8ef86b12388e3ac419fc55326cc4e2fc7fe'
|
||||
'3c1da9bf6ff791c32f17e49db0047b3c9cbaacd44d6d0b92696cdeacebf8f947'
|
||||
'91f1f918cf13deab0124082086e990786113b0e710dbda4678d8fc14905ad94d'
|
||||
'ddad06e5a36dc501356d585154eabb755af20a4e26f1aa6709d6282feee41866'
|
||||
'0a3a3b131ace34f11f428118dfe81b34da148e29b6bea3b027d79bebd47141a7'
|
||||
@ -70,7 +75,11 @@ sha256sums=('6d651f6b0b2d173961a3fa21acd9d44c783ed9cd73a031687698c8b9ed1f6dee'
|
||||
'9aa47f4d8b781906136d39d10fa9c007e9ff7433624213c7db7a03e906e804ba'
|
||||
'fd6eb255b5a35e62a34a54bf39598134296a11bddd3e6a30edd008cbe136b9f3'
|
||||
'ad8533809ea2b1bce0a41b3a0a24dbc7a9f58b992ceb40cc9f862b1978032790'
|
||||
'b9af554432605fe4027fbc231170e01edb5bcbb958bfd0922609f1901a2dd555')
|
||||
'b9af554432605fe4027fbc231170e01edb5bcbb958bfd0922609f1901a2dd555'
|
||||
'5b7008a16138d6384bd39e44e8d4468a736988b3acf771b7d4176915c291c0e8'
|
||||
'1d44caea13a703c742cf838657b73c45fe1bbc44073f65ee018c08cb1cc13d78'
|
||||
'bd1f2d81e3514b079ce27dbab723b2a7316a94f3a5d480ddbb72d0cfb9931b49'
|
||||
'26bf8d1acade9431d60c035a7ddfa9cb0775d5b9a457c5aca56f51c5f2f93f98')
|
||||
|
||||
build() {
|
||||
cd ${srcdir}
|
||||
@ -141,4 +150,11 @@ package() {
|
||||
done
|
||||
|
||||
install -Dm 644 ${srcdir}/cygwin.ldif usr/share/Msys/cygwin.ldif
|
||||
|
||||
# setup 'configure' helpers
|
||||
#
|
||||
install -m644 ${srcdir}/main-config.site etc/config.site
|
||||
install -m644 ${srcdir}/mingw64-config.site mingw64/etc/config.site
|
||||
install -m644 ${srcdir}/mingw32-config.site mingw32/etc/config.site
|
||||
install -D -m644 ${srcdir}/redirect-config.site usr/local/etc/config.site
|
||||
}
|
||||
|
||||
33
filesystem/main-config.site
Normal file
33
filesystem/main-config.site
Normal file
@ -0,0 +1,33 @@
|
||||
# This file is in public domain.
|
||||
# Original author: Karlson2k (Evgeny Grin)
|
||||
# Written for MSys2 to help running 'configure' scripts
|
||||
|
||||
# Use correct config.site even if CONFIG_SITE is not set
|
||||
if test "x$MSYSTEM" = "xMINGW64"; then
|
||||
if test -r "${MINGW_PREFIX-/mingw64}/etc/config.site"; then
|
||||
. "${MINGW_PREFIX-/mingw64}/etc/config.site"
|
||||
fi
|
||||
elif test "x$MSYSTEM" = "xMINGW32"; then
|
||||
if test -r "${MINGW_PREFIX-/mingw32}/etc/config.site"; then
|
||||
. "${MINGW_PREFIX-/mingw32}/etc/config.site"
|
||||
fi
|
||||
else
|
||||
# Defaults for MSys2-targeted programs
|
||||
|
||||
# Set proper selfname on bash and fallback to default name on other shells
|
||||
test -n "${BASH_SOURCE}" 2>/dev/null && config_site_me="${BASH_SOURCE[0]##*/}" || config_site_me=config.site
|
||||
|
||||
# Set default 'host' to speedup configure
|
||||
if test -z "$build_alias"; then
|
||||
build_alias="${MSYSTEM_CARCH-x86_64}-pc-msys" && \
|
||||
$as_echo "$config_site_me:${as_lineno-$LINENO}: default build_alias set to $build_alias" >&5
|
||||
fi
|
||||
|
||||
# Set default 'prefix' to "/usr"
|
||||
if ( test -z "$prefix" || test "x$prefix" = "xNONE" ) && \
|
||||
( test -z "$exec_prefix" || test "x$exec_prefix" = "xNONE" ); then
|
||||
prefix="${MSYSTEM_PREFIX-/usr}" && \
|
||||
$as_echo "$config_site_me:${as_lineno-$LINENO}: default prefix set to $prefix" >&5
|
||||
fi
|
||||
|
||||
fi
|
||||
21
filesystem/mingw32-config.site
Normal file
21
filesystem/mingw32-config.site
Normal file
@ -0,0 +1,21 @@
|
||||
# This file is in public domain.
|
||||
# Original author: Karlson2k (Evgeny Grin)
|
||||
# Written for MSys2/MinGW64 to help running 'configure' scripts
|
||||
|
||||
# Defaults for MinGW64-targeted programs
|
||||
|
||||
# Set proper selfname on bash and fallback to default name on other shells
|
||||
test -n "${BASH_SOURCE}" 2>/dev/null && config_site_me="${BASH_SOURCE[0]##*/}" || config_site_me=config.site
|
||||
|
||||
# Set default 'host' to speedup configure
|
||||
if test -z "$build_alias"; then
|
||||
build_alias="${MSYSTEM_CHOST-i686-w64-mingw32}" && \
|
||||
$as_echo "$config_site_me:${as_lineno-$LINENO}: default build_alias set to $build_alias" >&5
|
||||
fi
|
||||
|
||||
# Set default 'prefix' to "/mingw32"
|
||||
if ( test -z "$prefix" || test "x$prefix" = "xNONE" ) && \
|
||||
( test -z "$exec_prefix" || test "x$exec_prefix" = "xNONE" ); then
|
||||
prefix="${MSYSTEM_PREFIX-/mingw32}" && \
|
||||
$as_echo "$config_site_me:${as_lineno-$LINENO}: default prefix set to $prefix" >&5
|
||||
fi
|
||||
21
filesystem/mingw64-config.site
Normal file
21
filesystem/mingw64-config.site
Normal file
@ -0,0 +1,21 @@
|
||||
# This file is in public domain.
|
||||
# Original author: Karlson2k (Evgeny Grin)
|
||||
# Written for MSys2/MinGW64 to help running 'configure' scripts
|
||||
|
||||
# Defaults for MinGW64-targeted programs
|
||||
|
||||
# Set proper selfname on bash and fallback to default name on other shells
|
||||
test -n "${BASH_SOURCE}" 2>/dev/null && config_site_me="${BASH_SOURCE[0]##*/}" || config_site_me=config.site
|
||||
|
||||
# Set default 'host' to speedup configure
|
||||
if test -z "$build_alias"; then
|
||||
build_alias="${MSYSTEM_CHOST-x86_64-w64-mingw32}" && \
|
||||
$as_echo "$config_site_me:${as_lineno-$LINENO}: default build_alias set to $build_alias" >&5
|
||||
fi
|
||||
|
||||
# Set default 'prefix' to "/mingw64"
|
||||
if ( test -z "$prefix" || test "x$prefix" = "xNONE" ) && \
|
||||
( test -z "$exec_prefix" || test "x$exec_prefix" = "xNONE" ); then
|
||||
prefix="${MSYSTEM_PREFIX-/mingw64}" && \
|
||||
$as_echo "$config_site_me:${as_lineno-$LINENO}: default prefix set to $prefix" >&5
|
||||
fi
|
||||
@ -20,6 +20,8 @@ unset MINGW_CHOST
|
||||
unset MINGW_PREFIX
|
||||
unset MINGW_PACKAGE_PREFIX
|
||||
|
||||
unset CONFIG_SITE
|
||||
|
||||
case "${MSYSTEM}" in
|
||||
MINGW32)
|
||||
MSYSTEM_PREFIX='/mingw32'
|
||||
@ -28,7 +30,8 @@ case "${MSYSTEM}" in
|
||||
MINGW_CHOST="${MSYSTEM_CHOST}"
|
||||
MINGW_PREFIX="${MSYSTEM_PREFIX}"
|
||||
MINGW_PACKAGE_PREFIX="mingw-w64-${MSYSTEM_CARCH}"
|
||||
export MSYSTEM_PREFIX MSYSTEM_CARCH MSYSTEM_CHOST MINGW_CHOST MINGW_PREFIX MINGW_PACKAGE_PREFIX
|
||||
CONFIG_SITE="${MSYSTEM_PREFIX}/etc/config.site"
|
||||
export MSYSTEM_PREFIX MSYSTEM_CARCH MSYSTEM_CHOST MINGW_CHOST MINGW_PREFIX MINGW_PACKAGE_PREFIX CONFIG_SITE
|
||||
;;
|
||||
MINGW64)
|
||||
MSYSTEM_PREFIX='/mingw64'
|
||||
@ -37,12 +40,14 @@ case "${MSYSTEM}" in
|
||||
MINGW_CHOST="${MSYSTEM_CHOST}"
|
||||
MINGW_PREFIX="${MSYSTEM_PREFIX}"
|
||||
MINGW_PACKAGE_PREFIX="mingw-w64-${MSYSTEM_CARCH}"
|
||||
export MSYSTEM_PREFIX MSYSTEM_CARCH MSYSTEM_CHOST MINGW_CHOST MINGW_PREFIX MINGW_PACKAGE_PREFIX
|
||||
CONFIG_SITE="${MSYSTEM_PREFIX}/etc/config.site"
|
||||
export MSYSTEM_PREFIX MSYSTEM_CARCH MSYSTEM_CHOST MINGW_CHOST MINGW_PREFIX MINGW_PACKAGE_PREFIX CONFIG_SITE
|
||||
;;
|
||||
*)
|
||||
MSYSTEM_PREFIX='/usr'
|
||||
MSYSTEM_CARCH="${HOSTTYPE}"
|
||||
MSYSTEM_CHOST="${MACHTYPE}"
|
||||
export MSYSTEM_PREFIX MSYSTEM_CARCH MSYSTEM_CHOST
|
||||
CONFIG_SITE="/etc/config.site"
|
||||
export MSYSTEM_PREFIX MSYSTEM_CARCH MSYSTEM_CHOST CONFIG_SITE
|
||||
;;
|
||||
esac
|
||||
|
||||
8
filesystem/redirect-config.site
Normal file
8
filesystem/redirect-config.site
Normal file
@ -0,0 +1,8 @@
|
||||
# This file is in public domain.
|
||||
# Original author: Karlson2k (Evgeny Grin)
|
||||
# Written for MSys2 to help running 'configure' scripts
|
||||
|
||||
# Use correct config.site file even if CONFIG_SITE is not set
|
||||
if test -r /etc/config.site; then
|
||||
. /etc/config.site
|
||||
fi
|
||||
Loading…
x
Reference in New Issue
Block a user