March 2013 - Pacman-dev - lists.archlinux.org

[pacman-dev] Cleaning up pretty printing in pacman.
by Simon Gomizelj 06 Mar '13

06 Mar '13

While diving into pacman's output code to try and add colours I've noticed that pacman's pretty printing code is somewhat awkward. Its very clear its grow organically without ever really being cleaned up. - Translation messages shouldn't have formatting information embedded into them: _("Name"), not _("Name :") _("Version"), not _("Version :") etc - Pacman puts a lot of effort into making some parts of its output is nicely aligned, while other parts don't and expects padding to be hardcoded. Pacman should do _all_ the aligning. An example of where pacman's pretty printing code is specifically inefficient... dump_pkg_full: cols = getcols(fileno(stdout)); string_display(_("Name :"), alpm_pkg_get_name(pkg), cols); string_display(_("Version :"), alpm_pkg_get_version(pkg), cols); string_display(_("Description :"), alpm_pkg_get_desc(pkg), cols); string_display(_("Architecture :"), alpm_pkg_get_arch(pkg), cols); string_display(_("URL :"), alpm_pkg_get_url(pkg), cols); list_display(_("Licenses :"), alpm_pkg_get_licenses(pkg), cols); list_display(_("Groups :"), alpm_pkg_get_groups(pkg), cols); deplist_display(_("Provides :"), alpm_pkg_get_provides(pkg), cols); deplist_display(_("Depends On :"), alpm_pkg_get_depends(pkg), cols); - cols is recalculated for each package. - string_display,list_display,etc call string_length on $1 each time. These two numbers could basically be considered constants though through the outputting. So this means when I do `pacman -Si` (output for ~6080 packages here): - cols is recalculated ~6080 times too much. - string_display about (6080 * 20) or 121600 times. dump_pkg_full is basically outputting a table. There is no reason pacman couldn't pre-calculate the dimensions of the table to significantly reduce the amount of work it does when printing each row. Furthermore, there seems to be, with my colour patches, two more independent table implementations: table_display and add_table_row/display_transaction_sizes. They all build the same kind of table and format them in similar ways. I think the right way forward is to add a nice table formatter library to pacman that can be reused for everything. I whipped up a very quick prototype as a proof of concept: http://ix.io/4CP/ I wanted to bring this up so that a) its on the record and b) we can start talking about if/how to implement this. I'm willing to put in the effort to get this through.

2 1

[pacman-dev] Colour support in pacman!
by Simon Gomizelj 06 Mar '13

06 Mar '13

Colourize pacman output! This patchset duplicates about 95% of the colour support pacman-color provides. I don't duplicate everything and I vary slightly in how I colour certain messages to avoid massively restructuring pacman. Its a good starting point which can be improved on. Work on improving this means improving a lot of pacman's pretty printing code. Anyhow... Colours can be enabled in two ways: - Add 'Color' to pacman.conf. This enables automatic colouring. - Use --color=WHEN where WHEN is none/auto/always. WHEN as 'never' disables colours (overrides config file), as 'auto' enables colours when stdout is a tty, and 'always' enables colours no matter what. None disables colours (overrides config file), auto enables colours when stdout is a tty, and always enables colours no matter what. I do not read pacman-color's color.conf. Probably never will. - We can't configure makepkg's colours - The config file has _very_ strange semantics (eg Red = intensive red) doc/pacman.8.txt | 3 ++ doc/pacman.conf.5.txt | 3 ++ etc/pacman.conf.in | 1 + src/pacman/callback.c | 26 +++++++------- src/pacman/conf.c | 52 +++++++++++++++++++++++++++ src/pacman/conf.h | 22 +++++++++++- src/pacman/package.c | 91 ++++++++++++++++++++++++++++++++++++++++++----- src/pacman/package.h | 3 ++ src/pacman/pacman.c | 15 ++++++++ src/pacman/query.c | 59 ++----------------------------- src/pacman/remove.c | 2 +- src/pacman/sync.c | 95 ++++++++----------------------------------------- src/pacman/util.c | 98 ++++++++++++++++++++++++++++++++++++++------------- src/pacman/util.h | 5 +-- 14 files changed, 289 insertions(+), 186 deletions(-)

5 38

[pacman-dev] [PATCH 11/14] colorize the output if -Qi/Si
by Allan McRae 06 Mar '13

06 Mar '13

