diff options
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | doc/PKGBUILD.5.txt | 39 |
3 files changed, 25 insertions, 20 deletions
@@ -5,7 +5,7 @@ VERSION DESCRIPTION - documentation: remove unnecessary "|| return 1" - contrib/bacman: update package compression selection - contrib/PKGBUILD.vim: add a few more license options - - translations: kk, pt, es updated + - translations: es, kk, sv, pt, ru updated 3.4.1 - fix interaction of --needed and multiple repo groups (FS#20221) - bash completion: small fixes to prevent alias problems - rankmirrors: fix bogus/empty variable assignment (FS#19911) diff --git a/configure.ac b/configure.ac index 473b2906..747c8b75 100644 --- a/configure.ac +++ b/configure.ac @@ -42,12 +42,12 @@ AC_PREREQ(2.62) # pacman_version_micro += 1 m4_define([lib_current], [5]) -m4_define([lib_revision], [1]) +m4_define([lib_revision], [2]) m4_define([lib_age], [0]) m4_define([pacman_version_major], [3]) m4_define([pacman_version_minor], [4]) -m4_define([pacman_version_micro], [1]) +m4_define([pacman_version_micro], [2]) m4_define([pacman_version], [pacman_version_major.pacman_version_minor.pacman_version_micro]) diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt index c85220b8..3d3909ac 100644 --- a/doc/PKGBUILD.5.txt +++ b/doc/PKGBUILD.5.txt @@ -237,9 +237,11 @@ name. The syntax is: `source=('filename::url')`. build() Function ---------------- In addition to the above directives, the optional build() bash function usually -comprises the remainder of the PKGBUILD. This is directly sourced and executed by -makepkg, so anything that bash or the system has available is available for use -here. Be sure any exotic commands used are covered by `makedepends`. +comprises the remainder of the PKGBUILD. This is directly sourced and executed +by makepkg, so anything that bash or the system has available is available for +use here. The function is run in `bash -e` mode, meaning any command that exits +with a non-zero status will cause the function to exit. Be sure any exotic +commands used are covered by `makedepends`. All of the above variables such as `pkgname` and `pkgver` are available for use in the build function. In addition, makepkg defines three variables for your @@ -263,24 +265,27 @@ the build function. package() Function ------------------ -An optional package() function can be specified in addition to the build() function. -This function is run immediately after the build() function. When specified in -combination with the fakeroot BUILDENV option in linkman:makepkg.conf[5], fakeroot -usage will be limited to running the packaging stage. An existing build() function +An optional package() function can be specified in addition to the build() +function. This function is run immediately after the build() function. The +function is run in `bash -e` mode, meaning any command that exits with a +non-zero status will cause the function to exit. When specified in combination +with the fakeroot BUILDENV option in linkman:makepkg.conf[5], fakeroot usage +will be limited to running the packaging stage. An existing build() function will be run as the user calling makepkg. Package Splitting ----------------- -makepkg supports building multiple packages from a single PKGBUILD. This is achieved -by assigning an array of package names to the `pkgname` directive. Each split package -uses a corresponding packaging function with name `package_foo()`, where `foo` is the -name of the split package. - -All options and directives for the split packages default to the global values given -within the PKGBUILD. However, some of these can be overridden within each split -package's packaging function. The following variables can be overridden: `pkgver`, -`pkgrel`, `pkgdesc`, `arch`, `license`, `groups`, `depends`, `optdepends`, -`provides`, `conflicts`, `replaces`, `backup`, `options`, `install` and `changelog`. +makepkg supports building multiple packages from a single PKGBUILD. This is +achieved by assigning an array of package names to the `pkgname` directive. +Each split package uses a corresponding packaging function with name +`package_foo()`, where `foo` is the name of the split package. + +All options and directives for the split packages default to the global values +given within the PKGBUILD. However, some of these can be overridden within each +split package's packaging function. The following variables can be overridden: +`pkgver`, `pkgrel`, `pkgdesc`, `arch`, `license`, `groups`, `depends`, +`optdepends`, `provides`, `conflicts`, `replaces`, `backup`, `options`, +`install` and `changelog`. An optional global directive is available when building a split package: |