- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] makepkg: add option to clear buildflags
by Allan McRae 25 Dec '10

25 Dec '10

Add the "buildflags" option, which is useful in its negative form for disabling CFLAGS, CXXFLAGS and LDFLAGS when building a package. This is useful when determining of one of these flags is causing an issue with a package. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- I doubt this option would ever be used in a "final" PKGBUILD, but it is very useful when trying to figure out build issues. contrib/PKGBUILD.vim | 2 +- doc/PKGBUILD.5.txt | 6 ++++++ scripts/makepkg.sh.in | 9 ++++++++- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/contrib/PKGBUILD.vim b/contrib/PKGBUILD.vim index a50ca12..f627a5e 100644 --- a/contrib/PKGBUILD.vim +++ b/contrib/PKGBUILD.vim @@ -172,7 +172,7 @@ hi def link pbValidSha1sums Number " options syn keyword pb_k_options options contained -syn match pbOptions /$no$\?$strip\|docs\|libtool\|emptydirs\|zipman\|ccache\|distcc\|makeflags$/ contained +syn match pbOptions /$no$\?$strip\|docs\|libtool\|emptydirs\|zipman\|ccache\|distcc\|makeflags\|buildflags$/ contained syn match pbOptionsNeg /\!/ contained syn match pbOptionsDeprec /no/ contained syn region pbOptionsGroup start=/^options=(/ end=/)/ contains=pb_k_options,pbOptions,pbOptionsNeg,pbOptionsDeprec,pbIllegalOption,shDoubleQuote,shSingleQuote diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt index 2ccf0b2..e6c4a1f 100644 --- a/doc/PKGBUILD.5.txt +++ b/doc/PKGBUILD.5.txt @@ -233,6 +233,12 @@ name. The syntax is: `source=('filename::url')`. form `!distcc` with select packages that have problems building with distcc. + *buildflags*;; + Allow the use of user-specific buildflags (CFLAGS, CXXFLAGS, LDFLAGS) + during build as specified in linkman:makepkg.conf[5]. More useful in + its negative form `!buildflags` with select packages that have problems + building with custom buildflags. + *makeflags*;; Allow the use of user-specific makeflags during build as specified in linkman:makepkg.conf[5]. More useful in its negative form diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index c8f128c..4e60b62 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -45,7 +45,7 @@ srcdir="$startdir/src" pkgdir="$startdir/pkg" packaging_options=('strip' 'docs' 'libtool' 'emptydirs' 'zipman' 'purge') -other_options=('ccache' 'distcc' 'makeflags') +other_options=('ccache' 'distcc' 'buildflags' 'makeflags') splitpkg_overrides=('pkgver' 'pkgrel' 'pkgdesc' 'arch' 'license' 'groups' \ 'depends' 'optdepends' 'provides' 'conflicts' 'replaces' \ 'backup' 'options' 'install' 'changelog') @@ -739,6 +739,13 @@ run_function() { fi local pkgfunc="$1" + # clear user-specified buildflags if requested + if [[ $(check_option buildflags) = "n" ]]; then + CFLAGS="" + CXXFLAGS="" + LDFLAGS="" + fi + # clear user-specified makeflags if requested if [[ $(check_option makeflags) = "n" ]]; then MAKEFLAGS="" -- 1.7.3.4

1 0

[pacman-dev] [PATCH] makepkg: Add check() function for running test suites
by Allan McRae 25 Dec '10

25 Dec '10