From: Simon Gomizelj <simongmzlj(a)gmail.com> Signed-off-by: Simon Gomizelj <simongmzlj(a)gmail.com> --- For review... src/pacman/conf.c | 28 ++++++++++++++++++---------- src/pacman/conf.h | 4 ++++ src/pacman/package.c | 27 +++++++++++++++++---------- src/pacman/util.c | 8 ++++---- 4 files changed, 43 insertions(+), 24 deletions(-) diff --git a/src/pacman/conf.c b/src/pacman/conf.c index f488234..7ab8ec6 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -62,11 +62,15 @@ config_t *config = NULL; void enable_colors(int colors) { if(colors == PM_COLOR_ON) { - config->colstr.colon = BOLDBLUE "::" BOLDWHITE " "; - config->colstr.title = BOLDWHITE; - config->colstr.warn = BOLDYELLOW; - config->colstr.err = BOLDRED; - config->colstr.nc = NC; + config->colstr.colon = BOLDBLUE "::" BOLDWHITE " "; + config->colstr.title = BOLDWHITE; + config->colstr.repo = BOLDMAGENTA; + config->colstr.version = BOLDGREEN; + config->colstr.groups = BOLDBLUE; + config->colstr.meta = BOLDCYAN; + config->colstr.warn = BOLDYELLOW; + config->colstr.err = BOLDRED; + config->colstr.nc = NC; } } @@ -91,11 +95,15 @@ config_t *config_new(void) newconfig->remotefilesiglevel = ALPM_SIG_USE_DEFAULT; } - newconfig->colstr.colon = ":: "; - newconfig->colstr.title = ""; - newconfig->colstr.warn = "", - newconfig->colstr.err = "", - newconfig->colstr.nc = ""; + newconfig->colstr.colon = ":: "; + newconfig->colstr.title = ""; + newconfig->colstr.repo = ""; + newconfig->colstr.version = ""; + newconfig->colstr.groups = ""; + newconfig->colstr.meta = ""; + newconfig->colstr.warn = ""; + newconfig->colstr.err = ""; + newconfig->colstr.nc = ""; return newconfig; } diff --git a/src/pacman/conf.h b/src/pacman/conf.h index 18bfb02..d2702ed 100644 --- a/src/pacman/conf.h +++ b/src/pacman/conf.h @@ -25,6 +25,10 @@ typedef struct __colstr_t { const char *colon; const char *title; + const char *repo; + const char *version; + const char *groups; + const char *meta; const char *warn; const char *err; const char *nc; diff --git a/src/pacman/package.c b/src/pacman/package.c index 7deb3db..2abf39e 100644 --- a/src/pacman/package.c +++ b/src/pacman/package.c @@ -167,13 +167,16 @@ void dump_pkg_full(alpm_pkg_t *pkg, int extra) size = humanize_size(alpm_pkg_get_size(pkg), 'K', 2, &label); if(from == ALPM_PKG_FROM_SYNCDB) { - printf(_("Download Size : %6.2f %s\n"), size, label); + printf("%s%s%s %6.2f %s\n", config->colstr.title, _("Download Size :"), + config->colstr.nc, size, label); } else if(from == ALPM_PKG_FROM_FILE) { - printf(_("Compressed Size: %6.2f %s\n"), size, label); + printf("%s%s%s %6.2f %s\n", config->colstr.title, _("Compressed Size:"), + config->colstr.nc, size, label); } size = humanize_size(alpm_pkg_get_isize(pkg), 'K', 2, &label); - printf(_("Installed Size : %6.2f %s\n"), size, label); + printf("%s%s%s %6.2f %s\n", config->colstr.title, _("Installed Size :"), + config->colstr.nc, size, label); string_display(_("Packager :"), alpm_pkg_get_packager(pkg), cols); string_display(_("Build Date :"), bdatestr, cols); @@ -267,7 +270,8 @@ void dump_pkg_backups(alpm_pkg_t *pkg) { alpm_list_t *i; const char *root = alpm_option_get_root(config->handle); - printf(_("Backup Files:\n")); + printf("%s%s%s", config->colstr.title, _("Backup Files:\n"), + config->colstr.nc); if(alpm_pkg_get_backup(pkg)) { /* package has backup files, so print them */ for(i = alpm_pkg_get_backup(pkg); i; i = alpm_list_next(i)) { @@ -348,10 +352,11 @@ void print_installed(alpm_db_t *db_local, alpm_pkg_t *pkg) alpm_pkg_t *lpkg = alpm_db_get_pkg(db_local, pkgname); if(lpkg) { const char *lpkgver = alpm_pkg_get_version(lpkg); + const colstr_t *colstr = &config->colstr; if(strcmp(lpkgver, pkgver) == 0) { - printf(" [%s]", _("installed")); + printf(" %s[%s]%s", colstr->meta, _("installed"), colstr->nc); } else { - printf(" [%s: %s]", _("installed"), lpkgver); + printf(" %s[%s: %s]%s", colstr->meta, _("installed"), lpkgver, colstr->nc); } } } @@ -362,6 +367,7 @@ int dump_pkg_search(alpm_db_t *db, alpm_list_t *targets, alpm_db_t *installed_in int freelist = 0; alpm_list_t *i, *searchlist; unsigned short cols; + const colstr_t *colstr = &config->colstr; /* if we have a targets list, search for packages matching it */ if(targets) { @@ -383,12 +389,13 @@ int dump_pkg_search(alpm_db_t *db, alpm_list_t *targets, alpm_db_t *installed_in if(config->quiet) { fputs(alpm_pkg_get_name(pkg), stdout); } else { - printf("%s/%s %s", alpm_db_get_name(db), - alpm_pkg_get_name(pkg), alpm_pkg_get_version(pkg)); + printf("%s%s/%s%s %s%s%s", colstr->repo, alpm_db_get_name(db), + colstr->title, alpm_pkg_get_name(pkg), + colstr->version, alpm_pkg_get_version(pkg), colstr->nc); if((grp = alpm_pkg_get_groups(pkg)) != NULL) { alpm_list_t *k; - fputs(" (", stdout); + printf(" %s(", colstr->groups); for(k = grp; k; k = alpm_list_next(k)) { const char *group = k->data; fputs(group, stdout); @@ -397,7 +404,7 @@ int dump_pkg_search(alpm_db_t *db, alpm_list_t *targets, alpm_db_t *installed_in putchar(' '); } } - putchar(')'); + printf(")%s", colstr->nc); } if(installed_in) { diff --git a/src/pacman/util.c b/src/pacman/util.c index 0b1b7b7..b0f4918 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -427,7 +427,7 @@ static size_t string_length(const char *s) void string_display(const char *title, const char *string, unsigned short cols) { if(title) { - printf("%s ", title); + printf("%s%s%s ", config->colstr.title, title, config->colstr.nc); } if(string == NULL || string[0] == '\0') { printf(_("None")); @@ -620,7 +620,7 @@ void list_display(const char *title, const alpm_list_t *list, if(title) { len = string_length(title) + 1; - printf("%s ", title); + printf("%s%s%s ", config->colstr.title, title, config->colstr.nc); } if(!list) { @@ -660,7 +660,7 @@ void list_display_linebreak(const char *title, const alpm_list_t *list, if(title) { len = (unsigned short)string_length(title) + 1; - printf("%s ", title); + printf("%s%s%s ", config->colstr.title, title, config->colstr.nc); } if(!list) { @@ -1502,7 +1502,7 @@ static int question(short preset, const char *format, va_list args) fprintf(stream, " %s ", _("[y/N]")); } - fputs(colstr.nc, stream); + fputs(config->colstr.nc, stream); fflush(stream); if(config->noconfirm) { -- 1.8.1.5

1 1

[pacman-dev] [PATCH 08/14] colourize warnings and errors
by Allan McRae 06 Mar '13

06 Mar '13

From: Simon Gomizelj <simongmzlj(a)gmail.com> Signed-off-by: Simon Gomizelj <simongmzlj(a)gmail.com> --- Resending for review... src/pacman/conf.c | 12 +++++++----- src/pacman/conf.h | 2 ++ src/pacman/util.c | 6 ++++-- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/src/pacman/conf.c b/src/pacman/conf.c index baaf6a1..f488234 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -61,12 +61,12 @@ config_t *config = NULL; void enable_colors(int colors) { - colstr_t *colstr = &config->colstr; - if(colors == PM_COLOR_ON) { - colstr->colon = BOLDBLUE "::" BOLDWHITE " "; - colstr->title = BOLDWHITE; - colstr->nc = NC; + config->colstr.colon = BOLDBLUE "::" BOLDWHITE " "; + config->colstr.title = BOLDWHITE; + config->colstr.warn = BOLDYELLOW; + config->colstr.err = BOLDRED; + config->colstr.nc = NC; } } @@ -93,6 +93,8 @@ config_t *config_new(void) newconfig->colstr.colon = ":: "; newconfig->colstr.title = ""; + newconfig->colstr.warn = "", + newconfig->colstr.err = "", newconfig->colstr.nc = ""; return newconfig; diff --git a/src/pacman/conf.h b/src/pacman/conf.h index aab1832..18bfb02 100644 --- a/src/pacman/conf.h +++ b/src/pacman/conf.h @@ -25,6 +25,8 @@ typedef struct __colstr_t { const char *colon; const char *title; + const char *warn; + const char *err; const char *nc; } colstr_t; diff --git a/src/pacman/util.c b/src/pacman/util.c index d0e70ea..dcb0406 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -1661,10 +1661,12 @@ int pm_vfprintf(FILE *stream, alpm_loglevel_t level, const char *format, va_list /* print a prefix to the message */ switch(level) { case ALPM_LOG_ERROR: - fprintf(stream, _("error: ")); + fprintf(stream, "%s%s%s", config->colstr.err, _("error: "), + config->colstr.nc); break; case ALPM_LOG_WARNING: - fprintf(stream, _("warning: ")); + fprintf(stream, "%s%s%s", config->colstr.warn, _("warning: "), + config->colstr.nc); break; case ALPM_LOG_DEBUG: fprintf(stream, "debug: "); -- 1.8.1.5

1 1

[pacman-dev] [PATCH 07/14] introduce colstr for colourizing
by Allan McRae 06 Mar '13

06 Mar '13

From: Simon Gomizelj <simongmzlj(a)gmail.com> colstr_t colstr will hold the colourizing agents. Signed-off-by: Simon Gomizelj <simongmzlj(a)gmail.com> --- Sending for easy review... src/pacman/conf.c | 36 ++++++++++++++++++++++++++++++++++++ src/pacman/conf.h | 10 ++++++++++ src/pacman/pacman.c | 1 + src/pacman/util.c | 6 ++++-- 4 files changed, 51 insertions(+), 2 deletions(-) diff --git a/src/pacman/conf.c b/src/pacman/conf.c index dca6e3e..baaf6a1 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -39,6 +39,37 @@ /* global config variable */ config_t *config = NULL; +#define NC "\033[0m" + +#define BLACK "\033[0;30m" +#define RED "\033[0;31m" +#define GREEN "\033[0;32m" +#define YELLOW "\033[0;33m" +#define BLUE "\033[0;34m" +#define MAGENTA "\033[0;35m" +#define CYAN "\033[0;36m" +#define WHITE "\033[0;37m" + +#define BOLDBLACK "\033[1;30m" +#define BOLDRED "\033[1;31m" +#define BOLDGREEN "\033[1;32m" +#define BOLDYELLOW "\033[1;33m" +#define BOLDBLUE "\033[1;34m" +#define BOLDMAGENTA "\033[1;35m" +#define BOLDCYAN "\033[1;36m" +#define BOLDWHITE "\033[1;37m" + +void enable_colors(int colors) +{ + colstr_t *colstr = &config->colstr; + + if(colors == PM_COLOR_ON) { + colstr->colon = BOLDBLUE "::" BOLDWHITE " "; + colstr->title = BOLDWHITE; + colstr->nc = NC; + } +} + config_t *config_new(void) { config_t *newconfig = calloc(1, sizeof(config_t)); @@ -60,6 +91,10 @@ config_t *config_new(void) newconfig->remotefilesiglevel = ALPM_SIG_USE_DEFAULT; } + newconfig->colstr.colon = ":: "; + newconfig->colstr.title = ""; + newconfig->colstr.nc = ""; + return newconfig; } @@ -439,6 +474,7 @@ static int _parse_options(const char *key, char *value, } else if(strcmp(key, "Color") == 0) { if(config->color == PM_COLOR_UNSET) { config->color = isatty(fileno(stdout)) ? PM_COLOR_ON : PM_COLOR_OFF; + enable_colors(config->color); } } else { pm_printf(ALPM_LOG_WARNING, diff --git a/src/pacman/conf.h b/src/pacman/conf.h index 6cabd33..aab1832 100644 --- a/src/pacman/conf.h +++ b/src/pacman/conf.h @@ -22,6 +22,12 @@ #include <alpm.h> +typedef struct __colstr_t { + const char *colon; + const char *title; + const char *nc; +} colstr_t; + typedef struct __config_t { unsigned short op; unsigned short quiet; @@ -98,6 +104,9 @@ typedef struct __config_t { alpm_list_t *explicit_adds; alpm_list_t *explicit_removes; + + /* Color strings for output */ + colstr_t colstr; } config_t; /* Operations */ @@ -156,6 +165,7 @@ enum { /* global config variable */ extern config_t *config; +void enable_colors(int colors); config_t *config_new(void); int config_free(config_t *oldconfig); diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index aabdba0..6d624d2 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -407,6 +407,7 @@ static int parsearg_global(int opt) optarg); return 1; } + enable_colors(config->color); break; case OP_CONFIG: check_optarg(); diff --git a/src/pacman/util.c b/src/pacman/util.c index 3027789..d0e70ea 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -1491,7 +1491,7 @@ static int question(short preset, const char *format, va_list args) fflush(stdout); fflush(stderr); - fprintf(stream, ":: "); + fputs(config->colstr.colon, stream); vfprintf(stream, format, args); if(preset) { @@ -1558,11 +1558,13 @@ int colon_printf(const char *fmt, ...) int ret; va_list args; - fputs(":: ", stdout); va_start(args, fmt); + fputs(config->colstr.colon, stdout); ret = vprintf(fmt, args); + fputs(config->colstr.nc, stdout); va_end(args); + fflush(stdout); return ret; } -- 1.8.1.5

1 1

[pacman-dev] pacman transactions
by Renan Biegelmeyer 06 Mar '13

06 Mar '13

Hello, I'm trying to understand, in pacman/libalpm code how the transactions work. Are they atomic? If so, the transactions are only atomic for the local database or they are also atomic for the instalation/upgrade/removal of the packages in the system? Thanks, Renan

3 2

[pacman-dev] [PATCHv2 00/10] Add color to script output
by William Giokas 06 Mar '13

06 Mar '13

This is a version two of the original pacman script color patches that I sent in. This includes three new patches, and a fix to the first patch so that I don't break `pkgver()` functions in makepkg. --- Originally, output_format.sh sent some messages to sdtout and some to stderr, but this patch set sends all messages formatted by output_format to stderr making separation of script output and child processes easy to separate. The QUIET variable can be used to get the equivalent of only printing stderr. I'm going to start working on using a flag to determine where the messages from output_format go, as per Dave's suggestion. The script patches try to implement the same color styles as makepkg, mostly by consolidating the message formats into a single library file and including that in all of the files that require it. In the pacdiff patch, I simply changed the colors, making it use a similar format as the other files. output_format also got a new function, `ask`, that looks similar to `msg2` but without a new line at the end for use with `read`. I don't know if the look is okay, I was thinking about making it look like pacman's questions, with a pair of blue colons instead of an arrow. If anyone has input on this, please speak up. The rest of the patches just implement a similar look as makepkg, using `==>` and `->` to precede messages, and colored errors and warnings. The use of a unified output_format file also affords makepkg the --quiet option, setting the `QUIET` variable to suppress messages that are not warnings, errors or output from a command in a PKGBUILD. --- William Giokas (10): script: Add color to library/output_format.sh makepkg: use output_format, add --quiet option script: add color to pacman-db-upgrade scripts: add color to pacman-key scripts: add color to pacman-optimize scripts: add color to pkgdelta scripts: add color to repo-add contrib: add colored output to bacman contrib: add color to paccache contrib: make pacdiff colors same as scripts contrib/bacman.sh.in | 62 ++++++++++++++++++++++------------------ contrib/paccache.sh.in | 19 ++++++------ contrib/pacdiff.sh.in | 35 ++++++----------------- doc/makepkg.8.txt | 4 +++ doc/pacman-key.8.txt | 3 ++ doc/repo-add.8.txt | 3 ++ scripts/library/README | 6 +++- scripts/library/output_format.sh | 23 +++++++++++---- scripts/library/term_colors.sh | 21 ++++++++++++++ scripts/makepkg.sh.in | 35 +++++------------------ scripts/pacman-db-upgrade.sh.in | 11 ++++++- scripts/pacman-key.sh.in | 8 ++++-- scripts/pacman-optimize.sh.in | 11 ++++++- scripts/pkgdelta.sh.in | 6 ++++ scripts/repo-add.sh.in | 5 ++++ 15 files changed, 149 insertions(+), 103 deletions(-) create mode 100644 scripts/library/term_colors.sh Thank you, -- William Giokas 1.8.2.rc1.24.g06d67b8

2 15

[pacman-dev] [PATCH 1/2] Add staticlibs option in PKGBUILD
by Sébastien Luttringer 05 Mar '13

05 Mar '13

This option helps to removes static library files in packages. Related to the thread: https://mailman.archlinux.org/pipermail/arch-dev-public/2013-March/024552.h… Signed-off-by: Sébastien Luttringer <seblu(a)seblu.net> --- doc/PKGBUILD.5.txt | 4 ++++ doc/makepkg.conf.5.txt | 6 +++++- etc/makepkg.conf.in | 21 +++++++++++---------- scripts/makepkg.sh.in | 9 +++++++-- 4 files changed, 27 insertions(+), 13 deletions(-) diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt index c37477a..ea280a0 100644 --- a/doc/PKGBUILD.5.txt +++ b/doc/PKGBUILD.5.txt @@ -243,6 +243,10 @@ A normal sync or upgrade will not use its value. Leave libtool (.la) files in packages. Specify `!libtool` to remove them. + *staticlibs*;; + Leave static library (.a) files in packages. Specify `!staticlibs` to + remove them. + *emptydirs*;; Leave empty directories in packages. diff --git a/doc/makepkg.conf.5.txt b/doc/makepkg.conf.5.txt index 71cfc5d..0d1cf00 100644 --- a/doc/makepkg.conf.5.txt +++ b/doc/makepkg.conf.5.txt @@ -138,7 +138,7 @@ Options Specify a key to use for gpg signing instead of the default key in the keyring. Can be overridden with makepkg's '\--key' option. -**OPTIONS=(**strip docs libtool emptydirs zipman purge !upx**)**:: +**OPTIONS=(**strip docs libtool staticlibs emptydirs zipman purge !upx**)**:: This array contains options that affect the default packaging. They are equivalent to options that can be placed in the PKGBUILD; the defaults are shown here. All options should always be left in the array; to enable or @@ -160,6 +160,10 @@ Options Leave libtool (.la) files in packages. Specify `!libtool` to remove them. + *staticlibs*;; + Leave static library (.a) files in packages. Specify `!staticlibs` to + remove them. + *emptydirs*;; Leave empty directories in packages. diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in index 1436042..b2bf811 100644 --- a/etc/makepkg.conf.in +++ b/etc/makepkg.conf.in @@ -68,16 +68,17 @@ BUILDENV=(fakeroot !distcc color !ccache check !sign) # Default: OPTIONS=(strip docs libtool emptydirs zipman purge !upx !debug) # A negated option will do the opposite of the comments below. # -#-- strip: Strip symbols from binaries/libraries -#-- docs: Save doc directories specified by DOC_DIRS -#-- libtool: Leave libtool (.la) files in packages -#-- emptydirs: Leave empty directories in packages -#-- zipman: Compress manual (man and info) pages in MAN_DIRS with gzip -#-- purge: Remove files specified by PURGE_TARGETS -#-- upx: Compress binary executable files using UPX -#-- debug: Add debugging flags as specified in DEBUG_* variables -# -OPTIONS=(strip docs libtool emptydirs zipman purge !upx !debug) +#-- strip: Strip symbols from binaries/libraries +#-- docs: Save doc directories specified by DOC_DIRS +#-- libtool: Leave libtool (.la) files in packages +#-- staticlibs: Leave static library (.a) files in packages +#-- emptydirs: Leave empty directories in packages +#-- zipman: Compress manual (man and info) pages in MAN_DIRS with gzip +#-- purge: Remove files specified by PURGE_TARGETS +#-- upx: Compress binary executable files using UPX +#-- debug: Add debugging flags as specified in DEBUG_* variables +# +OPTIONS=(strip docs libtool staticlibs emptydirs zipman purge !upx !debug) #-- File integrity checks to use. Valid: md5, sha1, sha256, sha384, sha512 INTEGRITY_CHECK=(md5) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index bd29d73..9b89c63 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -44,8 +44,8 @@ declare -r confdir='@sysconfdir@' declare -r BUILDSCRIPT='@BUILDSCRIPT@' declare -r startdir="$PWD" -packaging_options=('strip' 'docs' 'libtool' 'emptydirs' 'zipman' 'purge' 'upx' \ - 'debug') +packaging_options=('strip' 'docs' 'libtool' 'staticlibs' 'emptydirs' 'zipman' \ + 'purge' 'upx' 'debug') other_options=('ccache' 'distcc' 'buildflags' 'makeflags') splitpkg_overrides=('pkgver' 'pkgrel' 'epoch' 'pkgdesc' 'arch' 'url' 'license' \ 'groups' 'depends' 'optdepends' 'provides' 'conflicts' \ @@ -1503,6 +1503,11 @@ tidy_install() { find . ! -type d -name "*.la" -exec rm -f -- '{}' \; fi + if check_option "staticlibs" "n"; then + msg2 "$(gettext "Removing "%s" files...")" "static library" + find . ! -type d -name "*.a" -exec rm -f -- '{}' + + fi + if check_option "emptydirs" "n"; then msg2 "$(gettext "Removing empty directories...")" find . -depth -type d -exec rmdir '{}' + 2>/dev/null -- 1.8.1.5

2 2

[pacman-dev] [PATCH 1/2] Add staticlibs option in PKGBUILD
by Sébastien Luttringer 05 Mar '13

05 Mar '13

This option helps to removes static library files in packages. Related to the thread: https://mailman.archlinux.org/pipermail/arch-dev-public/2013-March/024552.h… Signed-off-by: Sébastien Luttringer <seblu(a)seblu.net> --- doc/PKGBUILD.5.txt | 4 ++++ doc/makepkg.conf.5.txt | 6 +++++- etc/makepkg.conf.in | 21 +++++++++++---------- scripts/makepkg.sh.in | 9 +++++++-- 4 files changed, 27 insertions(+), 13 deletions(-) diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt index c37477a..ea280a0 100644 --- a/doc/PKGBUILD.5.txt +++ b/doc/PKGBUILD.5.txt @@ -243,6 +243,10 @@ A normal sync or upgrade will not use its value. Leave libtool (.la) files in packages. Specify `!libtool` to remove them. + *staticlibs*;; + Leave static library (.a) files in packages. Specify `!staticlibs` to + remove them. + *emptydirs*;; Leave empty directories in packages. diff --git a/doc/makepkg.conf.5.txt b/doc/makepkg.conf.5.txt index 71cfc5d..0d1cf00 100644 --- a/doc/makepkg.conf.5.txt +++ b/doc/makepkg.conf.5.txt @@ -138,7 +138,7 @@ Options Specify a key to use for gpg signing instead of the default key in the keyring. Can be overridden with makepkg's '\--key' option. -**OPTIONS=(**strip docs libtool emptydirs zipman purge !upx**)**:: +**OPTIONS=(**strip docs libtool staticlibs emptydirs zipman purge !upx**)**:: This array contains options that affect the default packaging. They are equivalent to options that can be placed in the PKGBUILD; the defaults are shown here. All options should always be left in the array; to enable or @@ -160,6 +160,10 @@ Options Leave libtool (.la) files in packages. Specify `!libtool` to remove them. + *staticlibs*;; + Leave static library (.a) files in packages. Specify `!staticlibs` to + remove them. + *emptydirs*;; Leave empty directories in packages. diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in index 1436042..b2bf811 100644 --- a/etc/makepkg.conf.in +++ b/etc/makepkg.conf.in @@ -68,16 +68,17 @@ BUILDENV=(fakeroot !distcc color !ccache check !sign) # Default: OPTIONS=(strip docs libtool emptydirs zipman purge !upx !debug) # A negated option will do the opposite of the comments below. # -#-- strip: Strip symbols from binaries/libraries -#-- docs: Save doc directories specified by DOC_DIRS -#-- libtool: Leave libtool (.la) files in packages -#-- emptydirs: Leave empty directories in packages -#-- zipman: Compress manual (man and info) pages in MAN_DIRS with gzip -#-- purge: Remove files specified by PURGE_TARGETS -#-- upx: Compress binary executable files using UPX -#-- debug: Add debugging flags as specified in DEBUG_* variables -# -OPTIONS=(strip docs libtool emptydirs zipman purge !upx !debug) +#-- strip: Strip symbols from binaries/libraries +#-- docs: Save doc directories specified by DOC_DIRS +#-- libtool: Leave libtool (.la) files in packages +#-- staticlibs: Leave static library (.a) files in packages +#-- emptydirs: Leave empty directories in packages +#-- zipman: Compress manual (man and info) pages in MAN_DIRS with gzip +#-- purge: Remove files specified by PURGE_TARGETS +#-- upx: Compress binary executable files using UPX +#-- debug: Add debugging flags as specified in DEBUG_* variables +# +OPTIONS=(strip docs libtool staticlibs emptydirs zipman purge !upx !debug) #-- File integrity checks to use. Valid: md5, sha1, sha256, sha384, sha512 INTEGRITY_CHECK=(md5) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index bd29d73..a48512e 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -44,8 +44,8 @@ declare -r confdir='@sysconfdir@' declare -r BUILDSCRIPT='@BUILDSCRIPT@' declare -r startdir="$PWD" -packaging_options=('strip' 'docs' 'libtool' 'emptydirs' 'zipman' 'purge' 'upx' \ - 'debug') +packaging_options=('strip' 'docs' 'libtool' 'staticlibs' 'emptydirs' 'zipman' \ + 'purge' 'upx' 'debug') other_options=('ccache' 'distcc' 'buildflags' 'makeflags') splitpkg_overrides=('pkgver' 'pkgrel' 'epoch' 'pkgdesc' 'arch' 'url' 'license' \ 'groups' 'depends' 'optdepends' 'provides' 'conflicts' \ @@ -1503,6 +1503,11 @@ tidy_install() { find . ! -type d -name "*.la" -exec rm -f -- '{}' \; fi + if check_option "staticlibs" "n"; then + msg2 "$(gettext "Removing "%s" files...")" "static library" + find . ! -type d -name "*.a" -delete + fi + if check_option "emptydirs" "n"; then msg2 "$(gettext "Removing empty directories...")" find . -depth -type d -exec rmdir '{}' + 2>/dev/null -- 1.8.1.5

2 2

[pacman-dev] [PATCH] Add liba option in PKGBUILD
by Sébastien Luttringer 04 Mar '13

04 Mar '13

This option (enabled by default) removes static library files in packages. Related to the thread: https://mailman.archlinux.org/pipermail/arch-dev-public/2013-March/024552.h… Signed-off-by: Sébastien Luttringer <seblu(a)seblu.net> --- doc/PKGBUILD.5.txt | 4 ++++ doc/makepkg.conf.5.txt | 6 +++++- etc/makepkg.conf.in | 3 ++- scripts/makepkg.sh.in | 9 +++++++-- 4 files changed, 18 insertions(+), 4 deletions(-) diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt index c37477a..1e64b8f 100644 --- a/doc/PKGBUILD.5.txt +++ b/doc/PKGBUILD.5.txt @@ -243,6 +243,10 @@ A normal sync or upgrade will not use its value. Leave libtool (.la) files in packages. Specify `!libtool` to remove them. + *liba*;; + Leave static library (.a) files in packages. Specify `!liba` to + remove them. + *emptydirs*;; Leave empty directories in packages. diff --git a/doc/makepkg.conf.5.txt b/doc/makepkg.conf.5.txt index 71cfc5d..94f2a0c 100644 --- a/doc/makepkg.conf.5.txt +++ b/doc/makepkg.conf.5.txt @@ -138,7 +138,7 @@ Options Specify a key to use for gpg signing instead of the default key in the keyring. Can be overridden with makepkg's '\--key' option. -**OPTIONS=(**strip docs libtool emptydirs zipman purge !upx**)**:: +**OPTIONS=(**strip docs libtool !liba emptydirs zipman purge !upx**)**:: This array contains options that affect the default packaging. They are equivalent to options that can be placed in the PKGBUILD; the defaults are shown here. All options should always be left in the array; to enable or @@ -160,6 +160,10 @@ Options Leave libtool (.la) files in packages. Specify `!libtool` to remove them. + *liba*;; + Leave static library (.a) files in packages. Specify `!liba` to remove + them. + *emptydirs*;; Leave empty directories in packages. diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in index 1436042..8af8e3f 100644 --- a/etc/makepkg.conf.in +++ b/etc/makepkg.conf.in @@ -71,13 +71,14 @@ BUILDENV=(fakeroot !distcc color !ccache check !sign) #-- strip: Strip symbols from binaries/libraries #-- docs: Save doc directories specified by DOC_DIRS #-- libtool: Leave libtool (.la) files in packages +#-- liba: Leave static library (.a) files in packages #-- emptydirs: Leave empty directories in packages #-- zipman: Compress manual (man and info) pages in MAN_DIRS with gzip #-- purge: Remove files specified by PURGE_TARGETS #-- upx: Compress binary executable files using UPX #-- debug: Add debugging flags as specified in DEBUG_* variables # -OPTIONS=(strip docs libtool emptydirs zipman purge !upx !debug) +OPTIONS=(strip docs libtool !liba emptydirs zipman purge !upx !debug) #-- File integrity checks to use. Valid: md5, sha1, sha256, sha384, sha512 INTEGRITY_CHECK=(md5) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index bd29d73..274739c 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -44,8 +44,8 @@ declare -r confdir='@sysconfdir@' declare -r BUILDSCRIPT='@BUILDSCRIPT@' declare -r startdir="$PWD" -packaging_options=('strip' 'docs' 'libtool' 'emptydirs' 'zipman' 'purge' 'upx' \ - 'debug') +packaging_options=('strip' 'docs' 'libtool' 'liba' 'emptydirs' 'zipman' \ + 'purge' 'upx' 'debug') other_options=('ccache' 'distcc' 'buildflags' 'makeflags') splitpkg_overrides=('pkgver' 'pkgrel' 'epoch' 'pkgdesc' 'arch' 'url' 'license' \ 'groups' 'depends' 'optdepends' 'provides' 'conflicts' \ @@ -1503,6 +1503,11 @@ tidy_install() { find . ! -type d -name "*.la" -exec rm -f -- '{}' \; fi + if check_option "liba" "n"; then + msg2 "$(gettext "Removing "%s" files...")" "static libraries" + find . ! -type d -name "*.a" -exec rm -f -- '{}' \; + fi + if check_option "emptydirs" "n"; then msg2 "$(gettext "Removing empty directories...")" find . -depth -type d -exec rmdir '{}' + 2>/dev/null -- 1.8.1.5

3 5