September 2012 - Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] removed duplicate macros SYMEXPORT and SYMHIDDEN from alpm_list.c, using them from util.h
by Paul Barbu Gheorghe 29 May '13

29 May '13

Signed-off-by: Barbu Paul - Gheorghe <barbu.paul.gheorghe(a)gmail.com> --- lib/libalpm/alpm_list.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/libalpm/alpm_list.c b/lib/libalpm/alpm_list.c index 39eded1..b9e7cba 100644 --- a/lib/libalpm/alpm_list.c +++ b/lib/libalpm/alpm_list.c @@ -21,13 +21,11 @@ #include <stdlib.h> #include <string.h> +#include "util.h" + /* libalpm */ #include "alpm_list.h" -/* check exported library symbols with: nm -C -D <lib> */ -#define SYMEXPORT __attribute__((visibility("default"))) -#define SYMHIDDEN __attribute__((visibility("internal"))) - /** * @addtogroup alpm_list List Functions * @brief Functions to manipulate alpm_list_t lists. -- Barbu Paul - Gheorghe Common sense is not so common - Voltaire Visit My GitHub profile to see my open-source projects - https://github.com/paullik

6 9

[pacman-dev] [PATCH 1/3] makepkg: allow debug package suffix to be configurable
by Allan McRae 29 Sep '12