A PKGBUILD can have an option check() function for running test suites between the build() and package() stages. This function is run by default but can be disabled globally in with "!check" in BUILDENV in makepkg.conf. This setting can be controlled on an individual package basis using makepkg's --check and --nocheck flags. Addition dependencies needed for running the test suite can be specified in the checkdepends array and are only checked when running the check() function. Original-work-by: Jeff C <jeff(a)kcaccess.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> --- This adds the --check option to force the running of the check() function when using !check in makepkg.conf. PKGBUILD-split.proto | 6 ++++++ PKGBUILD.proto | 8 ++++++-- doc/PKGBUILD.5.txt | 16 +++++++++++++++- doc/makepkg.8.txt | 7 +++++++ doc/makepkg.conf.5.txt | 5 +++++ etc/makepkg.conf.in | 5 +++-- scripts/makepkg.sh.in | 31 ++++++++++++++++++++++++++++--- 7 files changed, 70 insertions(+), 8 deletions(-) diff --git a/PKGBUILD-split.proto b/PKGBUILD-split.proto index f5114ab..52aacc5 100644 --- a/PKGBUILD-split.proto +++ b/PKGBUILD-split.proto @@ -16,6 +16,7 @@ license=('GPL') groups=() depends=() makedepends=() +checkdepends=() provides=() conflicts=() replaces=() @@ -33,6 +34,11 @@ build() { make } +check() { + cd "$srcdir/$pkgname-$pkgver" + make -k check +} + package_pkg1() { # options and directives that can be overridden pkgver= diff --git a/PKGBUILD.proto b/PKGBUILD.proto index 71dbc14..98172d8 100644 --- a/PKGBUILD.proto +++ b/PKGBUILD.proto @@ -15,6 +15,7 @@ license=('GPL') groups=() depends=() makedepends=() +checkdepends=() optdepends=() provides=() conflicts=() @@ -29,14 +30,17 @@ md5sums=() #generate with 'makepkg -g' build() { cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr make } -package() { +check() { cd "$srcdir/$pkgname-$pkgver" + make -k check +} +package() { + cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir/" install } diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt index 3d3909a..2ccf0b2 100644 --- a/doc/PKGBUILD.5.txt +++ b/doc/PKGBUILD.5.txt @@ -156,6 +156,12 @@ name. The syntax is: `source=('filename::url')`. needed at runtime. Packages in this list follow the same format as depends. +*checkdepends (array)*:: + An array of packages that this package depends on to run its test suite, + but are not needed at runtime. Packages in this list follow the same + format as depends. These dependencies are only considered when the + check() function is present and is to be run by makepkg. + *optdepends (array)*:: An array of packages (and accompanying reasons) that are not essential for base functionality, but may be necessary to make full use of the contents @@ -263,10 +269,18 @@ If you create any variables of your own in the build function, it is recommended to use the bash `local` keyword to scope the variable to inside the build function. +check() Function +---------------- +An optional check() function can be specified in which a packages test-suite +may be run. This function is run between the build() and package() functions. +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 `checkdepends`. + package() 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. This function is run after the build() and check() functions. 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 diff --git a/doc/makepkg.8.txt b/doc/makepkg.8.txt index ff0f2b6..3b83015 100644 --- a/doc/makepkg.8.txt +++ b/doc/makepkg.8.txt @@ -153,6 +153,13 @@ Options Only build listed packages from a split package. The use of quotes is necessary when specifying multiple packages. e.g. `--pkg "pkg1 pkg3"` +*\--check*:: + Run the check() function in the PKGBUILD, overriding the setting in + linkman:makepkg.conf[5]. + +*\--nocheck*:: + Do not run the check() function in the PKGBUILD or handle the checkdepends. + *\--noconfirm*:: (Passed to pacman) Prevent pacman from waiting for user input before proceeding with operations. diff --git a/doc/makepkg.conf.5.txt b/doc/makepkg.conf.5.txt index 86ea6a3..020804c 100644 --- a/doc/makepkg.conf.5.txt +++ b/doc/makepkg.conf.5.txt @@ -93,6 +93,11 @@ Options be disabled for individual packages by placing `!ccache` in the PKGBUILD options array. + *check*;; + Run the check() function if present in the PKGBUILD. This can be + enabled or disabled for individual packages through the use of + makepkg's `--check` and `--nocheck` options respectively. + **DISTCC_HOSTS=**"host1 ...":: If using DistCC, this is used to specify a space-delimited list of hosts running in the DistCC cluster. In addition, you will want to modify your diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in index c795432..81a11b1 100644 --- a/etc/makepkg.conf.in +++ b/etc/makepkg.conf.in @@ -39,15 +39,16 @@ CXXFLAGS="@CARCHFLAGS@-mtune=generic -O2 -pipe" # BUILD ENVIRONMENT ######################################################################### # -# Defaults: BUILDENV=(fakeroot !distcc color !ccache) +# Defaults: BUILDENV=(fakeroot !distcc color !ccache check) # A negated environment option will do the opposite of the comments below. # #-- fakeroot: Allow building packages as a non-root user #-- distcc: Use the Distributed C/C++/ObjC compiler #-- color: Colorize output messages #-- ccache: Use ccache to cache compilation +#-- check: Run the check() function if present in the PKGBUILD # -BUILDENV=(fakeroot !distcc color !ccache) +BUILDENV=(fakeroot !distcc color !ccache check) # #-- If using DistCC, your MAKEFLAGS will also need modification. In addition, #-- specify a space-delimited list of hosts running in the DistCC cluster. diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 79b307a..c8f128c 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -71,6 +71,7 @@ SOURCEONLY=0 IGNOREARCH=0 HOLDVER=0 BUILDFUNC=0 +CHECKFUNC=0 PKGFUNC=0 SPLITPKG=0 PKGLIST=() @@ -145,6 +146,9 @@ clean_up() { if (( BUILDFUNC )); then rm -f "${pkgbase}-${pkgver}-${pkgrel}-${CARCH}-build.log"* fi + if (( CHECKFUNC )); then + rm -f "${pkgbase}-${pkgver}-${pkgrel}-${CARCH}-check.log"* + fi if (( PKGFUNC )); then rm -f "${pkgbase}-${pkgver}-${pkgrel}-${CARCH}-package.log"* elif (( SPLITPKG )); then @@ -805,6 +809,10 @@ run_build() { run_function "build" } +run_check() { + run_function "check" +} + run_package() { local pkgfunc if [[ -z $1 ]]; then @@ -1547,8 +1555,10 @@ usage() { echo "$(gettext " -s, --syncdeps Install missing dependencies with pacman")" echo "$(gettext " --allsource Generate a source-only tarball including downloaded sources")" echo "$(gettext " --asroot Allow makepkg to run as root user")" + printf "$(gettext " --check Run the check() function in the %s")\n" "$BUILDSCRIPT" printf "$(gettext " --config <file> Use an alternate config file (instead of '%s')")\n" "$confdir/makepkg.conf" printf "$(gettext " --holdver Prevent automatic version bumping for development %ss")\n" "$BUILDSCRIPT" + printf "$(gettext " --nocheck Do not run the check() function in the %s")\n" "$BUILDSCRIPT" echo "$(gettext " --pkg <list> Only build listed packages from a split package")" echo "$(gettext " --skipinteg Do not fail when integrity checks are missing")" echo "$(gettext " --source Generate a source-only tarball without downloaded sources")" @@ -1584,10 +1594,10 @@ ARGLIST=("$@") # Parse Command Line Options. OPT_SHORT="AcCdefFghiLmop:rRsV" -OPT_LONG="allsource,asroot,ignorearch,clean,cleancache,nodeps" +OPT_LONG="allsource,asroot,ignorearch,check,clean,cleancache,nodeps" OPT_LONG+=",noextract,force,forcever:,geninteg,help,holdver" -OPT_LONG+=",install,log,nocolor,nobuild,pkg:,rmdeps,repackage,skipinteg" -OPT_LONG+=",source,syncdeps,version,config:" +OPT_LONG+=",install,log,nocolor,nobuild,nocheck,pkg:,rmdeps" +OPT_LONG+=",repackage,skipinteg,source,syncdeps,version,config:" # Pacman Options OPT_LONG+=",noconfirm,noprogressbar" OPT_TEMP="$(parse_options $OPT_SHORT $OPT_LONG "$@" || echo 'PARSE_OPTIONS FAILED')" @@ -1610,6 +1620,7 @@ while true; do -A|--ignorearch) IGNOREARCH=1 ;; -c|--clean) CLEANUP=1 ;; -C|--cleancache) CLEANCACHE=1 ;; + --check) RUN_CHECK='y' ;; --config) shift; MAKEPKG_CONF=$1 ;; -d|--nodeps) NODEPS=1 ;; -e|--noextract) NOEXTRACT=1 ;; @@ -1622,6 +1633,7 @@ while true; do -i|--install) INSTALL=1 ;; -L|--log) LOGGING=1 ;; -m|--nocolor) USE_COLOR='n' ;; + --nocheck) RUN_CHECK='n' ;; -o|--nobuild) NOBUILD=1 ;; -p) shift; BUILDFILE=$1 ;; --pkg) shift; PKGLIST=($1) ;; @@ -1837,6 +1849,12 @@ fi if declare -f build >/dev/null; then BUILDFUNC=1 fi +if declare -f check >/dev/null; then + # "Hide" check() function if not going to be run + if [[ $RUN_CHECK = 'y' || (! $(check_buildenv check) = "n" && ! $RUN_CHECK = "n") ]]; then + CHECKFUNC=1 + fi +fi if declare -f package >/dev/null; then PKGFUNC=1 elif [[ $SPLITPKG -eq 0 ]] && declare -f package_${pkgname} >/dev/null; then @@ -1900,6 +1918,7 @@ if (( INFAKEROOT )); then if (( ! REPKG )); then if (( BUILDFUNC )); then run_build + (( CHECKFUNC )) && run_check tidy_install fi else @@ -1950,6 +1969,10 @@ elif type -p "${PACMAN%% *}" >/dev/null; then msg "$(gettext "Checking buildtime dependencies...")" resolve_deps ${makedepends[@]} || deperr=1 + if (( CHECKFUNC )); then + resolve_deps ${checkdepends[@]} || deperr=1 + fi + if (( RMDEPS )); then current_pkglist=($(run_pacman -Qq)) # required by remove_deps fi @@ -2015,6 +2038,7 @@ else if (( ! REPKG )); then devel_update (( BUILDFUNC )) && run_build + (( CHECKFUNC )) && run_check fi if (( ! SPLITPKG )); then if (( PKGFUNC )); then @@ -2036,6 +2060,7 @@ else if (( ! REPKG && ( PKGFUNC || SPLITPKG ) )); then devel_update (( BUILDFUNC )) && run_build + (( CHECKFUNC )) && run_check cd "$startdir" fi -- 1.7.3.4

