summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD7
-rw-r--r--configure.local3
3 files changed, 9 insertions, 7 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 54336741ce7..83cf5b2cc7d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = mandoc
pkgdesc = A suite of tools compiling mdoc from the OpenBSD project
pkgver = 1.14.5
- pkgrel = 2
+ pkgrel = 3
url = https://mdocml.bsd.lv/
arch = i686
arch = x86_64
@@ -13,10 +13,12 @@ pkgbase = mandoc
source = configure.local
source = mandoc.service
source = mandoc.timer
+ source = fix-tbl-segfault.patch
sha256sums = 8219b42cb56fc07b2aa660574e6211ac38eefdbf21f41b698d3348793ba5d8f7
- sha256sums = f0e8ddb61d063bec02a6a1f73f5d979bb548e7aabcf0a27c0d5c29c4194bfc8e
+ sha256sums = 383772d5dd7c51319588ac4b63d4e7c452490568f6a3e905d118fdd6c4aa8a68
sha256sums = 2091411d5f87a3c371a5ba74b4773d1e454046446fa2cb045485979e52419bb6
sha256sums = 74d6a02b97a17fffddcc0a3dc830e811348b1f6c6b84f867882c776d50f00ea4
+ sha256sums = 12e6138be6ec2e8a34373876d8a5fce387a1d2b51a461ae20e1d98637af1d15c
pkgname = mandoc
diff --git a/PKGBUILD b/PKGBUILD
index 07c81d9d6d9..5101395d4a3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
pkgname=mandoc
pkgver=1.14.5
-pkgrel=2
+pkgrel=3
pkgdesc='A suite of tools compiling mdoc from the OpenBSD project'
arch=('i686' 'x86_64')
url='https://mdocml.bsd.lv/'
@@ -17,7 +17,7 @@ source=("https://mdocml.bsd.lv/snapshots/$pkgname-$pkgver.tar.gz"
'mandoc.timer'
'fix-tbl-segfault.patch')
sha256sums=('8219b42cb56fc07b2aa660574e6211ac38eefdbf21f41b698d3348793ba5d8f7'
- 'f0e8ddb61d063bec02a6a1f73f5d979bb548e7aabcf0a27c0d5c29c4194bfc8e'
+ '383772d5dd7c51319588ac4b63d4e7c452490568f6a3e905d118fdd6c4aa8a68'
'2091411d5f87a3c371a5ba74b4773d1e454046446fa2cb045485979e52419bb6'
'74d6a02b97a17fffddcc0a3dc830e811348b1f6c6b84f867882c776d50f00ea4'
'12e6138be6ec2e8a34373876d8a5fce387a1d2b51a461ae20e1d98637af1d15c')
@@ -28,6 +28,9 @@ prepare() {
# fix configure script - see https://aur.archlinux.org/packages/mandoc/#comment-739085
sed -i -e 's/^CC=.*/CC=cc/' ./configure
+ # apply CFLAGS and LDFLAGS from makepkg.conf
+ sed -i -e "s/^CFLAGS=.*/CFLAGS=\"$CFLAGS\"/" ./configure
+ sed -i -e "s/^LDFLAGS=.*/LDFLAGS=\"$LDFLAGS\"/" ./configure
# fix segfault when formatting tables on some man pages
patch -Np0 -i ../fix-tbl-segfault.patch
diff --git a/configure.local b/configure.local
index 8abc16b1b84..8228e5407a3 100644
--- a/configure.local
+++ b/configure.local
@@ -16,6 +16,3 @@ MANM_ROFF=mandoc_roff
# catman(8) is disabled by default.
BUILD_CATMAN=1
-
-# _FORTIFY_SOURCE doesn't work unless an optimisation level is specified.
-CFLAGS="$CFLAGS -O2"