29 Sep '12

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- configure.ac | 8 ++++++++ scripts/Makefile.am | 1 + scripts/makepkg.sh.in | 30 +++++++++++++++--------------- 3 files changed, 24 insertions(+), 15 deletions(-) diff --git a/configure.ac b/configure.ac index 036dda2..48aa4c5 100644 --- a/configure.ac +++ b/configure.ac @@ -97,6 +97,11 @@ AC_ARG_WITH(buildscript, AS_HELP_STRING([--with-buildscript=name], [set the build script name used by makepkg]), [BUILDSCRIPT=$withval], [BUILDSCRIPT=PKGBUILD]) +# Help line for debug package suffix +AC_ARG_WITH(debug-suffix, + AS_HELP_STRING([--with-debux-suffix=name], [set the suffix for split debugging symbol packages used by makepkg]), + [DEBUGSUFFIX=$withval], [DEBUGSUFFIX=debug]) + # Help line for changing shell used to run install scriptlets AC_ARG_WITH(scriptlet-shell, AS_HELP_STRING([--with-scriptlet-shell=shell], @@ -425,6 +430,9 @@ AC_DEFINE_UNQUOTED([SRCEXT], "$SRCEXT", [The file extension used by pacman sourc # Set makepkg build script name AC_SUBST(BUILDSCRIPT) AC_DEFINE_UNQUOTED([BUILDSCRIPT], "$BUILDSCRIPT", [The build script name used by makepkg]) +# Set makepkg split debugging symbol package suffix +AC_SUBST(DEBUGSUFFIX) +AC_DEFINE_UNQUOTED([DEBUGSUFFIX], "$DEBUGSUFFIX", [The suffix for debugging symbol packages used by makepkg]) # Set shell used by install scriptlets AC_SUBST(SCRIPTLET_SHELL) AC_DEFINE_UNQUOTED([SCRIPTLET_SHELL], "$SCRIPTLET_SHELL", [The shell used to run install scriptlets]) diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 29c81aa..2bd6411 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -53,6 +53,7 @@ edit = sed \ -e 's|@PACKAGE_BUGREPORT[@]|$(PACKAGE_BUGREPORT)|g' \ -e 's|@PACKAGE_NAME[@]|$(PACKAGE_NAME)|g' \ -e 's|@BUILDSCRIPT[@]|$(BUILDSCRIPT)|g' \ + -e 's|@DEBUGSUFFIX[@]|$(DEBUGSUFFIX)|g' \ -e "s|@INODECMD[@]|$(INODECMD)|g" \ -e 's|@SIZECMD[@]|$(SIZECMD)|g' \ -e 's|@SEDINPLACE[@]|$(SEDINPLACE)|g' \ diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 337ada9..bb2391f 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1438,38 +1438,38 @@ strip_file() { # has this file already been stripped if [[ -n "$bid" ]]; then - if [[ -f "$pkgdir-debug"/usr/lib/debug/.build_id/${bid:0:2}/${bid:2}.debug ]]; then + if [[ -f "$pkgdir-@DEBUGSUFFIX@"/usr/lib/debug/.build_id/${bid:0:2}/${bid:2}.debug ]]; then return fi - elif [[ -f "$pkgdir-debug/usr/lib/debug/$binary.debug" ]]; then + elif [[ -f "$pkgdir-@DEBUGSUFFIX@/usr/lib/debug/$binary.debug" ]]; then return fi - mkdir -p "$pkgdir-debug/usr/lib/debug/${binary%/*}" - objcopy --only-keep-debug "$binary" "$pkgdir-debug/usr/lib/debug/$binary.debug" - objcopy --add-gnu-debuglink="$pkgdir-debug/usr/lib/debug/${binary#/}.debug" "$binary" + mkdir -p "$pkgdir-@DEBUGSUFFIX@/usr/lib/debug/${binary%/*}" + objcopy --only-keep-debug "$binary" "$pkgdir-@DEBUGSUFFIX@/usr/lib/debug/$binary.debug" + objcopy --add-gnu-debuglink="$pkgdir-@DEBUGSUFFIX@/usr/lib/debug/${binary#/}.debug" "$binary" # create any needed hardlinks while read -d '' file ; do if [[ "${binary}" -ef "${file}" && - ! -f "$pkgdir-debug/usr/lib/debug/${file}.debug" ]]; then - mkdir -p "$pkgdir-debug/usr/lib/debug/${file%/*}" - ln "$pkgdir-debug/usr/lib/debug/${binary}.debug" \ - "$pkgdir-debug/usr/lib/debug/${file}.debug" + ! -f "$pkgdir-@DEBUGSUFFIX@/usr/lib/debug/${file}.debug" ]]; then + mkdir -p "$pkgdir-@DEBUGSUFFIX@/usr/lib/debug/${file%/*}" + ln "$pkgdir-@DEBUGSUFFIX@/usr/lib/debug/${binary}.debug" \ + "$pkgdir-@DEBUGSUFFIX@/usr/lib/debug/${file}.debug" fi done < <(find . -type f -perm -u+w -print0 2>/dev/null) if [[ -n "$bid" ]]; then local target - mkdir -p "$pkgdir-debug/usr/lib/debug/.build_id/${bid:0:2}" + mkdir -p "$pkgdir-@DEBUGSUFFIX@/usr/lib/debug/.build_id/${bid:0:2}" target="../../../../../${binary#./}" target="${target/..\/..\/usr\/lib\/}" target="${target/..\/usr\/}" - ln -s "$target" "$pkgdir-debug/usr/lib/debug/.build_id/${bid:0:2}/${bid:2}" + ln -s "$target" "$pkgdir-@DEBUGSUFFIX@/usr/lib/debug/.build_id/${bid:0:2}/${bid:2}" target="../../${binary#./}.debug" - ln -s "$target" "$pkgdir-debug/usr/lib/debug/.build_id/${bid:0:2}/${bid:2}.debug" + ln -s "$target" "$pkgdir-@DEBUGSUFFIX@/usr/lib/debug/.build_id/${bid:0:2}/${bid:2}.debug" fi fi @@ -1532,7 +1532,7 @@ tidy_install() { [[ -z ${STRIP_STATIC+x} ]] && STRIP_STATIC="-S" if check_option "debug" "y"; then - mkdir -p $pkgdir-debug/usr/lib/debug + mkdir -p $pkgdir-@DEBUGSUFFIX@/usr/lib/debug fi local binary strip_flags @@ -1876,7 +1876,7 @@ create_debug_package() { return fi - pkgdir="${pkgdir}-debug" + pkgdir="${pkgdir}-@DEBUGSUFFIX@" # check if we have any debug symbols to package if dir_is_empty "$pkgdir/usr/lib/debug"; then @@ -1885,7 +1885,7 @@ create_debug_package() { depends=("$pkgname=$(get_full_version)") pkgdesc="Detached debugging symbols for $pkgname" - pkgname=$pkgname-debug + pkgname=$pkgname-@DEBUGSUFFIX@ unset groups optdepends provides conflicts replaces backup install changelog -- 1.7.12.1

1 2

[pacman-dev] packages not signed
by Christian Hesse 26 Sep '12

26 Sep '12

Hello everybody, I have just installed pacman-git v4.0.3.402.g2abe1f1-1. Everything works just fine except one thing: package signing does not work though it is requested in makepkg.conf with BUILDENV=(... sign). Giving --sign to makepkg works, however. What is wrong with the BUILDENV array in makepkg.conf? -- main(a){char*c=/* Schoene Gruesse */"B?IJj;MEH" "CX:;",b;for(a/* Chris get my mail address: */=0;b=c[a++];) putchar(b-1/(/* gcc -o sig sig.c && ./sig */b/42*2-3)*42);}