1 0

[pacman-dev] [PATCH] makepkg: allow pkgname usage in split package functions
by Allan McRae 25 Dec '10

25 Dec '10

Currently, using $pkgname in a split package package_*() function always returns the first value in the pkgname array rather than the name of tha package being packaged. Fix this so $pkgname gives the expected value. Fixes FS#22174 Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 7042e76..5ac71ed 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1414,17 +1414,19 @@ restore_package_variables() { } run_split_packaging() { - for pkg in ${pkgname[@]}; do - pkgdir="$pkgdir/$pkg" + local pkgname_backup=${pkgname[@]} + for pkgname in ${pkgname_backup[@]}; do + pkgdir="$pkgdir/$pkgname" mkdir -p "$pkgdir" chmod a-s "$pkgdir" backup_package_variables - run_package $pkg + run_package $pkgname tidy_install - create_package $pkg + create_package $pkgname restore_package_variables pkgdir="${pkgdir%/*}" done + pkgname=${pkgname_backup[@]} } # Canonicalize a directory path if it exists -- 1.7.3.4

1 0

[pacman-dev] [PATCH 1/2] Use macros in sync DB parsing
by Dan McGee 24 Dec '10

24 Dec '10

This simplifies a lot of the repetative code and makes it obvious where the tricky or different ones are (e.g. depends, dates). It also makes it significantly easier to change the way this code works in the future. There should be no functional change with this patch. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- This is really just setup for the following patch, or that one would be much more of a mess and you wouldn't be able to seperate the actual functional changes from the necessary ones. This does reduce the possibility for making errors in this copy-paste code though. -Dan lib/libalpm/be_sync.c | 151 +++++++++++++++++-------------------------------- 1 files changed, 52 insertions(+), 99 deletions(-) diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c index 72caa50..137fc1b 100644 --- a/lib/libalpm/be_sync.c +++ b/lib/libalpm/be_sync.c @@ -218,6 +218,24 @@ static int sync_db_populate(pmdb_t *db) return(count); } +#define READ_NEXT(s) do { \ + if(_alpm_archive_fgets(s, sizeof(s), archive) == NULL) goto error; \ + _alpm_strtrim(s); \ +} while(0) + +#define READ_AND_STORE(f) do { \ + READ_NEXT(line); \ + STRDUP(f, line, goto error); \ +} while(0) + +#define READ_AND_STORE_ALL(f) do { \ + char *linedup; \ + READ_NEXT(line); \ + if(strlen(line) == 0) break; \ + STRDUP(linedup, line, goto error); \ + f = alpm_list_add(f, linedup); \ +} while(1) /* note the while(1) and not (0) */ + static int sync_db_read(pmdb_t *db, struct archive *archive, struct archive_entry *entry) { char line[1024]; @@ -264,63 +282,35 @@ static int sync_db_read(pmdb_t *db, struct archive *archive, struct archive_entr while(_alpm_archive_fgets(line, sizeof(line), archive) != NULL) { _alpm_strtrim(line); if(strcmp(line, "%NAME%") == 0) { - if(_alpm_archive_fgets(line, sizeof(line), archive) == NULL) { - goto error; - } - if(strcmp(_alpm_strtrim(line), pkg->name) != 0) { + READ_NEXT(line); + if(strcmp(line, pkg->name) != 0) { _alpm_log(PM_LOG_ERROR, _("%s database is inconsistent: name " "mismatch on package %s\n"), db->treename, pkg->name); } } else if(strcmp(line, "%VERSION%") == 0) { - if(_alpm_archive_fgets(line, sizeof(line), archive) == NULL) { - goto error; - } - if(strcmp(_alpm_strtrim(line), pkg->version) != 0) { + READ_NEXT(line); + if(strcmp(line, pkg->version) != 0) { _alpm_log(PM_LOG_ERROR, _("%s database is inconsistent: version " "mismatch on package %s\n"), db->treename, pkg->name); } } else if(strcmp(line, "%FILENAME%") == 0) { - if(_alpm_archive_fgets(line, sizeof(line), archive) == NULL) { - goto error; - } - STRDUP(pkg->filename, _alpm_strtrim(line), goto error); + READ_AND_STORE(pkg->filename); } else if(strcmp(line, "%DESC%") == 0) { - if(_alpm_archive_fgets(line, sizeof(line), archive) == NULL) { - goto error; - } - STRDUP(pkg->desc, _alpm_strtrim(line), goto error); + READ_AND_STORE(pkg->desc); } else if(strcmp(line, "%GROUPS%") == 0) { - while(_alpm_archive_fgets(line, sizeof(line), archive) && strlen(_alpm_strtrim(line))) { - char *linedup; - STRDUP(linedup, _alpm_strtrim(line), goto error); - pkg->groups = alpm_list_add(pkg->groups, linedup); - } + READ_AND_STORE_ALL(pkg->groups); } else if(strcmp(line, "%URL%") == 0) { - if(_alpm_archive_fgets(line, sizeof(line), archive) == NULL) { - goto error; - } - STRDUP(pkg->url, _alpm_strtrim(line), goto error); + READ_AND_STORE(pkg->url); } else if(strcmp(line, "%LICENSE%") == 0) { - while(_alpm_archive_fgets(line, sizeof(line), archive) && - strlen(_alpm_strtrim(line))) { - char *linedup; - STRDUP(linedup, _alpm_strtrim(line), goto error); - pkg->licenses = alpm_list_add(pkg->licenses, linedup); - } + READ_AND_STORE_ALL(pkg->licenses); } else if(strcmp(line, "%ARCH%") == 0) { - if(_alpm_archive_fgets(line, sizeof(line), archive) == NULL) { - goto error; - } - STRDUP(pkg->arch, _alpm_strtrim(line), goto error); + READ_AND_STORE(pkg->arch); } else if(strcmp(line, "%BUILDDATE%") == 0) { - if(_alpm_archive_fgets(line, sizeof(line), archive) == NULL) { - goto error; - } - _alpm_strtrim(line); - + READ_NEXT(line); char first = tolower((unsigned char)line[0]); if(first > 'a' && first < 'z') { - struct tm tmp_tm = {0}; /* initialize to null in case of failure */ + /* initialize to null in case of failure */ + struct tm tmp_tm = {0}; setlocale(LC_TIME, "C"); strptime(line, "%a %b %e %H:%M:%S %Y", &tmp_tm); pkg->builddate = mktime(&tmp_tm); @@ -329,46 +319,28 @@ static int sync_db_read(pmdb_t *db, struct archive *archive, struct archive_entr pkg->builddate = atol(line); } } else if(strcmp(line, "%PACKAGER%") == 0) { - if(_alpm_archive_fgets(line, sizeof(line), archive) == NULL) { - goto error; - } - STRDUP(pkg->packager, _alpm_strtrim(line), goto error); + READ_AND_STORE(pkg->packager); } else if(strcmp(line, "%CSIZE%") == 0) { - /* NOTE: the CSIZE and SIZE fields both share the "size" field - * in the pkginfo_t struct. This can be done b/c CSIZE - * is currently only used in sync databases, and SIZE is - * only used in local databases. + /* Note: the CSIZE and SIZE fields both share the "size" field in the + * pkginfo_t struct. This can be done b/c CSIZE is currently only used + * in sync databases, and SIZE is only used in local databases. */ - if(_alpm_archive_fgets(line, sizeof(line), archive) == NULL) { - goto error; - } - pkg->size = atol(_alpm_strtrim(line)); + READ_NEXT(line); + pkg->size = atol(line); /* also store this value to isize if isize is unset */ if(pkg->isize == 0) { pkg->isize = pkg->size; } } else if(strcmp(line, "%ISIZE%") == 0) { - if(_alpm_archive_fgets(line, sizeof(line), archive) == NULL) { - goto error; - } - pkg->isize = atol(_alpm_strtrim(line)); + READ_NEXT(line); + pkg->isize = atol(line); } else if(strcmp(line, "%MD5SUM%") == 0) { - if(_alpm_archive_fgets(line, sizeof(line), archive) == NULL) { - goto error; - } - STRDUP(pkg->md5sum, _alpm_strtrim(line), goto error); + READ_AND_STORE(pkg->md5sum); } else if(strcmp(line, "%REPLACES%") == 0) { - while(_alpm_archive_fgets(line, sizeof(line), archive) && - strlen(_alpm_strtrim(line))) { - char *linedup; - STRDUP(linedup, _alpm_strtrim(line), goto error); - pkg->replaces = alpm_list_add(pkg->replaces, linedup); - } + READ_AND_STORE_ALL(pkg->replaces); } else if(strcmp(line, "%EPOCH%") == 0) { - if(_alpm_archive_fgets(line, sizeof(line), archive) == NULL) { - goto error; - } - pkg->epoch = atoi(_alpm_strtrim(line)); + READ_NEXT(line); + pkg->epoch = atoi(line); } else if(strcmp(line, "%FORCE%") == 0) { /* For backward compatibility, treat force as a non-zero epoch * but only if we didn't already have a known epoch value. */ @@ -376,39 +348,20 @@ static int sync_db_read(pmdb_t *db, struct archive *archive, struct archive_entr pkg->epoch = 1; } } else if(strcmp(line, "%DEPENDS%") == 0) { - while(_alpm_archive_fgets(line, sizeof(line), archive) && - strlen(_alpm_strtrim(line))) { - pmdepend_t *dep = _alpm_splitdep(_alpm_strtrim(line)); - pkg->depends = alpm_list_add(pkg->depends, dep); + /* Different than the rest because of the _alpm_splitdep call. */ + while(1) { + READ_NEXT(line); + if(strlen(line) == 0) break; + pkg->depends = alpm_list_add(pkg->depends, _alpm_splitdep(line)); } } else if(strcmp(line, "%OPTDEPENDS%") == 0) { - while(_alpm_archive_fgets(line, sizeof(line), archive) && - strlen(_alpm_strtrim(line))) { - char *linedup; - STRDUP(linedup, _alpm_strtrim(line), goto error); - pkg->optdepends = alpm_list_add(pkg->optdepends, linedup); - } + READ_AND_STORE_ALL(pkg->optdepends); } else if(strcmp(line, "%CONFLICTS%") == 0) { - while(_alpm_archive_fgets(line, sizeof(line), archive) && - strlen(_alpm_strtrim(line))) { - char *linedup; - STRDUP(linedup, _alpm_strtrim(line), goto error); - pkg->conflicts = alpm_list_add(pkg->conflicts, linedup); - } + READ_AND_STORE_ALL(pkg->conflicts); } else if(strcmp(line, "%PROVIDES%") == 0) { - while(_alpm_archive_fgets(line, sizeof(line), archive) && - strlen(_alpm_strtrim(line))) { - char *linedup; - STRDUP(linedup, _alpm_strtrim(line), goto error); - pkg->provides = alpm_list_add(pkg->provides, linedup); - } + READ_AND_STORE_ALL(pkg->provides); } else if(strcmp(line, "%DELTAS%") == 0) { - while(_alpm_archive_fgets(line, sizeof(line), archive) && strlen(_alpm_strtrim(line))) { - pmdelta_t *delta = _alpm_delta_parse(line); - if(delta) { - pkg->deltas = alpm_list_add(pkg->deltas, delta); - } - } + READ_AND_STORE_ALL(pkg->deltas); } } } else { -- 1.7.3.3

4 7

[pacman-dev] Warning to pacman-git users - database format change
by Allan McRae 21 Dec '10

21 Dec '10

Pacman's local database format changes with this commit being pushed to master: commit 21833d90e26635fdd2c6af247790a9bf374b4d80 Author: Allan McRae <allan(a)archlinux.org> Date: Sat Oct 30 15:35:43 2010 +1000 Merge desc and depends files in local db If you want to run pacman-git you will need to upgrade your pacman database format using the conviently named "pacman-db-upgrade" script in the scripts/ directory. This is not a particularly reversible operation, so if you run this you are stuck with pacman-git until the 3.5 release. Note that various scripts rely on the old database format. That includes namcap (which Dan is already fixing!). Allan

4 6

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.4.1-210-gc78a808
by dan＠archlinux.org 21 Dec '10

21 Dec '10

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, master has been updated via c78a808c49f1df12254ff9ae5ce32bd450e14df8 (commit) via a611879318a4c39488f977308af8ee90f428995b (commit) via 5776090055642bc7651a07cd9d31cf056d0531dc (commit) via 8ac7f7e6e557fe32dc36fce173db000b83611559 (commit) from 45146dccbb94f14fb56df2999131851ff15e46b9 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit c78a808c49f1df12254ff9ae5ce32bd450e14df8 Author: Allan McRae <allan(a)archlinux.org> Date: Sat Dec 18 22:47:16 2010 +1000 Only check diskspace availability if needs more than zero The amount of diskspace needed for a transaction can be less than zero. Only test this against the available disk space if it is positive, which avoids a comparison being made between signed and unsigned types (-Wsign-compare). Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit a611879318a4c39488f977308af8ee90f428995b Author: Allan McRae <allan(a)archlinux.org> Date: Sat Dec 18 22:26:04 2010 +1000 Always specify arguement type in function delcarations Always declare a function with (void) rather than () when we expect no arguements. Fixes all warnings with -Wstrict-prototypes. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 5776090055642bc7651a07cd9d31cf056d0531dc Author: Allan McRae <allan(a)archlinux.org> Date: Thu Dec 16 00:42:23 2010 +1000 makepkg: remove last inappropriate PKGBUILD usage We should always use $BUILDSCRIPT instead of PKGBUILD. The only remaining uses of PKGBUILD in makekg are in comments. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 8ac7f7e6e557fe32dc36fce173db000b83611559 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Dec 14 22:09:43 2010 -0600 Use macros in sync DB parsing This simplifies a lot of the repetative code and makes it obvious where the tricky or different ones are (e.g. depends, dates). It also makes it significantly easier to change the way this code works in the future. There should be no functional change with this patch. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/alpm.h | 44 +++++++------- lib/libalpm/be_package.c | 2 +- lib/libalpm/be_sync.c | 151 ++++++++++++++++------------------------------ lib/libalpm/diskspace.c | 3 +- lib/libalpm/handle.h | 2 +- lib/libalpm/util.h | 4 +- scripts/makepkg.sh.in | 2 +- src/pacman/sync.c | 2 +- src/util/pactree.c | 2 +- 9 files changed, 83 insertions(+), 129 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Always specify arguement type in function delcarations
by Allan McRae 19 Dec '10

19 Dec '10

Always declare a function with (void) rather than () when we expect no arguements. Fixes all warnings with -Wstrict-prototypes. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/alpm.h | 44 ++++++++++++++++++++++---------------------- lib/libalpm/be_package.c | 2 +- lib/libalpm/handle.h | 2 +- lib/libalpm/util.h | 4 ++-- src/pacman/sync.c | 2 +- src/util/pactree.c | 2 +- 6 files changed, 28 insertions(+), 28 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 86212a4..e17300f 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -97,69 +97,69 @@ typedef int (*alpm_cb_fetch)(const char *url, const char *localpath, * Options */ -alpm_cb_log alpm_option_get_logcb(); +alpm_cb_log alpm_option_get_logcb(void); void alpm_option_set_logcb(alpm_cb_log cb); -alpm_cb_download alpm_option_get_dlcb(); +alpm_cb_download alpm_option_get_dlcb(void); void alpm_option_set_dlcb(alpm_cb_download cb); -alpm_cb_fetch alpm_option_get_fetchcb(); +alpm_cb_fetch alpm_option_get_fetchcb(void); void alpm_option_set_fetchcb(alpm_cb_fetch cb); -alpm_cb_totaldl alpm_option_get_totaldlcb(); +alpm_cb_totaldl alpm_option_get_totaldlcb(void); void alpm_option_set_totaldlcb(alpm_cb_totaldl cb); -const char *alpm_option_get_root(); +const char *alpm_option_get_root(void); int alpm_option_set_root(const char *root); -const char *alpm_option_get_dbpath(); +const char *alpm_option_get_dbpath(void); int alpm_option_set_dbpath(const char *dbpath); -alpm_list_t *alpm_option_get_cachedirs(); +alpm_list_t *alpm_option_get_cachedirs(void); int alpm_option_add_cachedir(const char *cachedir); void alpm_option_set_cachedirs(alpm_list_t *cachedirs); int alpm_option_remove_cachedir(const char *cachedir); -const char *alpm_option_get_logfile(); +const char *alpm_option_get_logfile(void); int alpm_option_set_logfile(const char *logfile); -const char *alpm_option_get_lockfile(); +const char *alpm_option_get_lockfile(void); /* no set_lockfile, path is determined from dbpath */ -int alpm_option_get_usesyslog(); +int alpm_option_get_usesyslog(void); void alpm_option_set_usesyslog(int usesyslog); -alpm_list_t *alpm_option_get_noupgrades(); +alpm_list_t *alpm_option_get_noupgrades(void); void alpm_option_add_noupgrade(const char *pkg); void alpm_option_set_noupgrades(alpm_list_t *noupgrade); int alpm_option_remove_noupgrade(const char *pkg); -alpm_list_t *alpm_option_get_noextracts(); +alpm_list_t *alpm_option_get_noextracts(void); void alpm_option_add_noextract(const char *pkg); void alpm_option_set_noextracts(alpm_list_t *noextract); int alpm_option_remove_noextract(const char *pkg); -alpm_list_t *alpm_option_get_ignorepkgs(); +alpm_list_t *alpm_option_get_ignorepkgs(void); void alpm_option_add_ignorepkg(const char *pkg); void alpm_option_set_ignorepkgs(alpm_list_t *ignorepkgs); int alpm_option_remove_ignorepkg(const char *pkg); -alpm_list_t *alpm_option_get_ignoregrps(); +alpm_list_t *alpm_option_get_ignoregrps(void); void alpm_option_add_ignoregrp(const char *grp); void alpm_option_set_ignoregrps(alpm_list_t *ignoregrps); int alpm_option_remove_ignoregrp(const char *grp); -const char *alpm_option_get_arch(); +const char *alpm_option_get_arch(void); void alpm_option_set_arch(const char *arch); -int alpm_option_get_usedelta(); +int alpm_option_get_usedelta(void); void alpm_option_set_usedelta(int usedelta); -int alpm_option_get_checkspace(); +int alpm_option_get_checkspace(void); void alpm_option_set_checkspace(int checkspace); -pmdb_t *alpm_option_get_localdb(); -alpm_list_t *alpm_option_get_syncdbs(); +pmdb_t *alpm_option_get_localdb(void); +alpm_list_t *alpm_option_get_syncdbs(void); /* * Install reasons -- ie, why the package was installed @@ -407,9 +407,9 @@ typedef void (*alpm_trans_cb_conv)(pmtransconv_t, void *, void *, /* Transaction Progress callback */ typedef void (*alpm_trans_cb_progress)(pmtransprog_t, const char *, int, size_t, size_t); -int alpm_trans_get_flags(); -alpm_list_t * alpm_trans_get_add(); -alpm_list_t * alpm_trans_get_remove(); +int alpm_trans_get_flags(void); +alpm_list_t * alpm_trans_get_add(void); +alpm_list_t * alpm_trans_get_remove(void); int alpm_trans_init(pmtransflag_t flags, alpm_trans_cb_event cb_event, alpm_trans_cb_conv conv, alpm_trans_cb_progress cb_progress); diff --git a/lib/libalpm/be_package.c b/lib/libalpm/be_package.c index 2416dc8..6426fe9 100644 --- a/lib/libalpm/be_package.c +++ b/lib/libalpm/be_package.c @@ -131,7 +131,7 @@ int _package_changelog_close(const pmpkg_t *pkg, void *fp) * lets us only initialize an operations struct once which can always be * accessed by this method. */ -static struct pkg_operations *get_file_pkg_ops() +static struct pkg_operations *get_file_pkg_ops(void) { static struct pkg_operations *file_pkg_ops = NULL; /* determine whether our static file_pkg_ops struct has been initialized */ diff --git a/lib/libalpm/handle.h b/lib/libalpm/handle.h index 46414b9..b471ea6 100644 --- a/lib/libalpm/handle.h +++ b/lib/libalpm/handle.h @@ -66,7 +66,7 @@ typedef struct _pmhandle_t { /* global handle variable */ extern pmhandle_t *handle; -pmhandle_t *_alpm_handle_new(); +pmhandle_t *_alpm_handle_new(void); void _alpm_handle_free(pmhandle_t *handle); #endif /* _ALPM_HANDLE_H */ diff --git a/lib/libalpm/util.h b/lib/libalpm/util.h index dfdc6a7..543643b 100644 --- a/lib/libalpm/util.h +++ b/lib/libalpm/util.h @@ -79,8 +79,8 @@ int _alpm_makepath(const char *path); int _alpm_makepath_mode(const char *path, mode_t mode); int _alpm_copyfile(const char *src, const char *dest); char *_alpm_strtrim(char *str); -int _alpm_lckmk(); -int _alpm_lckrm(); +int _alpm_lckmk(void); +int _alpm_lckrm(void); int _alpm_unpack_single(const char *archive, const char *prefix, const char *fn); int _alpm_unpack(const char *archive, const char *prefix, alpm_list_t *list, int breakfirst); int _alpm_rmrf(const char *path); diff --git a/src/pacman/sync.c b/src/pacman/sync.c index f9d12e4..6961f3c 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -571,7 +571,7 @@ static int sync_list(alpm_list_t *syncs, alpm_list_t *targets) return(0); } -static alpm_list_t *syncfirst() { +static alpm_list_t *syncfirst(void) { alpm_list_t *i, *res = NULL; for(i = config->syncfirst; i; i = alpm_list_next(i)) { diff --git a/src/util/pactree.c b/src/util/pactree.c index 5e86967..967f5c8 100644 --- a/src/util/pactree.c +++ b/src/util/pactree.c @@ -54,7 +54,7 @@ int reverse = 0; int unique = 0; char *dbpath = NULL; -static int alpm_local_init() +static int alpm_local_init(void) { int ret; -- 1.7.3.3

3 8

[pacman-dev] [PATCH] Use limits.h for PATH_MAX
by Allan McRae 19 Dec '10

19 Dec '10

We use PATH_MAX everywhere by including limits.h so there is no point in doing a check for it in a different header when dealing with FreeBSD's libfetch. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- configure.ac | 4 ++-- lib/libalpm/dload.c | 6 ++---- lib/libalpm/error.c | 6 ++---- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/configure.ac b/configure.ac index 18e8996..e03a937 100644 --- a/configure.ac +++ b/configure.ac @@ -172,8 +172,8 @@ AS_IF([test "x$with_fetch" != "xno"], AM_CONDITIONAL([HAVE_LIBFETCH], [test "x$ac_cv_lib_fetch_fetchParseURL" = "xyes"]) # Checks for header files. -AC_CHECK_HEADERS([fcntl.h glob.h libintl.h limits.h locale.h mntent.h string.h strings.h \ - sys/ioctl.h sys/mount.h sys/param.h sys/statvfs.h sys/syslimits.h \ +AC_CHECK_HEADERS([fcntl.h glob.h libintl.h limits.h locale.h mntent.h string.h \ + strings.h sys/ioctl.h sys/mount.h sys/param.h sys/statvfs.h \ sys/time.h sys/types.h sys/ucred.h syslog.h wchar.h]) # Checks for typedefs, structures, and compiler characteristics. diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index ea7f557..09f716f 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -29,10 +29,8 @@ #include <sys/types.h> #include <sys/stat.h> #include <signal.h> -/* the following two are needed on BSD for libfetch */ -#if defined(HAVE_SYS_SYSLIMITS_H) -#include <sys/syslimits.h> /* PATH_MAX */ -#endif +/* the following two are needed for FreeBSD's libfetch */ +#include <limits.h> /* PATH_MAX */ #if defined(HAVE_SYS_PARAM_H) #include <sys/param.h> /* MAXHOSTNAMELEN */ #endif diff --git a/lib/libalpm/error.c b/lib/libalpm/error.c index d4c296f..3d05626 100644 --- a/lib/libalpm/error.c +++ b/lib/libalpm/error.c @@ -22,10 +22,8 @@ /* TODO: needed for the libfetch stuff, unfortunately- we should kill it */ #include <stdio.h> -/* the following two are needed on BSD for libfetch */ -#if defined(HAVE_SYS_SYSLIMITS_H) -#include <sys/syslimits.h> /* PATH_MAX */ -#endif +/* the following two are needed for FreeBSD's libfetch */ +#include <limits.h> /* PATH_MAX */ #if defined(HAVE_SYS_PARAM_H) #include <sys/param.h> /* MAXHOSTNAMELEN */ #endif -- 1.7.3.3

2 2

[pacman-dev] [PATCH] Detect undefined PATH_MAX
by Allan McRae 18 Dec '10

18 Dec '10

POSIX does not require PATH_MAX be defined when there is not actual limit to its value. This affects HURD based systems. Work around this by defining PATH_MAX to 4096 (as on Linux) when this is not defined. Also, clean up inclusions of limits.h Signed-off-by: Allan McRae <allan(a)archlinux.org> --- We do something like: #if !defined(PATH_MAX) #include <limits.h> #endif to only include limits.h when necessary, but given any decent compiler gets rid of unused stuff anyway, I do not think it necessary. acinclude.m4 | 16 ++++++++++++++++ configure.ac | 1 + lib/libalpm/be_sync.c | 1 + lib/libalpm/db.h | 1 - lib/libalpm/dload.c | 1 - lib/libalpm/error.c | 1 - lib/libalpm/package.c | 1 - lib/libalpm/sync.c | 1 + lib/libalpm/trans.c | 1 + src/util/cleanupdelta.c | 2 ++ src/util/testdb.c | 2 ++ 11 files changed, 24 insertions(+), 4 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index 6693da4..7309d73 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -125,3 +125,19 @@ extern int getmntinfo (struct statfs **, int); [Defined as the filesystem stats type ('statvfs' or 'statfs')]) ]) +dnl Checks for PATH_MAX and defines it if not present +AC_DEFUN([PATH_MAX_DEFINED], + [AC_CACHE_CHECK([PATH_MAX defined], path_max_cv_defined, + [AC_EGREP_CPP(yes, [[ +#include <limits.h> +#if defined(PATH_MAX) +yes +#endif +]], + [path_max_cv_defined=yes], + [path_max_cv_defined=no])] + ) + if test $path_max_cv_defined = no; then + AC_DEFINE([PATH_MAX], 4096, [Define if PATH_MAX is undefined by limits.h.]) + fi +]) diff --git a/configure.ac b/configure.ac index 747c8b7..18e8996 100644 --- a/configure.ac +++ b/configure.ac @@ -185,6 +185,7 @@ AC_TYPE_SIZE_T AC_STRUCT_TM AC_TYPE_UID_T AC_STRUCT_DIRENT_D_TYPE +PATH_MAX_DEFINED # Checks for library functions. AC_FUNC_FORK diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c index b201c00..d5d3a44 100644 --- a/lib/libalpm/be_sync.c +++ b/lib/libalpm/be_sync.c @@ -23,6 +23,7 @@ #include <errno.h> #include <ctype.h> #include <locale.h> +#include <limits.h> /* libarchive */ #include <archive.h> diff --git a/lib/libalpm/db.h b/lib/libalpm/db.h index ace366d..10aa164 100644 --- a/lib/libalpm/db.h +++ b/lib/libalpm/db.h @@ -23,7 +23,6 @@ #define _ALPM_DB_H #include "alpm.h" -#include <limits.h> #include <time.h> /* libarchive */ diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index 1cb24e6..ea7f557 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -29,7 +29,6 @@ #include <sys/types.h> #include <sys/stat.h> #include <signal.h> -#include <limits.h> /* the following two are needed on BSD for libfetch */ #if defined(HAVE_SYS_SYSLIMITS_H) #include <sys/syslimits.h> /* PATH_MAX */ diff --git a/lib/libalpm/error.c b/lib/libalpm/error.c index 78a7866..d4c296f 100644 --- a/lib/libalpm/error.c +++ b/lib/libalpm/error.c @@ -22,7 +22,6 @@ /* TODO: needed for the libfetch stuff, unfortunately- we should kill it */ #include <stdio.h> -#include <limits.h> /* the following two are needed on BSD for libfetch */ #if defined(HAVE_SYS_SYSLIMITS_H) #include <sys/syslimits.h> /* PATH_MAX */ diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c index 2ea5125..edfb7bd 100644 --- a/lib/libalpm/package.c +++ b/lib/libalpm/package.c @@ -25,7 +25,6 @@ #include <stdio.h> #include <stdlib.h> -#include <limits.h> #include <string.h> #include <ctype.h> #include <errno.h> diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 2d0a899..7a1e503 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -31,6 +31,7 @@ #include <stdint.h> /* intmax_t */ #include <unistd.h> #include <time.h> +#include <limits.h> /* libalpm */ #include "sync.h" diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c index 5bc2c91..5c13211 100644 --- a/lib/libalpm/trans.c +++ b/lib/libalpm/trans.c @@ -31,6 +31,7 @@ #include <sys/stat.h> #include <sys/statvfs.h> #include <errno.h> +#include <limits.h> /* libalpm */ #include "trans.h" diff --git a/src/util/cleanupdelta.c b/src/util/cleanupdelta.c index c1ef18c..2010282 100644 --- a/src/util/cleanupdelta.c +++ b/src/util/cleanupdelta.c @@ -17,6 +17,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ +#include "config.h" + #include <stdio.h> #include <stdlib.h> #include <string.h> diff --git a/src/util/testdb.c b/src/util/testdb.c index 28f2b2b..f77583a 100644 --- a/src/util/testdb.c +++ b/src/util/testdb.c @@ -17,6 +17,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ +#include "config.h" + #include <unistd.h> #include <stdio.h> #include <stdlib.h> -- 1.7.3.3

1 1

[pacman-dev] [PATCH] makepkg: Add check() function for running test suites
by Allan McRae 15 Dec '10

15 Dec '10

A PKGBUILD can have an option check() function for running test suites between the build() and package() stages. This function is run by default but can be disabled globally in with "!check" in BUILDENV in makepkg.conf and on an individual package basis using the --nocheck flag. Addition dependencies needed for running the test suite can be specified in the checkdepends array and are only checked when running the check() function. Original-work-by: Jeff C <jeff(a)kcaccess.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> --- PKGBUILD-split.proto | 6 ++++++ PKGBUILD.proto | 8 ++++++-- doc/PKGBUILD.5.txt | 16 +++++++++++++++- doc/makepkg.8.txt | 3 +++ doc/makepkg.conf.5.txt | 5 +++++ etc/makepkg.conf.in | 5 +++-- scripts/makepkg.sh.in | 27 +++++++++++++++++++++++++-- 7 files changed, 63 insertions(+), 7 deletions(-) diff --git a/PKGBUILD-split.proto b/PKGBUILD-split.proto index f5114ab..52aacc5 100644 --- a/PKGBUILD-split.proto +++ b/PKGBUILD-split.proto @@ -16,6 +16,7 @@ license=('GPL') groups=() depends=() makedepends=() +checkdepends=() provides=() conflicts=() replaces=() @@ -33,6 +34,11 @@ build() { make } +check() { + cd "$srcdir/$pkgname-$pkgver" + make -k check +} + package_pkg1() { # options and directives that can be overridden pkgver= diff --git a/PKGBUILD.proto b/PKGBUILD.proto index 71dbc14..98172d8 100644 --- a/PKGBUILD.proto +++ b/PKGBUILD.proto @@ -15,6 +15,7 @@ license=('GPL') groups=() depends=() makedepends=() +checkdepends=() optdepends=() provides=() conflicts=() @@ -29,14 +30,17 @@ md5sums=() #generate with 'makepkg -g' build() { cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr make } -package() { +check() { cd "$srcdir/$pkgname-$pkgver" + make -k check +} +package() { + cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir/" install } diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt index 3d3909a..2ccf0b2 100644 --- a/doc/PKGBUILD.5.txt +++ b/doc/PKGBUILD.5.txt @@ -156,6 +156,12 @@ name. The syntax is: `source=('filename::url')`. needed at runtime. Packages in this list follow the same format as depends. +*checkdepends (array)*:: + An array of packages that this package depends on to run its test suite, + but are not needed at runtime. Packages in this list follow the same + format as depends. These dependencies are only considered when the + check() function is present and is to be run by makepkg. + *optdepends (array)*:: An array of packages (and accompanying reasons) that are not essential for base functionality, but may be necessary to make full use of the contents @@ -263,10 +269,18 @@ If you create any variables of your own in the build function, it is recommended to use the bash `local` keyword to scope the variable to inside the build function. +check() Function +---------------- +An optional check() function can be specified in which a packages test-suite +may be run. This function is run between the build() and package() functions. +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 `checkdepends`. + package() 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. This function is run after the build() and check() functions. 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 diff --git a/doc/makepkg.8.txt b/doc/makepkg.8.txt index ff0f2b6..0087ddd 100644 --- a/doc/makepkg.8.txt +++ b/doc/makepkg.8.txt @@ -153,6 +153,9 @@ Options Only build listed packages from a split package. The use of quotes is necessary when specifying multiple packages. e.g. `--pkg "pkg1 pkg3"` +*\--nocheck*:: + Do not run the check() function in the PKGBUILD or handle the checkdepends. + *\--noconfirm*:: (Passed to pacman) Prevent pacman from waiting for user input before proceeding with operations. diff --git a/doc/makepkg.conf.5.txt b/doc/makepkg.conf.5.txt index 86ea6a3..2293a8d 100644 --- a/doc/makepkg.conf.5.txt +++ b/doc/makepkg.conf.5.txt @@ -93,6 +93,11 @@ Options be disabled for individual packages by placing `!ccache` in the PKGBUILD options array. + *check*;; + Run the check() function if present in the PKGBUILD. This can be + disabled for individual packages through the use of makepkg's + `--nocheck` option. + **DISTCC_HOSTS=**"host1 ...":: If using DistCC, this is used to specify a space-delimited list of hosts running in the DistCC cluster. In addition, you will want to modify your diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in index c795432..81a11b1 100644 --- a/etc/makepkg.conf.in +++ b/etc/makepkg.conf.in @@ -39,15 +39,16 @@ CXXFLAGS="@CARCHFLAGS@-mtune=generic -O2 -pipe" # BUILD ENVIRONMENT ######################################################################### # -# Defaults: BUILDENV=(fakeroot !distcc color !ccache) +# Defaults: BUILDENV=(fakeroot !distcc color !ccache check) # A negated environment option will do the opposite of the comments below. # #-- fakeroot: Allow building packages as a non-root user #-- distcc: Use the Distributed C/C++/ObjC compiler #-- color: Colorize output messages #-- ccache: Use ccache to cache compilation +#-- check: Run the check() function if present in the PKGBUILD # -BUILDENV=(fakeroot !distcc color !ccache) +BUILDENV=(fakeroot !distcc color !ccache check) # #-- If using DistCC, your MAKEFLAGS will also need modification. In addition, #-- specify a space-delimited list of hosts running in the DistCC cluster. diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index ac10ad3..6707336 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -71,6 +71,7 @@ SOURCEONLY=0 IGNOREARCH=0 HOLDVER=0 BUILDFUNC=0 +CHECKFUNC=0 PKGFUNC=0 SPLITPKG=0 PKGLIST=() @@ -145,6 +146,9 @@ clean_up() { if (( BUILDFUNC )); then rm -f "${pkgbase}-${pkgver}-${pkgrel}-${CARCH}-build.log"* fi + if (( CHECKFUNC )); then + rm -f "${pkgbase}-${pkgver}-${pkgrel}-${CARCH}-check.log"* + fi if (( PKGFUNC )); then rm -f "${pkgbase}-${pkgver}-${pkgrel}-${CARCH}-package.log"* elif (( SPLITPKG )); then @@ -805,6 +809,10 @@ run_build() { run_function "build" } +run_check() { + run_function "check" +} + run_package() { local pkgfunc if [[ -z $1 ]]; then @@ -1547,6 +1555,7 @@ usage() { echo "$(gettext " --asroot Allow makepkg to run as root user")" printf "$(gettext " --config <file> Use an alternate config file (instead of '%s')")\n" "$confdir/makepkg.conf" echo "$(gettext " --holdver Prevent automatic version bumping for development PKGBUILDs")" + echo "$(gettext " --nocheck Do not run the check() function in the '%s'")" "$BUILDSCRIPT" echo "$(gettext " --pkg <list> Only build listed packages from a split package")" echo "$(gettext " --skipinteg Do not fail when integrity checks are missing")" echo "$(gettext " --source Generate a source-only tarball without downloaded sources")" @@ -1584,8 +1593,8 @@ ARGLIST=("$@") OPT_SHORT="AcCdefFghiLmop:rRsV" OPT_LONG="allsource,asroot,ignorearch,clean,cleancache,nodeps" OPT_LONG+=",noextract,force,forcever:,geninteg,help,holdver" -OPT_LONG+=",install,log,nocolor,nobuild,pkg:,rmdeps,repackage,skipinteg" -OPT_LONG+=",source,syncdeps,version,config:" +OPT_LONG+=",install,log,nocolor,nobuild,nocheck,pkg:,rmdeps" +OPT_LONG+=",repackage,skipinteg,source,syncdeps,version,config:" # Pacman Options OPT_LONG+=",noconfirm,noprogressbar" OPT_TEMP="$(parse_options $OPT_SHORT $OPT_LONG "$@" || echo 'PARSE_OPTIONS FAILED')" @@ -1620,6 +1629,7 @@ while true; do -i|--install) INSTALL=1 ;; -L|--log) LOGGING=1 ;; -m|--nocolor) USE_COLOR='n' ;; + --nocheck) RUN_CHECK='n' ;; -o|--nobuild) NOBUILD=1 ;; -p) shift; BUILDFILE=$1 ;; --pkg) shift; PKGLIST=($1) ;; @@ -1835,6 +1845,12 @@ fi if declare -f build >/dev/null; then BUILDFUNC=1 fi +if declare -f check >/dev/null; then + # "Hide" check() function if not going to be run + if [[ ! $(check_buildenv check) = "n" && ! $RUN_CHECK = "n" ]]; then + CHECKFUNC=1 + fi +fi if declare -f package >/dev/null; then PKGFUNC=1 elif [[ $SPLITPKG -eq 0 ]] && declare -f package_${pkgname} >/dev/null; then @@ -1898,6 +1914,7 @@ if (( INFAKEROOT )); then if (( ! REPKG )); then if (( BUILDFUNC )); then run_build + (( CHECKFUNC )) && run_check tidy_install fi else @@ -1948,6 +1965,10 @@ elif type -p "${PACMAN%% *}" >/dev/null; then msg "$(gettext "Checking buildtime dependencies...")" resolve_deps ${makedepends[@]} || deperr=1 + if (( CHECKFUNC )); then + resolve_deps ${checkdepends[@]} || deperr=1 + fi + if (( RMDEPS )); then current_pkglist=($(run_pacman -Qq)) # required by remove_deps fi @@ -2013,6 +2034,7 @@ else if (( ! REPKG )); then devel_update (( BUILDFUNC )) && run_build + (( CHECKFUNC )) && run_check fi if (( ! SPLITPKG )); then if (( PKGFUNC )); then @@ -2034,6 +2056,7 @@ else if (( ! REPKG && ( PKGFUNC || SPLITPKG ) )); then devel_update (( BUILDFUNC )) && run_build + (( CHECKFUNC )) && run_check cd "$startdir" fi -- 1.7.3.3

1 1