moparisthebest/pacman
1
0
Fork 0
mirror of https://github.com/moparisthebest/pacman synced 2024-12-22 07:48:50 -05:00
Code Issues Releases Wiki Activity

makepkg: run pkgver() and prepare() with --noextract

Browse Source 
Modifications made to the source before running with --noextract may alter
the version string returned by pkgver(). Always run this function if present
and check build status before proceeding.  Fixes FS#46800.

Also run prepare() when --noextract is used (unless --noprepare is specified).

Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
Allan McRae 2015-12-14 23:53:53 +10:00
parent 686fae6d74
commit 8454daa7fe
2 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
doc/makepkg.8.txt
View File

@ -55,11 +55,11 @@ Options
installed.
*-e, \--noextract*::
Do not extract source files or run the prepare() function (if present);
use whatever source already exists in the $srcdir/ directory. This is
handy if you want to go into $srcdir/ and manually patch or tweak code,
then make a package out of the result. Keep in mind that creating a
patch may be a better solution to allow others to use your PKGBUILD.
Do not extract source files; use whatever source already exists in the
$srcdir/ directory. This is handy if you want to go into $srcdir/ and
manually patch or tweak code, then make a package out of the result.
Keep in mind that creating a patch may be a better solution to allow
others to use your PKGBUILD.
*\--verifysource*::
For each source file in the source array of PKGBUILD, download the file

17
scripts/makepkg.sh.in
View File

@ -2205,14 +2205,15 @@ elif (( !REPKG )); then
fi
extract_sources
if (( PKGVERFUNC )); then
update_pkgver
basever=$(get_full_version)
check_build_status
fi
if (( PREPAREFUNC )); then
run_prepare
fi
fi
if (( PKGVERFUNC )); then
update_pkgver
basever=$(get_full_version)
check_build_status
fi
if (( PREPAREFUNC )); then
run_prepare
fi
if (( NOBUILD )); then