Commit 20828fc5 authored by Andy Postnikov's avatar Andy Postnikov
Browse files

main/ncurses: fix builders

- fix empty pkgconf dir via patch
- remove useless pkgconf-dev
parent c2ddff5d
Pipeline #97670 passed with stages
in 3 minutes and 1 second
......@@ -2,16 +2,18 @@
pkgname=ncurses
pkgver=6.2_p20211017
_ver=${pkgver/_p/-}
pkgrel=0
pkgrel=1
pkgdesc="Console display library"
url="https://invisible-island.net/ncurses/"
arch="all"
options="!check" # "tests" are actual demo programs, not a test suite.
license="MIT"
makedepends_build="ncurses pkgconf-dev"
makedepends_build="ncurses"
subpackages="$pkgname-static $pkgname-dev $pkgname-doc $pkgname-libs
$pkgname-terminfo-base:base:noarch $pkgname-terminfo:terminfo:noarch"
source="https://invisible-mirror.net/archives/ncurses/current/ncurses-$_ver.tgz"
source="https://invisible-mirror.net/archives/ncurses/current/ncurses-$_ver.tgz
ncurses-6.3-20211021a.patch
"
builddir="$srcdir"/ncurses-$_ver
# secfixes:
......@@ -33,6 +35,7 @@ build() {
--disable-rpath-hack \
--disable-stripping \
--without-cxx-binding \
--with-pkg-config-libdir="/usr/lib/pkgconfig" \
--with-terminfo-dirs="/etc/terminfo:/usr/share/terminfo:/lib/terminfo:/usr/lib/terminfo" \
--enable-pc-files \
--with-shared \
......@@ -66,6 +69,8 @@ package() {
dev() {
default_dev
mkdir -p "$subpkgdir"/usr/lib/pkgconfig
mv *.pc "$subpkgdir"/usr/lib/pkgconfig/
# force link against *w.so
for lib in ncurses ncurses++ form panel menu; do
echo "INPUT(-l${lib}w)" > "$subpkgdir"/usr/lib/lib$lib.so
......@@ -112,4 +117,5 @@ static() {
sha512sums="
18dd286df09cdff443525f707b4d20cf441e0e43425d20ddf0004eb7c883e7533f406a5790e3d3c29397aaa81e1a208067e45c9fec940becbe4e4f5843df7b29 ncurses-6.2-20211017.tgz
1ec4301a10f6249f71396fb1483839cb5c2a17caf912eb694d5aa4f00ab98ad2dc465b807d97bbc642ae0603c9504706ac1b85507b780080f305475534bb4e40 ncurses-6.3-20211021a.patch
"
Patch-Source: https://lists.gnu.org/archive/html/bug-ncurses/2021-10/msg00044.html
# ftp://ftp.invisible-island.net/ncurses/6.3/ncurses-6.3-20211021a.patch.gz
# patch by Thomas E. Dickey <dickey@invisible-island.net>
# created Sun Oct 24 20:19:29 UTC 2021
# ------------------------------------------------------------------------------
# aclocal.m4 | 2 +-
# configure | 2 +-
# 2 files changed, 2 insertions(+), 2 deletions(-)
# ------------------------------------------------------------------------------
Index: aclocal.m4
Prereq: 1.981
--- ncurses-6.3-20211021+/aclocal.m4 2021-10-17 15:14:04.000000000 +0000
+++ ncurses-6.3-20211021a/aclocal.m4 2021-10-24 20:17:23.395945464 +0000
@@ -2066,7 +2066,7 @@
then
MAKE_PC_FILES=
case "x$PKG_CONFIG_LIBDIR" in
- (xno|xnone|xyes)
+ (xno|xnone|xyes|x)
AC_MSG_WARN(no PKG_CONFIG_LIBDIR was found)
;;
(*)
Index: configure
--- ncurses-6.3-20211021+/configure 2021-10-17 15:12:23.000000000 +0000
+++ ncurses-6.3-20211021a/configure 2021-10-24 20:17:34.596363507 +0000
@@ -4266,7 +4266,7 @@
then
MAKE_PC_FILES=
case "x$PKG_CONFIG_LIBDIR" in
- (xno|xnone|xyes)
+ (xno|xnone|xyes|x)
{ echo "$as_me:4270: WARNING: no PKG_CONFIG_LIBDIR was found" >&5
echo "$as_me: WARNING: no PKG_CONFIG_LIBDIR was found" >&2;}
;;
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment