xbps-src: common/{,environment}/build_style -> common/${,environment}/build-style.

This commit is contained in:
Juan RP 2015-02-21 12:13:07 +01:00
parent 724426f8e7
commit df4c861f97
19 changed files with 11 additions and 6 deletions

View File

@ -492,7 +492,7 @@ upstream versions. Example: `version=${version//./_}`
The `build_style` variable specifies the build method to build and install a The `build_style` variable specifies the build method to build and install a
package. It expects the name of any available script in the package. It expects the name of any available script in the
`void-packages/common/build_style` directory. Please note that required packages `void-packages/common/build-style` directory. Please note that required packages
to execute a `build_style` script must be defined via `$hostmakedepends`. to execute a `build_style` script must be defined via `$hostmakedepends`.
The current list of available `build_style` scripts is the following: The current list of available `build_style` scripts is the following:
@ -539,6 +539,11 @@ be defined to set the allowed python versions to be built, i.e:
> If `build_style` is not set, the template must (at least) define a > If `build_style` is not set, the template must (at least) define a
`do_install()` function and optionally more phases via `do_xxx()` functions. `do_install()` function and optionally more phases via `do_xxx()` functions.
Environment variables for a specific `build_style` can be declared in a filename
matching the `build_style` name, i.e:
`common/environment/build-style/gnu-configure.sh`
### Functions ### Functions
The following functions can be defined to change the behavior of how the The following functions can be defined to change the behavior of how the

View File

@ -87,7 +87,7 @@ if [ ! -f $XBPS_SUBPKG_INSTALL_DONE ]; then
${PKGNAME}_package ${PKGNAME}_package
pkgname=$PKGNAME pkgname=$PKGNAME
source_file $XBPS_COMMONDIR/environment/build_style/${build_style}.sh source_file $XBPS_COMMONDIR/environment/build-style/${build_style}.sh
install -d $PKGDESTDIR install -d $PKGDESTDIR
if declare -f pkg_install >/dev/null; then if declare -f pkg_install >/dev/null; then

View File

@ -42,7 +42,7 @@ if [ "$sourcepkg" != "$PKGNAME" ]; then
pkgname=$PKGNAME pkgname=$PKGNAME
fi fi
source_file $XBPS_COMMONDIR/environment/build_style/${build_style}.sh source_file $XBPS_COMMONDIR/environment/build-style/${build_style}.sh
setup_pkg_depends $pkgname setup_pkg_depends $pkgname
run_pkg_hooks pre-pkg run_pkg_hooks pre-pkg
touch -f $XBPS_PREPKG_DONE touch -f $XBPS_PREPKG_DONE

View File

@ -407,5 +407,5 @@ setup_pkg() {
export XBPS_WRAPPERDIR="${XBPS_STATEDIR}/wrappers" export XBPS_WRAPPERDIR="${XBPS_STATEDIR}/wrappers"
mkdir -p $XBPS_WRAPPERDIR mkdir -p $XBPS_WRAPPERDIR
source_file $XBPS_COMMONDIR/environment/build_style/${build_style}.sh source_file $XBPS_COMMONDIR/environment/build-style/${build_style}.sh
} }

View File

@ -403,7 +403,7 @@ if [ -n "$IN_CHROOT" ]; then
readonly XBPS_SHUTILSDIR=$XBPS_COMMONDIR/xbps-src/shutils readonly XBPS_SHUTILSDIR=$XBPS_COMMONDIR/xbps-src/shutils
readonly XBPS_TRIGGERSDIR=$XBPS_SRCPKGDIR/xbps-triggers/files readonly XBPS_TRIGGERSDIR=$XBPS_SRCPKGDIR/xbps-triggers/files
readonly XBPS_CROSSPFDIR=$XBPS_COMMONDIR/cross-profiles readonly XBPS_CROSSPFDIR=$XBPS_COMMONDIR/cross-profiles
readonly XBPS_BUILDSTYLEDIR=$XBPS_COMMONDIR/build_style readonly XBPS_BUILDSTYLEDIR=$XBPS_COMMONDIR/build-style
readonly XBPS_LIBEXECDIR=$XBPS_COMMONDIR/xbps-src/libexec readonly XBPS_LIBEXECDIR=$XBPS_COMMONDIR/xbps-src/libexec
else else
readonly XBPS_UHELPER_CMD="xbps-uhelper -r $XBPS_MASTERDIR" readonly XBPS_UHELPER_CMD="xbps-uhelper -r $XBPS_MASTERDIR"
@ -419,7 +419,7 @@ else
readonly XBPS_BUILDDIR=$XBPS_MASTERDIR/builddir readonly XBPS_BUILDDIR=$XBPS_MASTERDIR/builddir
readonly XBPS_TRIGGERSDIR=$XBPS_SRCPKGDIR/xbps-triggers/files readonly XBPS_TRIGGERSDIR=$XBPS_SRCPKGDIR/xbps-triggers/files
readonly XBPS_CROSSPFDIR=$XBPS_COMMONDIR/cross-profiles readonly XBPS_CROSSPFDIR=$XBPS_COMMONDIR/cross-profiles
readonly XBPS_BUILDSTYLEDIR=$XBPS_COMMONDIR/build_style readonly XBPS_BUILDSTYLEDIR=$XBPS_COMMONDIR/build-style
readonly XBPS_LIBEXECDIR=$XBPS_COMMONDIR/xbps-src/libexec readonly XBPS_LIBEXECDIR=$XBPS_COMMONDIR/xbps-src/libexec
fi fi
# XBPS_FETCH_CMD can be overriden # XBPS_FETCH_CMD can be overriden