getent: rebuild for libargp
One symbol was renamed (old name only available via API not ABI), so hackily adjust the configure check for now. Also remove msysize patch while at it.
This commit is contained in:
parent
873547124d
commit
5c0233b06a
@ -2,7 +2,7 @@
|
||||
|
||||
pkgname=getent
|
||||
pkgver=2.18.90
|
||||
pkgrel=4
|
||||
pkgrel=5
|
||||
pkgdesc="Get entries from Name Service Switch libraries"
|
||||
arch=('i686' 'x86_64')
|
||||
url="https://www.gnu.org/software/libc/libc.html"
|
||||
@ -11,15 +11,15 @@ depends=('libargp')
|
||||
makedepends=('libargp-devel' 'autotools' 'gcc')
|
||||
source=(getent-${pkgver}.tar.gz
|
||||
cygwin-getent.patch
|
||||
msysize.patch)
|
||||
argp_parse-rename.patch)
|
||||
sha256sums=('290440924c7e1ba9cdb2b2a2629899bfc497024fb393de77907c6f8394e0259c'
|
||||
'260efd98496dc54537d133daa903ed3f329b833e9726ea3f2533c1710ce65b9e'
|
||||
'ae576366f80d9beafe4863f23065a466efa1f5aa6c99493fd52ba2ee8d79566e')
|
||||
'0a1b798f0aca808c64541cc4fa13206d390ea4692e03f05a744c8cbefb3a1369')
|
||||
|
||||
prepare() {
|
||||
cd ${pkgname}-${pkgver}
|
||||
patch -p2 -i ${srcdir}/cygwin-getent.patch
|
||||
patch -p0 -i ${srcdir}/msysize.patch
|
||||
patch -p1 -i ${srcdir}/argp_parse-rename.patch
|
||||
|
||||
autoreconf -fi
|
||||
}
|
||||
@ -28,12 +28,14 @@ build() {
|
||||
mkdir -p "${srcdir}/build-${CHOST}"
|
||||
cd "${srcdir}/build-${CHOST}"
|
||||
|
||||
local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
|
||||
|
||||
CFLAGS+=" -D_GNU_SOURCE"
|
||||
../${pkgname}-${pkgver}/configure \
|
||||
--prefix=/usr \
|
||||
--build=${CHOST} \
|
||||
--host=${CHOST} \
|
||||
--target=${CHOST}
|
||||
--build=${CYGWIN_CHOST} \
|
||||
--host=${CYGWIN_CHOST} \
|
||||
--target=${CYGWIN_CHOST}
|
||||
|
||||
make
|
||||
}
|
||||
|
||||
11
getent/argp_parse-rename.patch
Normal file
11
getent/argp_parse-rename.patch
Normal file
@ -0,0 +1,11 @@
|
||||
--- getent-2.18.90/configure.ac.orig 2024-12-07 18:54:42.216388200 +0100
|
||||
+++ getent-2.18.90/configure.ac 2024-12-07 18:54:40.916356100 +0100
|
||||
@@ -25,7 +25,7 @@
|
||||
fi
|
||||
fi
|
||||
|
||||
-AC_CHECK_LIB([argp], [argp_parse], ,
|
||||
+AC_CHECK_LIB([argp], [rpl_argp_parse], ,
|
||||
[AC_MSG_ERROR([*** libargp required to build getent ***])])
|
||||
|
||||
test -z "$CFLAGS" && CFLAGS="-g -O2 -Wall -Werror"
|
||||
@ -1,20 +0,0 @@
|
||||
--- configure.ac.orig 2017-01-28 19:26:38.253796500 +0100
|
||||
+++ configure.ac 2017-01-28 19:53:12.562170100 +0100
|
||||
@@ -8,7 +8,7 @@
|
||||
AC_PROG_INSTALL
|
||||
|
||||
case "${target}" in
|
||||
- *-cygwin)
|
||||
+ *-msys)
|
||||
;;
|
||||
*)
|
||||
echo "The only supported target is cygwin."
|
||||
@@ -16,7 +16,7 @@
|
||||
;;
|
||||
esac
|
||||
|
||||
-AC_CHECK_TOOL(CC, ${target_cpu}-pc-cygwin-gcc, ${target_cpu}-pc-cygwin-gcc)
|
||||
+AC_CHECK_TOOL(CC, ${target_cpu}-pc-msys-gcc, ${target_cpu}-pc-msys-gcc)
|
||||
if test -z "$CC"; then
|
||||
AC_CHECK_TOOL(CC, gcc, gcc)
|
||||
if test -z "$CC"; then
|
||||
Loading…
x
Reference in New Issue
Block a user