- Pacman-dev - lists.archlinux.org

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.3.2-7-gfff6d9d
by dan＠archlinux.org 24 Oct '09

24 Oct '09

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, maint has been updated via fff6d9dc2e6c61f67d6a50e2dde655f388c173a8 (commit) from 21caf8730f9d089e351bf73b8bfd46b316c518a9 (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 fff6d9dc2e6c61f67d6a50e2dde655f388c173a8 Author: Allan McRae <allan(a)archlinux.org> Date: Thu Oct 22 14:25:24 2009 +1000 makepkg: allow passing arguments with spaces Currently makepkg takes the commandline arguments, assigns them to a variable and passes that variable to the next makepkg call (within fakeroot). Use a comination of quotes and arrays in this process to ensure any arguments passed within quotes and containing spaces stay as a single argument during the second makepkg call. Thanks to Dan for figuring out how to get this working. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: scripts/makepkg.sh.in | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH 1/4] Update .gitignore and remove autotools files
by Laszlo Papp 24 Oct '09

24 Oct '09

Too big patch, see the attachment You can see my project after the refactored build system, it's easier, smaller, clear, and git friendlier :) http://git.berlios.de/cgi-bin/gitweb.cgi?p=aurman;a=tree;h=5c71d00964f7a4c7… Best Regards, Laszlo Papp

2 2

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.3.2-6-g21caf87
by dan＠archlinux.org 24 Oct '09

