diff options
Diffstat (limited to 'source/n/dirmngr')
| -rw-r--r-- | source/n/dirmngr/dirmngr-pth-fix.patch | 17 | ||||
| -rwxr-xr-x | source/n/dirmngr/dirmngr.SlackBuild | 10 |
2 files changed, 23 insertions, 4 deletions
diff --git a/source/n/dirmngr/dirmngr-pth-fix.patch b/source/n/dirmngr/dirmngr-pth-fix.patch new file mode 100644 index 00000000..862458ed --- /dev/null +++ b/source/n/dirmngr/dirmngr-pth-fix.patch @@ -0,0 +1,17 @@ +Index: src/dirmngr.c +=================================================================== +--- src/dirmngr.c (revision 348) ++++ src/dirmngr.c (working copy) +@@ -665,8 +665,11 @@ + the option parsing may need services of the libraries. */ + + /* Libgcrypt requires us to register the threading model first. +- Note that this will also do the pth_init. */ ++ Note that this will also do the pth_init for libgcrypt < 1.6 */ + ++#if GCRYPT_VERSION_NUMBER >= 0x010600 ++ pth_init (); ++#endif + /* Init Libgcrypt. */ + rc = gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pth); + if (rc) diff --git a/source/n/dirmngr/dirmngr.SlackBuild b/source/n/dirmngr/dirmngr.SlackBuild index 4c1b4a72..5ca697c5 100755 --- a/source/n/dirmngr/dirmngr.SlackBuild +++ b/source/n/dirmngr/dirmngr.SlackBuild @@ -24,12 +24,12 @@ PKGNAM=dirmngr VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-3} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) export ARCH=i486 ;; + i?86) export ARCH=i586 ;; arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: *) export ARCH=$( uname -m ) ;; @@ -38,8 +38,8 @@ fi NUMJOBS=${NUMJOBS:-" -j7 "} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "s390" ]; then SLKCFLAGS="-O2" @@ -69,6 +69,8 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +zcat $CWD/dirmngr-pth-fix.patch.gz | patch -p0 --verbose || exit 1 + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ |