heimdal: build with Python 3

This commit is contained in:
Christoph Reiter
2020-08-24 08:42:20 +02:00
parent 82e59a01b8
commit cb7bf6e225
2 changed files with 44 additions and 7 deletions

View File

@@ -0,0 +1,36 @@
From fbc60f1f3f6a46cf17ca9c17dc55eb551eae4af5 Mon Sep 17 00:00:00 2001
From: Quanah Gibson-Mount <quanah@symas.com>
Date: Tue, 28 Apr 2020 20:16:40 +0000
Subject: [PATCH] Fix #696 - Find python as part of the configure process
instead of hard coding it.
---
configure.ac | 1 +
lib/wind/Makefile.am | 2 --
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index 29709561b6..68434d1a33 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,6 +18,7 @@ dnl Checks for programs.
AC_PROG_CC
AM_PROG_CC_C_O
AC_PROG_CPP
+AM_PATH_PYTHON
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
diff --git a/lib/wind/Makefile.am b/lib/wind/Makefile.am
index 0b493118b3..4a34496fcf 100644
--- a/lib/wind/Makefile.am
+++ b/lib/wind/Makefile.am
@@ -89,8 +89,6 @@ idn_lookup_SOURCES = idn-lookup.c
LDADD = libwind.la $(LIB_roken)
-PYTHON = python
-
if !MAINTAINER_MODE
skip_python = test -f $@ ||
endif

View File

@@ -3,12 +3,12 @@
pkgbase=heimdal
pkgname=('heimdal' 'heimdal-libs' 'heimdal-devel')
pkgver=7.7.0
pkgrel=1
pkgrel=2
pkgdesc="Implementation of Kerberos V5 libraries"
arch=('i686' 'x86_64')
url="https://www.h5l.org/"
license=('custom')
makedepends=('libdb-devel' 'libcrypt-devel' 'libedit-devel' 'libsqlite-devel' 'openssl-devel' 'perl-JSON' 'python2') #libldap-devel
makedepends=('libdb-devel' 'libcrypt-devel' 'libedit-devel' 'libsqlite-devel' 'openssl-devel' 'perl-JSON' 'python') #libldap-devel
options=('!libtool' '!emptydirs' 'staticlibs')
groups=('net-utils')
source=(https://github.com/heimdal/heimdal/archive/heimdal-${pkgver}.tar.gz
@@ -18,9 +18,9 @@ source=(https://github.com/heimdal/heimdal/archive/heimdal-${pkgver}.tar.gz
1.5.2-roken-signal.patch
1.5.3-missing-libs-pkg-config.patch
1.5.3-fix-detect-libedit.patch
7.5.0-use-python2.patch
7.5.0-hcrypto-build-fix.patch
7.5.0-names-clash-with-openssl.patch)
7.5.0-names-clash-with-openssl.patch
7.7.0-find-python-706.patch)
sha256sums=('f7d414d0914abb0e151a276b4de22cf4977fd6c28bd9ecdd990407b1138a945c'
'b18c9ca3f2db08cea0a4b7d7f07e8656360af848b3a30a5fa8d748240989da49'
'a99f0f5b69d32524399b1343a4f08b2de43351828b5b45a938f72bacb0eb9085'
@@ -28,9 +28,9 @@ sha256sums=('f7d414d0914abb0e151a276b4de22cf4977fd6c28bd9ecdd990407b1138a945c'
'bf19c5d7326a0cf58a5b4922a9c96fb78807226bc40c2248417024b961dd559e'
'eecd77ec817f88406f315c1b21559d888f1e0b3182aad317031f7ebc62f69b5b'
'bb96587539084c2ea9e06da8d2b4c768edd8dd422587a045ea60d1aa3eeb6a8a'
'59186e1a69c927e7c4c88423a726ed2592b39ec98f57ecd84ec96f12330f4743'
'f387721cc311a82ce2d4793187957d5323aa773538ea3268175741712534f8d4'
'bfe321c0391d6f7e23abecc22e9941bcb79d0b67abb9975246a9f462ec32513b')
'bfe321c0391d6f7e23abecc22e9941bcb79d0b67abb9975246a9f462ec32513b'
'82120cf0fe00b6dc6f29cc2724dded4452eed860d977fd02568b0322093a0572')
prepare() {
cd ${srcdir}/heimdal-heimdal-${pkgver}
@@ -41,9 +41,10 @@ prepare() {
patch -p2 -i "${srcdir}"/1.5.2-roken-signal.patch
patch -p1 -i "${srcdir}"/1.5.3-missing-libs-pkg-config.patch
patch -p1 -i "${srcdir}"/1.5.3-fix-detect-libedit.patch
patch -p1 -i "${srcdir}"/7.5.0-use-python2.patch
patch -p1 -i "${srcdir}"/7.5.0-hcrypto-build-fix.patch
patch -p1 -i "${srcdir}"/7.5.0-names-clash-with-openssl.patch
# https://github.com/heimdal/heimdal/pull/706
patch -p1 -i "${srcdir}"/7.7.0-find-python-706.patch
./autogen.sh
}