24 Oct '09

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, maint has been updated via 21caf8730f9d089e351bf73b8bfd46b316c518a9 (commit) from 5ffc1ad3cdb1ec252739c62c9d614aba468bb22c (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: scripts/makepkg.sh.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.3.2-85-g7f0f319
by dan＠archlinux.org 24 Oct '09

24 Oct '09

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 7f0f319a3e7c471a41482ba620f74423ef3f9a94 (commit) via 0bc961a8be1adc1dabc4089d7f67a95cb603f450 (commit) via 21caf8730f9d089e351bf73b8bfd46b316c518a9 (commit) via 748bc8ebd41f5553c139c530358a72a83def7126 (commit) via 013fc9a7952bd93f451fecafa937a73c5c492a73 (commit) via 1000c0bd2eb84582e5ef60cde6ea937ab9e4b0e9 (commit) via 6ed7d001f6783907d762514dab0741f98d22d715 (commit) via c6095e103240589895ebdd4b3789c960cb897ed5 (commit) from 3758ccbb524b502cc6162324f1b953215b6b970e (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 7f0f319a3e7c471a41482ba620f74423ef3f9a94 Merge: 0bc961a8be1adc1dabc4089d7f67a95cb603f450 21caf8730f9d089e351bf73b8bfd46b316c518a9 Author: Dan McGee <dan(a)archlinux.org> Date: Sat Oct 24 10:10:15 2009 -0500 Merge branch 'maint' commit 0bc961a8be1adc1dabc4089d7f67a95cb603f450 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Oct 20 23:25:38 2009 -0500 Reduce unnecessary get_name() function calls alpm_pkg_get_name() gives us little benefit in backend code besides a NULL check on the package passed in; we could do that ourself if necessary. By changing to direct references in the cases where we are sure we have a valid package, we save a function call each time we need a package name. This function can't be inlined because it is externally accessible. This cuts the calls to get_name() from 1.3 million times in a pacman -Qu operation to around 2400. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 748bc8ebd41f5553c139c530358a72a83def7126 Author: Cedric Staniewski <cedric(a)gmx.ca> Date: Fri Oct 23 17:11:39 2009 +0200 makepkg: use tput for terminal-safe colored and bold text Suggested-by: Dan McGee <dan(a)archlinux.org> Signed-off-by: Cedric Staniewski <cedric(a)gmx.ca> Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 013fc9a7952bd93f451fecafa937a73c5c492a73 Author: Cedric Staniewski <cedric(a)gmx.ca> Date: Fri Oct 23 17:11:38 2009 +0200 makepkg: define escape sequences globally In doing so, it is possible to get rid of all the tests for colored messages except for one global one. Signed-off-by: Cedric Staniewski <cedric(a)gmx.ca> Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 1000c0bd2eb84582e5ef60cde6ea937ab9e4b0e9 Author: Cedric Staniewski <cedric(a)gmx.ca> Date: Wed Oct 21 16:06:42 2009 +0200 makepkg: check for non-empty pkgbase instead of pkgname pkgbase is used in the following rm calls, and since pkgname can be present when pkgbase is not, it is safer to check for pkgbase. Signed-off-by: Cedric Staniewski <cedric(a)gmx.ca> Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 6ed7d001f6783907d762514dab0741f98d22d715 Author: Heiko Baums <heiko(a)baums-on-web.de> Date: Wed Oct 21 23:46:47 2009 +0200 pacdiff : add diffsearchpath option Xav: added doc Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c6095e103240589895ebdd4b3789c960cb897ed5 Author: Cedric Staniewski <cedric(a)gmx.ca> Date: Wed Oct 21 19:13:36 2009 +0200 makepkg: remove empty .part files after a failed download Signed-off-by: Cedric Staniewski <cedric(a)gmx.ca> Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: contrib/pacdiff | 8 +++++- lib/libalpm/package.c | 6 ++-- scripts/makepkg.sh.in | 53 ++++++++++++++++++++---------------------------- 3 files changed, 31 insertions(+), 36 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH 1/2] makepkg: define escape sequences globally
by Cedric Staniewski 24 Oct '09

24 Oct '09

In doing so, it is possible to get rid of all the tests for colored messages except for one global one. Signed-off-by: Cedric Staniewski <cedric(a)gmx.ca> --- scripts/makepkg.sh.in | 42 +++++++++++++++--------------------------- 1 files changed, 15 insertions(+), 27 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 40367ae..2a3d22d 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -72,7 +72,6 @@ IGNOREARCH=0 HOLDVER=0 PKGFUNC=0 SPLITPKG=0 -COLORMSG=0 # Forces the pkgver of the current PKGBUILD. Used by the fakeroot call # when dealing with svn/cvs/etc PKGBUILDs. @@ -84,47 +83,27 @@ PACMAN_OPTS= plain() { local mesg=$1; shift - if [ $COLORMSG -eq 1 ]; then - printf "\033[1;1m ${mesg}\033[1;0m\n" "$@" >&2 - else - printf " ${mesg}\n" "$@" >&2 - fi + printf "${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2 } msg() { local mesg=$1; shift - if [ $COLORMSG -eq 1 ]; then - printf "\033[1;32m==>\033[1;0m\033[1;1m ${mesg}\033[1;0m\n" "$@" >&2 - else - printf "==> ${mesg}\n" "$@" >&2 - fi + printf "${GREEN}==>${ALL_OFF_BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2 } msg2() { local mesg=$1; shift - if [ $COLORMSG -eq 1 ]; then - printf "\033[1;34m ->\033[1;0m\033[1;1m ${mesg}\033[1;0m\n" "$@" >&2 - else - printf " -> ${mesg}\n" "$@" >&2 - fi + printf "${BLUE} ->${ALL_OFF_BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2 } warning() { local mesg=$1; shift - if [ $COLORMSG -eq 1 ]; then - printf "\033[1;33m==> $(gettext "WARNING:")\033[1;0m\033[1;1m ${mesg}\033[1;0m\n" "$@" >&2 - else - printf "==> $(gettext "WARNING:") ${mesg}\n" "$@" >&2 - fi + printf "${YELLOW}==> $(gettext "WARNING:")${ALL_OFF_BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2 } error() { local mesg=$1; shift - if [ $COLORMSG -eq 1 ]; then - printf "\033[1;31m==> $(gettext "ERROR:")\033[1;0m\033[1;1m ${mesg}\033[1;0m\n" "$@" >&2 - else - printf "==> $(gettext "ERROR:") ${mesg}\n" "$@" >&2 - fi + printf "${RED}==> $(gettext "ERROR:")${ALL_OFF_BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2 } @@ -1576,7 +1555,16 @@ fi # check if messages are to be printed using color if [ -t 2 -a ! "$USE_COLOR" = "n" -a "$(check_buildenv color)" = "y" ]; then - COLORMSG=1 + readonly ALL_OFF="\033[1;0m" \ + BOLD="\033[1;1m" + readonly ALL_OFF_BOLD="${ALL_OFF}${BOLD}" \ + RED="${BOLD}\033[1;31m" \ + BLUE="${BOLD}\033[1;34m" \ + GREEN="${BOLD}\033[1;32m" \ + YELLOW="${BOLD}\033[1;33m" +else + unset ALL_OFF ALL_OFF_BOLD BOLD RED BLUE GREEN YELLOW + readonly ALL_OFF ALL_OFF_BOLD BOLD RED BLUE GREEN YELLOW fi # override settings with an environment variable for batch processing -- 1.6.5.1

2 8

[pacman-dev] [PATCH 4/4] build: split acinclude.m4
by Laszlo Papp 23 Oct '09

23 Oct '09

The automake manual recommends against acinclude.m4: "The first possibility (the historical practice) is to list all your macros in `acinclude.m4'. This file will be included in `aclocal.m4' when you run `aclocal', and its macro(s) will henceforth be visible to `autoconf'. However if it contains numerous macros, it will rapidly become difficult to maintain, and it will be almost impossible to share macros between packages." Signed-off-by: Laszlo Papp <djszapi(a)archlinux.us> --- m4/gcc-inline.m4 | 19 +++++++++++++++++++ m4/gcc-ssp.m4 | 19 +++++++++++++++++++ m4/gcc-ssplib.m4 | 17 +++++++++++++++++ m4/gcc-visibility.m4 | 19 +++++++++++++++++++ 4 files changed, 74 insertions(+), 0 deletions(-) create mode 100644 m4/gcc-inline.m4 create mode 100644 m4/gcc-ssp.m4 create mode 100644 m4/gcc-ssplib.m4 create mode 100644 m4/gcc-visibility.m4 diff --git a/m4/gcc-inline.m4 b/m4/gcc-inline.m4 new file mode 100644 index 0000000..e58a225 --- /dev/null +++ b/m4/gcc-inline.m4 @@ -0,0 +1,19 @@ +dnl GCC_GNU89_INLINE_CC +dnl checks -fgnu89-inline with the C compiler, if it exists then defines +dnl ENABLE_GNU89_INLINE_CC in both configure script and Makefiles +AC_DEFUN([GCC_GNU89_INLINE_CC],[ + AC_LANG_ASSERT(C) + if test "X$CC" != "X"; then + AC_CACHE_CHECK([for -fgnu89-inline], + gnu89_inline_cv_cc, + [ gnu89_inline_old_cflags="$CFLAGS" + CFLAGS="$CFLAGS -fgnu89-inline" + AC_TRY_COMPILE(,, gnu89_inline_cv_cc=yes, gnu89_inline_cv_cc=no) + CFLAGS="$gnu89_inline_old_cflags" + ]) + if test $gnu89_inline_cv_cc = yes; then + AC_DEFINE([ENABLE_GNU89_INLINE_CC], 1, [Define if gnu89 inlining semantics should be used.]) + fi + AM_CONDITIONAL([ENABLE_GNU89_INLINE_CC], test "x$gnu89_inline_cv_cc" = "xyes") + fi +]) diff --git a/m4/gcc-ssp.m4 b/m4/gcc-ssp.m4 new file mode 100644 index 0000000..1924bd1 --- /dev/null +++ b/m4/gcc-ssp.m4 @@ -0,0 +1,19 @@ +dnl GCC_STACK_PROTECT_CC +dnl checks -fstack-protector-all with the C compiler, if it exists then updates +dnl CFLAGS and defines ENABLE_SSP_CC +AC_DEFUN([GCC_STACK_PROTECT_CC],[ + AC_LANG_ASSERT(C) + if test "X$CC" != "X"; then + AC_CACHE_CHECK([whether ${CC} accepts -fstack-protector-all], + ssp_cv_cc, + [ssp_old_cflags="$CFLAGS" + CFLAGS="$CFLAGS -fstack-protector-all" + AC_TRY_COMPILE(,, ssp_cv_cc=yes, ssp_cv_cc=no) + CFLAGS="$ssp_old_cflags" + ]) + if test $ssp_cv_cc = yes; then + CFLAGS="$CFLAGS -fstack-protector-all" + AC_DEFINE([ENABLE_SSP_CC], 1, [Define if SSP C support is enabled.]) + fi + fi +]) diff --git a/m4/gcc-ssplib.m4 b/m4/gcc-ssplib.m4 new file mode 100644 index 0000000..ef51d38 --- /dev/null +++ b/m4/gcc-ssplib.m4 @@ -0,0 +1,17 @@ +dnl GCC_STACK_PROTECT_LIB +dnl adds -lssp to LIBS if it is available +dnl ssp is usually provided as part of libc, but was previously a separate lib +dnl It does not hurt to add -lssp even if libc provides SSP - in that case +dnl libssp will simply be ignored. +AC_DEFUN([GCC_STACK_PROTECT_LIB],[ + AC_CACHE_CHECK([whether libssp exists], ssp_cv_lib, + [ssp_old_libs="$LIBS" + LIBS="$LIBS -lssp" + AC_TRY_LINK(,, ssp_cv_lib=yes, ssp_cv_lib=no) + LIBS="$ssp_old_libs" + ]) + if test $ssp_cv_lib = yes; then + LIBS="$LIBS -lssp" + fi +]) + diff --git a/m4/gcc-visibility.m4 b/m4/gcc-visibility.m4 new file mode 100644 index 0000000..84a5347 --- /dev/null +++ b/m4/gcc-visibility.m4 @@ -0,0 +1,19 @@ +dnl GCC_VISIBILITY_CC +dnl checks -fvisibility=internal with the C compiler, if it exists then +dnl defines ENABLE_VISIBILITY_CC in both configure script and Makefiles +AC_DEFUN([GCC_VISIBILITY_CC],[ + AC_LANG_ASSERT(C) + if test "X$CC" != "X"; then + AC_CACHE_CHECK([whether ${CC} accepts -fvisibility=internal], + visibility_cv_cc, + [visibility_old_cflags="$CFLAGS" + CFLAGS="$CFLAGS -fvisibility=internal" + AC_TRY_COMPILE(,, visibility_cv_cc=yes, visibility_cv_cc=no) + CFLAGS="$visibility_old_cflags" + ]) + if test $visibility_cv_cc = yes; then + AC_DEFINE([ENABLE_VISIBILITY_CC], 1, [Define if symbol visibility C support is enabled.]) + fi + AM_CONDITIONAL([ENABLE_VISIBILITY_CC], test "x$visibility_cv_cc" = "xyes") + fi +]) -- 1.6.5

1 0

[pacman-dev] [PATCH 3/4] build: add missing ACLOCAL_AMFLAGS
by Laszlo Papp 23 Oct '09

23 Oct '09

In configure.ac we have AC_CONFIG_MACRO_DIR([m4]), which ideally also wants ACLOCAL_AMFLAGS in Makefile.am per automake's suggestion. Signed-off-by: Laszlo Papp <djszapi(a)archlinux.us> --- Makefile.am | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/Makefile.am b/Makefile.am index 2f5e7a7..5f5e436 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,3 +1,5 @@ +ACLOCAL_AMFLAGS = -I m4 + SUBDIRS = lib/libalpm src/util src/pacman scripts etc po pactest contrib if WANT_DOC SUBDIRS += doc -- 1.6.5

1 0

[pacman-dev] [PATCH 2/4] Fix some autoreconf warnings
by Laszlo Papp 23 Oct '09

23 Oct '09

Signed-off-by: Laszlo Papp <djszapi(a)archlinux.us> --- autoclean.sh | 36 +----------------------------------- autogen.sh | 6 ++---- configure.ac | 3 ++- 3 files changed, 5 insertions(+), 40 deletions(-) diff --git a/autoclean.sh b/autoclean.sh index 73675f8..0841ef1 100755 --- a/autoclean.sh +++ b/autoclean.sh @@ -1,37 +1,3 @@ #!/bin/sh -xu -[ -f Makefile ] && make distclean -rm -rf autom4te.cache -rm -f {Makefile.in,Makefile} -rm -f {config.h.in,config.h} -rm -f config.status -rm -f configure -rm -f stamp* -rm -f aclocal.m4 -rm -f compile -rm -f libtool - -rm -f lib/libalpm/{Makefile.in,Makefile} -rm -f src/util/{Makefile.in,Makefile} -rm -f src/pacman/{Makefile.in,Makefile} -rm -f scripts/{Makefile.in,Makefile} -rm -f etc/{Makefile.in,Makefile} -rm -f etc/pacman.d/{Makefile.in,Makefile} -rm -f etc/abs/{Makefile.in,Makefile} -rm -f pactest{,/tests}/{Makefile.in,Makefile} -rm -f contrib/{Makefile.in,Makefile} -rm -f doc/{Makefile.in,Makefile} - -rm -f pactest/*.pyc -rm -f doc/html/*.html -rm -f doc/man3/*.3 - -rm -f po/{Makefile.in,Makefile} -rm -f po/POTFILES -rm -f po/stamp-po -rm -f po/*.gmo - -rm -f lib/libalpm/po/{Makefile.in,Makefile} -rm -f lib/libalpm/po/POTFILES -rm -f lib/libalpm/po/stamp-po -rm -f lib/libalpm/po/*.gmo +git clean -x -d -f diff --git a/autogen.sh b/autogen.sh index 964fe5f..d59ea6c 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,6 +1,4 @@ #!/bin/sh -xu -aclocal -autoheader -automake --foreign -autoconf +autoreconf -fi; +rm -Rf autom4te.cache; diff --git a/configure.ac b/configure.ac index dada0dd..959eb7d 100644 --- a/configure.ac +++ b/configure.ac @@ -53,11 +53,12 @@ m4_define([pacman_version], # Autoconf initialization AC_INIT([pacman], [pacman_version], [pacman-dev(a)archlinux.org] +AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_SRCDIR([config.h.in]) AC_CONFIG_HEADERS([config.h]) AC_CANONICAL_HOST -AM_INIT_AUTOMAKE +AM_INIT_AUTOMAKE([foreign]) LIB_VERSION=`expr lib_current - lib_age`.lib_age.lib_revision LIB_VERSION_INFO="lib_current:lib_revision:lib_age" -- 1.6.5

1 0

[pacman-dev] [PATCH] makepkg: use tput for terminal-safe colored and bold text
by Cedric Staniewski 23 Oct '09

23 Oct '09

Suggested-by: Dan McGee <dan(a)archlinux.org> Signed-off-by: Cedric Staniewski <cedric(a)gmx.ca> --- scripts/makepkg.sh.in | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 2a3d22d..f7d1fc8 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -28,7 +28,7 @@ # makepkg uses quite a few external programs during its execution. You # need to have at least the following installed for makepkg to function: # bsdtar (libarchive), bzip2, coreutils, fakeroot, find (findutils), -# getopt (util-linux), gettext, grep, gzip, openssl, sed +# getopt (util-linux), gettext, grep, gzip, openssl, sed, tput (ncurses) # gettext initialization export TEXTDOMAIN='pacman' @@ -1555,13 +1555,13 @@ fi # check if messages are to be printed using color if [ -t 2 -a ! "$USE_COLOR" = "n" -a "$(check_buildenv color)" = "y" ]; then - readonly ALL_OFF="\033[1;0m" \ - BOLD="\033[1;1m" + readonly ALL_OFF="$(tput sgr0)" \ + BOLD="$(tput bold)" readonly ALL_OFF_BOLD="${ALL_OFF}${BOLD}" \ - RED="${BOLD}\033[1;31m" \ - BLUE="${BOLD}\033[1;34m" \ - GREEN="${BOLD}\033[1;32m" \ - YELLOW="${BOLD}\033[1;33m" + RED="${BOLD}$(tput setaf 1)" \ + BLUE="${BOLD}$(tput setaf 4)" \ + GREEN="${BOLD}$(tput setaf 2)" \ + YELLOW="${BOLD}$(tput setaf 3)" else unset ALL_OFF ALL_OFF_BOLD BOLD RED BLUE GREEN YELLOW readonly ALL_OFF ALL_OFF_BOLD BOLD RED BLUE GREEN YELLOW -- 1.6.5.1

1 1

[pacman-dev] [PATCH] makepkg: Add EXTRAVERSION field to package filenames
by Anders Bergh 23 Oct '09

23 Oct '09

>From 92f67cdcff4cbec3c5c9d6b0ca17a6f71fdf87b9 Mon Sep 17 00:00:00 2001 From: Anders Bergh <anders1(a)gmail.com> Date: Fri, 23 Oct 2009 00:11:05 +0200 Subject: [PATCH] makepkg: Add EXTRAVERSION field to package filenames. This is intended for packages compiled to run on another operating system than Linux, such as cygwin or Darwin. It is set using --with-pkg-extra-version. The package filename format is as follows: {name}-{version}-{rel}-{extraversion}{arch}{ext} Signed-off-by: Anders Bergh <anders1(a)gmail.com> --- configure.ac | 6 ++++++ etc/makepkg.conf.in | 1 + scripts/makepkg.sh.in | 24 ++++++++++++------------ 3 files changed, 19 insertions(+), 12 deletions(-) diff --git a/configure.ac b/configure.ac index dada0dd..30c25fb 100644 --- a/configure.ac +++ b/configure.ac @@ -88,6 +88,11 @@ AC_ARG_WITH(db-ext, AS_HELP_STRING([--with-db-ext=ext], [set the file extension used by the database]), [DBEXT=$withval], [DBEXT=.db.tar.gz]) +# Help line for extra version field +AC_ARG_WITH(pkg-extra-version, + AS_HELP_STRING([--with-pkg-extra-version=ver], [add extra version field to package filenames]), + [EXTRAVERSION=$withval], [EXTRAVERSION=]) + # Help line for buildscript filename AC_ARG_WITH(buildscript, AS_HELP_STRING([--with-buildscript=name], [set the build script name used by makepkg]), @@ -378,6 +383,7 @@ ${PACKAGE_NAME}: source pkg extension : ${SRCEXT} database extension : ${DBEXT} build script name : ${BUILDSCRIPT} + extra version : ${EXTRAVERSION} Compilation options: Run make in doc/ dir : ${wantdoc} diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in index 3a3a415..a16f71e 100644 --- a/etc/makepkg.conf.in +++ b/etc/makepkg.conf.in @@ -103,5 +103,6 @@ PURGE_TARGETS=(usr/{,share}/info/dir .packlist *.pod) # PKGEXT='@PKGEXT@' SRCEXT='@SRCEXT@' +EXTRAVERSION='@EXTRAVERSION@' # vim: set ft=sh ts=2 sw=2 et: diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 40367ae..219d59e 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -158,12 +158,12 @@ clean_up() { rm -rf "$pkgdir" "$srcdir" if [ -n "$pkgname" ]; then # Can't do this unless the BUILDSCRIPT has been sourced. - rm -f "${pkgbase}-${pkgver}-${pkgrel}-${CARCH}-build.log"* + rm -f "${pkgbase}-${pkgver}-${pkgrel}-${EXTRAVERSION}${CARCH}-build.log"* if [ "$PKGFUNC" -eq 1 ]; then - rm -f "${pkgbase}-${pkgver}-${pkgrel}-${CARCH}-package.log"* + rm -f "${pkgbase}-${pkgver}-${pkgrel}-${EXTRAVERSION}${CARCH}-package.log"* elif [ "$SPLITPKG" -eq 1 ]; then for pkg in ${pkgname[@]}; do - rm -f "${pkg}-${pkgver}-${pkgrel}-${CARCH}-package.log"* + rm -f "${pkg}-${pkgver}-${pkgrel}-${EXTRAVERSION}${CARCH}-package.log"* done fi fi @@ -730,7 +730,7 @@ run_function() { local ret=0 if [ "$LOGGING" -eq 1 ]; then - BUILDLOG="${startdir}/${pkgname}-${pkgver}-${pkgrel}-${CARCH}-$pkgfunc.log" + BUILDLOG="${startdir}/${pkgname}-${pkgver}-${pkgrel}-${EXTRAVERSION}${CARCH}-$pkgfunc.log" if [ -f "$BUILDLOG" ]; then local i=1 while true; do @@ -1015,7 +1015,7 @@ create_package() { *) warning "$(gettext "'%s' is not a valid archive extension.")" \ "$PKGEXT" ; EXT=$PKGEXT ;; esac - local pkg_file="$PKGDEST/${nameofpkg}-${pkgver}-${pkgrel}-${PKGARCH}${EXT}" + local pkg_file="$PKGDEST/${nameofpkg}-${pkgver}-${pkgrel}-${EXTRAVERSION}${PKGARCH}${EXT}" local ret=0 @@ -1121,10 +1121,10 @@ install_package() { local pkglist for pkg in ${pkgname[@]}; do - if [ -f $PKGDEST/${pkg}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT} ]; then - pkglist="${pkglist} $PKGDEST/${pkg}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT}" + if [ -f $PKGDEST/${pkg}-${pkgver}-${pkgrel}-${EXTRAVERSION}${CARCH}${PKGEXT} ]; then + pkglist="${pkglist} $PKGDEST/${pkg}-${pkgver}-${pkgrel}-${EXTRAVERSION}${CARCH}${PKGEXT}" else - pkglist="${pkglist} $PKGDEST/${pkg}-${pkgver}-${pkgrel}-any${PKGEXT}" + pkglist="${pkglist} $PKGDEST/${pkg}-${pkgver}-${pkgrel}-${EXTRAVERSION}any${PKGEXT}" fi done @@ -1721,8 +1721,8 @@ fi pkgbase=${pkgbase:-${pkgname[0]}} if [ "$SPLITPKG" -eq 0 ]; then - if [ $ -f "$PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT}" \ - -o -f "$PKGDEST/${pkgname}-${pkgver}-${pkgrel}-any${PKGEXT}" $ \ + if [ $ -f "$PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${EXTRAVERSION}${CARCH}${PKGEXT}" \ + -o -f "$PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${EXTRAVERSION}any${PKGEXT}" $ \ -a "$FORCE" -eq 0 -a "$SOURCEONLY" -eq 0 -a "$NOBUILD" -eq 0 ]; then if [ "$INSTALL" -eq 1 ]; then warning "$(gettext "A package has already been built, installing existing package...")" @@ -1737,8 +1737,8 @@ else allpkgbuilt=1 somepkgbuilt=0 for pkg in ${pkgname[@]}; do - if [ $ -f "$PKGDEST/${pkg}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT}" \ - -o -f "$PKGDEST/${pkg}-${pkgver}-${pkgrel}-any${PKGEXT}" $ ]; then + if [ $ -f "$PKGDEST/${pkg}-${pkgver}-${pkgrel}-${EXTRAVERSION}${CARCH}${PKGEXT}" \ + -o -f "$PKGDEST/${pkg}-${pkgver}-${pkgrel}-${EXTRAVERSION}any${PKGEXT}" $ ]; then somepkgbuilt=1 else allpkgbuilt=0 -- 1.6.5.1

2 3