diff --git a/main/links/APKBUILD b/main/links/APKBUILD index c44dc519bcf..47562a2f691 100644 --- a/main/links/APKBUILD +++ b/main/links/APKBUILD @@ -1,24 +1,33 @@ -# Maintainer: Natanael Copa +# Contributor: Natanael Copa +# Maintainer: Celeste pkgname=links pkgver=2.29 -pkgrel=1 +pkgrel=2 pkgdesc="Web browser running in both graphics and text mode" url="http://links.twibright.com/" arch="all" -options="!check" # No test suite. license="GPL-2.0-or-later WITH OpenSSL-Exception" +makedepends=" + bzip2-dev + libevent-dev + openssl-dev + zlib-dev + zstd-dev + " subpackages="$pkgname-doc" -makedepends="bzip2-dev openssl-dev>3 zlib-dev libevent-dev zstd-dev" source="http://links.twibright.com/download/links-$pkgver.tar.bz2 configure.patch " +options="!check" # No test suite. build() { ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ + --sysconfdir=/etc \ --mandir=/usr/share/man \ + --localstatedir=/var \ --disable-javascript \ --disable-graphics \ --without-x \ @@ -32,5 +41,5 @@ package() { sha512sums=" 5ea8b2fd0eb74d9dc2b45614aef6ee878fe686dff9bcee75ac6ea01f6a7331670f7709233d31986fc64ad86ce549616a4471057837b6caf15af6d1c5c503ac75 links-2.29.tar.bz2 -b56fcfb6165b3a3340672b25b83826ae32ab5a36673ac90207a40afa5e1e4e5fe21cd958bfb9600035dd84a9b8af1b68ad5be97d794840796d4d2deb992ffa4c configure.patch +64256e2e9ecbe59bedcac038f560383a45d65aa75a09ff1fe5882a95c029df5c94729b7f1c625af1baca9a2884e37e0d5b1a8202808cac5e41d189659e46d3f5 configure.patch " diff --git a/main/links/configure.patch b/main/links/configure.patch index dcd20c452b8..2b5b47def56 100644 --- a/main/links/configure.patch +++ b/main/links/configure.patch @@ -1,47 +1,7 @@ -werror=implicit-int -diff --git a/confdefs.h b/confdefs.h -new file mode 100644 -index 0000000..260c62f ---- /dev/null -+++ b/confdefs.h -@@ -0,0 +1,3 @@ -+ -+#define PACKAGE "links" -+#define VERSION "2.29" -diff --git a/config.cache b/config.cache -new file mode 100644 -index 0000000..e69de29 -diff --git a/config.log b/config.log -new file mode 100644 -index 0000000..7bf8995 ---- /dev/null -+++ b/config.log -@@ -0,0 +1,25 @@ -+This file contains any messages produced by compilers while -+running configure, to aid debugging if configure makes a mistake. -+ -+configure:640: checking for a BSD compatible install -+configure:693: checking whether build environment is sane -+configure:750: checking whether make sets ${MAKE} -+configure:796: checking for working aclocal-1.4 -+configure:809: checking for working autoconf -+configure:822: checking for working automake-1.4 -+configure:835: checking for working autoheader -+configure:848: checking for working makeinfo -+configure:880: checking for gcc -+configure:993: checking whether the C compiler (clang -O3 -flto=thin -DNDEBUG -march=native -fPIC -fstack-clash-protection -fstack-protector-strong -fcf-protection -pipe -fomit-frame-pointer -fdiagnostics-color=always -fno-semantic-interposition -flto=thin -fuse-ld=lld -Wl,-O2,--as-needed,--gc-sections,-z,defs,-z,relro,-z,now,--icf=safe,-z,pack-relative-relocs,--Bsymbolic) works -+configure:1009: clang -o conftest -O3 -flto=thin -DNDEBUG -march=native -fPIC -fstack-clash-protection -fstack-protector-strong -fcf-protection -pipe -fomit-frame-pointer -fdiagnostics-color=always -fno-semantic-interposition -flto=thin -fuse-ld=lld -Wl,-O2,--as-needed,--gc-sections,-z,defs,-z,relro,-z,now,--icf=safe,-z,pack-relative-relocs,--Bsymbolic conftest.c 1>&5 -+configure:1006:1: error: type specifier missing, defaults to 'int'; ISO C99 and later do not support implicit int [-Wimplicit-int] -+main(){return(0);} -+^ -+int -+1 error generated. -+configure: failed program was: -+ -+#line 1004 "configure" -+#include "confdefs.h" -+ -+main(){return(0);} +This patch fixes a build failure when CC=clang. +Links builds fine without it using GCC 13, but +there's no harm in fixing this implicit-int error. + diff --git a/configure b/configure index 354c422..88e0d53 100755 --- a/configure