3 4

[pacman-dev] [PATCH 1/3] configure.ac: cleanup duplication in --enable-git-version
by Dave Reisner 25 Sep '12

25 Sep '12

Avoid adding our own messaging, as autoconf will add this for us with the result of the AC_CHECK_FILE test. Reuse the cache variable from autoconf to set our local variable. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- configure.ac | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index 7fe696a..7c65a75 100644 --- a/configure.ac +++ b/configure.ac @@ -424,13 +424,9 @@ AC_MSG_CHECKING(whether to use git version if available) if test "x$wantgitver" = "xyes" ; then AC_CHECK_PROGS([GIT], [git]) AC_CHECK_FILE([.git/], hasgitdir=yes) + usegitver=$ac_cv_file__git if test $GIT -a "x$hasgitdir" = "xyes"; then - AC_MSG_RESULT([yes]) - usegitver=yes AC_DEFINE([USE_GIT_VERSION], , [Use GIT version in version string]) - else - AC_MSG_RESULT([no, git or .git dir missing]) - usegitver=no fi else AC_MSG_RESULT([no, disabled by configure]) -- 1.7.12.1

3 7

[pacman-dev] [PATCH] repo-add: quote filename for consistent output style
by Allan McRae 25 Sep '12

25 Sep '12

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/repo-add.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index 504cae9..5a3bf23 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -208,7 +208,7 @@ create_signature() { gpg --detach-sign --use-agent ${SIGNWITHKEY} "$dbfile" &>/dev/null || ret=$? if (( ! ret )); then - msg2 "$(gettext "Created signature file %s.")" "${dbfile##*/.tmp.}.sig" + msg2 "$(gettext "Created signature file '%s'")" "${dbfile##*/.tmp.}.sig" else warning "$(gettext "Failed to sign package database.")" fi -- 1.7.12.1

1 0

[pacman-dev] [PATCH] makepkg: deprecate PKGBUILDs without a package() function
by Allan McRae 24 Sep '12

24 Sep '12

The package() function has been around since pacman-3.3 and has significant advantages including limited fakeroot usage and correct repackaging. The ability to use PKGBUILDs without a package function will be removed in a future release. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 8a300cb..337ada9 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -2785,6 +2785,10 @@ fi fullver=$(get_full_version) msg "$(gettext "Making package: %s")" "$pkgbase $fullver ($(date))" +if (( !PKGFUNC && !SPLITPKG )); then + warning "$(gettext "Using a %s without a %s function is deprecated.")" "$BUILDSCRIPT" "package()" +fi + # if we are creating a source-only package, go no further if (( SOURCEONLY )); then if [[ -f $SRCPKGDEST/${pkgbase}-${fullver}${SRCEXT} ]] \ -- 1.7.12.1

1 1

[pacman-dev] [PATCH 0/7] Split debugging symbols into separate package
by Allan McRae 24 Sep '12

24 Sep '12

This patchset allows makepkg to automatically create packages from the stripped debugging symbols. Patches 1, 4 and 6 are only mildly related... but a fixes that were "needed" along the way. The idea is to add options=('debug') to your PKGBUILD or in makepkg.conf and then makepkg will add DEBUG_CFLAGS and DEBUG_CXXFLAGS (defined in makepkg.conf) to their buildflag counterparts. When both "debug" and "strip" are specified in the options, the debug symbols are copied into a separate folder before the files are stripped. The main debugging symbols are in /usr/lib/debug/path/to/file (e.g. /usr/lib/debug/usr/bin/pacman) and are hardlinked if required. If the binary was linked with a build ID, the relevant symlinks in /usr/lib/debug/.build_id are created. Testing is needed... Allan McRae (7): makepkg: always run tidy_install on repackaging makepkg: add option to include debugging compiler flags makepkg: move debug symbol stripping to separate function makepkg: always use pkg/$pkgname as $pkgdir makepkg: strip debugging symbols into separate folder makepkg: output the name of the package being created makepkg: create package from stripped debug symbols doc/PKGBUILD.5.txt | 5 ++ doc/makepkg.conf.5.txt | 13 +++++ etc/makepkg.conf.in | 8 ++- scripts/makepkg.sh.in | 137 ++++++++++++++++++++++++++++++++++++++++--------- 4 files changed, 136 insertions(+), 27 deletions(-) -- 1.7.12.1

2 16

[pacman-dev] Dropping support for non-ELF systems
by Allan McRae 23 Sep '12

23 Sep '12

I would like opinions on dropping support for non-ELF systems. This would keep Linux, BSD and Hurd, which are the real users of pacman/makepkg. It would drop OSX and Cygwin support. Currently the libdepends/libprovides code in makepkg (pacman-4.0) depends on libraries being ELF formatted and we have had no complaints - although that could be because no-one uses it... Creating split debug packages will also assume ELF formatted files and I have no intention of adjusting the code in such a way that other formats can be readily added. So... any objections to removing cygwin and darwin support? Allan

3 3

[pacman-dev] [PATCH 5/7 V2] makepkg: strip debugging symbols into separate folder
by Allan McRae 23 Sep '12

23 Sep '12

When using the "debug" option in combination with "strip", move the debugging symbols into a separate directory ($pkgdir-debug/usr/lib/debug) suitable for creating a package from. Create hardlinks between debugging symbols of hardlinked files and add symlinks in the .build_id directory if the binary has a build ID. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- Fixup: - remove bad return... - add add-gnu-debuglink to file scripts/makepkg.sh.in | 52 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index c857060..a7971fe 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1421,8 +1421,55 @@ run_package() { run_function_safe "$pkgfunc" } +build_id() { + local id + id=$(LANG=C readelf -n $1 | sed -n '/Build ID/ { s/.*: //p; q; }') + printf "%s\n" "$id" +} + strip_file() { local binary=$1; shift + + if check_option "debug" "y"; then + local bid=$(build_id $binary) + + # has this file already been stripped + if [[ -n "$bid" ]]; then + if [[ -f $pkgdir-debug/usr/lib/debug/.build_id/${bid:0:2}/${bid:2}.debug ]]; then + return + fi + elif [[ -f $pkgdir-debug/usr/lib/debug/$binary.debug ]]; then + return + fi + + mkdir -p $pkgdir-debug/usr/lib/debug/${binary%/*} + objcopy --only-keep-debug $binary $pkgdir-debug/usr/lib/debug/$binary.debug + objcopy --add-gnu-debuglink="$pkgdir-debug/usr/lib/debug/${binary#/}.debug" "$binary" + + # create any needed hardlinks + while read -d '' file ; do + if [[ "${binary}" -ef "${file}" && + ! -f $pkgdir-debug/usr/lib/debug/${file}.debug ]]; then + mkdir -p $pkgdir-debug/usr/lib/debug/${file%/*} + ln $pkgdir-debug/usr/lib/debug/${binary}.debug \ + $pkgdir-debug/usr/lib/debug/${file}.debug + fi + done < <(find . -type f -perm -u+w -print0 2>/dev/null) + + if [[ -n "$bid" ]]; then + local target + mkdir -p $pkgdir-debug/usr/lib/debug/.build_id/${bid:0:2} + + target="../../../../../${binary#./}" + target=${target/..\/..\/usr\/lib\/} + target=${target/..\/usr\/} + ln -s $target $pkgdir-debug/usr/lib/debug/.build_id/${bid:0:2}/${bid:2} + + target="../../${binary#./}.debug" + ln -s $target $pkgdir-debug/usr/lib/debug/.build_id/${bid:0:2}/${bid:2}.debug + fi + fi + strip $@ $binary } @@ -1480,6 +1527,11 @@ tidy_install() { # make sure library stripping variables are defined to prevent excess stripping [[ -z ${STRIP_SHARED+x} ]] && STRIP_SHARED="-S" [[ -z ${STRIP_STATIC+x} ]] && STRIP_STATIC="-S" + + if check_option "debug" "y"; then + mkdir -p $pkgdir-debug/usr/lib/debug + fi + local binary strip_flags find . -type f -perm -u+w -print0 2>/dev/null | while read -d '' binary ; do case "$(file -bi "$binary")" in -- 1.7.12.1

1 0

[pacman-dev] [PATCH 1/2] Remove Darwin support
by Allan McRae 23 Sep '12

23 Sep '12

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- configure.ac | 16 ---------------- etc/Makefile.am | 3 --- etc/makepkg.conf.in | 6 +++--- lib/libalpm/Makefile.am | 4 ---- 4 files changed, 3 insertions(+), 26 deletions(-) diff --git a/configure.ac b/configure.ac index 7fe696a..434e2ba 100644 --- a/configure.ac +++ b/configure.ac @@ -295,9 +295,6 @@ GCC_GNU89_INLINE_CC INODECMD="stat -c '%i %n'" SIZECMD="stat -c %s" SEDINPLACE="sed -i" -STRIP_BINARIES="--strip-all" -STRIP_SHARED="--strip-unneeded" -STRIP_STATIC="--strip-debug" case "${host_os}" in *bsd*) INODECMD="stat -f '%i %n'" @@ -308,26 +305,13 @@ case "${host_os}" in host_os_cygwin=yes AC_DEFINE([CYGWIN], [1], [Define if host OS is cygwin]) ;; - darwin*) - host_os_darwin=yes - INODECMD="/usr/bin/stat -f '%i %n'" - SIZECMD="/usr/bin/stat -f %z" - SEDINPLACE="/usr/bin/sed -i ''" - STRIP_BINARIES="" - STRIP_SHARED="-S" - STRIP_STATIC="-S" - ;; esac AM_CONDITIONAL([CYGWIN], test "x$host_os_cygwin" = "xyes") -AM_CONDITIONAL([DARWIN], test "x$host_os_darwin" = "xyes") AC_PATH_PROGS([DUPATH], [du], [du], [/usr/bin$PATH_SEPARATOR/bin] ) AC_SUBST(INODECMD) AC_SUBST(SIZECMD) AC_SUBST(SEDINPLACE) -AC_SUBST(STRIP_BINARIES) -AC_SUBST(STRIP_SHARED) -AC_SUBST(STRIP_STATIC) # Variables plugged into makepkg.conf CARCH="${host%%-*}" diff --git a/etc/Makefile.am b/etc/Makefile.am index 58a80bd..2f3b047 100644 --- a/etc/Makefile.am +++ b/etc/Makefile.am @@ -13,9 +13,6 @@ edit = sed \ -e 's|@PACKAGE_NAME[@]|$(PACKAGE_NAME)|g' \ -e 's|@PKGEXT[@]|$(PKGEXT)|g' \ -e 's|@SRCEXT[@]|$(SRCEXT)|g' \ - -e 's|@STRIP_BINARIES[@]|$(STRIP_BINARIES)|g' \ - -e 's|@STRIP_SHARED[@]|$(STRIP_SHARED)|g' \ - -e 's|@STRIP_STATIC[@]|$(STRIP_STATIC)|g' \ -e 's|@CARCH[@]|$(CARCH)|g' \ -e 's|@CHOST[@]|$(CHOST)|g' \ -e 's|@ARCHSWITCH[@]|$(ARCHSWITCH)|g' \ diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in index dcec6f5..61e9a71 100644 --- a/etc/makepkg.conf.in +++ b/etc/makepkg.conf.in @@ -78,11 +78,11 @@ OPTIONS=(strip docs libtool emptydirs zipman purge !upx) #-- File integrity checks to use. Valid: md5, sha1, sha256, sha384, sha512 INTEGRITY_CHECK=(md5) #-- Options to be used when stripping binaries. See `man strip' for details. -STRIP_BINARIES="@STRIP_BINARIES@" +STRIP_BINARIES="--strip-all" #-- Options to be used when stripping shared libraries. See `man strip' for details. -STRIP_SHARED="@STRIP_SHARED@" +STRIP_SHARED="--strip-unneeded" #-- Options to be used when stripping static libraries. See `man strip' for details. -STRIP_STATIC="@STRIP_STATIC@" +STRIP_STATIC="--strip-debug" #-- Manual (man and info) directories to compress (if zipman is specified) MAN_DIRS=({usr{,/local}{,/share},opt/*}/{man,info}) #-- Doc directories to remove (if !docs is specified) diff --git a/lib/libalpm/Makefile.am b/lib/libalpm/Makefile.am index 911e52b..9529526 100644 --- a/lib/libalpm/Makefile.am +++ b/lib/libalpm/Makefile.am @@ -13,12 +13,8 @@ AM_CPPFLAGS = \ AM_CFLAGS = -pedantic -D_GNU_SOURCE $(WARNING_CFLAGS) if ENABLE_VISIBILITY_CC -if DARWIN -AM_CFLAGS += -fvisibility=hidden -else AM_CFLAGS += -fvisibility=internal endif -endif if ENABLE_GNU89_INLINE_CC AM_CFLAGS += -fgnu89-inline endif -- 1.7.12.1

1 1