summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobin Broda2018-03-02 19:39:31 +0100
committerRobin Broda2018-03-02 19:39:31 +0100
commit424a18088a8f65f84e40a64796ce835c9fcec561 (patch)
tree0f2b34b7882ebb03207fafa53916ddb1dc28a5f6
parente92265bdc201164cd6574c9885acfead73bccd8f (diff)
downloadaur-daemontools-encore.tar.gz
Add patches to honor CFLAGS & LDFLAGS
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD17
-rw-r--r--cflags.patch7
-rw-r--r--ldflags.patch7
4 files changed, 33 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 0010c6af704d..8fff635a8107 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,18 @@
pkgbase = daemontools-encore
pkgdesc = collection of tools for managing UNIX services - derived from the public-domain release of daemontools by D. J. Bernstein.
pkgver = 1.10
- pkgrel = 2
+ pkgrel = 3
url = https://untroubled.org/daemontools-encore
arch = i686
arch = x86_64
license = MIT
depends = sh
source = https://untroubled.org/daemontools-encore/daemontools-encore-1.10.tar.gz
+ source = ldflags.patch
+ source = cflags.patch
sha256sums = 9f48f3c6cdd3f2b0202532e87f9ff46ea86777ca31ebda3a96bed618104bbd31
+ sha256sums = 3842bbef9690295e77faab723205361667415f9788de6e09150f02e6a006c423
+ sha256sums = b61e21071c1f115d32dd36f58f826310981e17978f5542e15da071abaf6fe22a
pkgname = daemontools-encore
diff --git a/PKGBUILD b/PKGBUILD
index 3de3f67e4608..815b34ceccfa 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,14 +3,25 @@
pkgname=daemontools-encore
pkgver=1.10
-pkgrel=2
+pkgrel=3
pkgdesc="collection of tools for managing UNIX services - derived from the public-domain release of daemontools by D. J. Bernstein."
arch=('i686' 'x86_64')
url="https://untroubled.org/daemontools-encore"
license=('MIT')
depends=('sh')
-source=("https://untroubled.org/daemontools-encore/${pkgname}-${pkgver}.tar.gz")
-sha256sums=('9f48f3c6cdd3f2b0202532e87f9ff46ea86777ca31ebda3a96bed618104bbd31')
+source=("https://untroubled.org/daemontools-encore/${pkgname}-${pkgver}.tar.gz"
+ 'ldflags.patch'
+ 'cflags.patch')
+sha256sums=('9f48f3c6cdd3f2b0202532e87f9ff46ea86777ca31ebda3a96bed618104bbd31'
+ '3842bbef9690295e77faab723205361667415f9788de6e09150f02e6a006c423'
+ 'b61e21071c1f115d32dd36f58f826310981e17978f5542e15da071abaf6fe22a')
+
+prepare() {
+ cd "${pkgname}-${pkgver}"
+
+ patch conf-cc "${srcdir}/cflags.patch"
+ patch conf-ld "${srcdir}/ldflags.patch"
+}
build() {
cd "${pkgname}-${pkgver}"
diff --git a/cflags.patch b/cflags.patch
new file mode 100644
index 000000000000..d054af00710e
--- /dev/null
+++ b/cflags.patch
@@ -0,0 +1,7 @@
+--- conf-cc-orig 2018-03-02 19:19:21.854371204 +0100
++++ conf-cc 2018-03-02 19:19:29.861371762 +0100
+@@ -1,3 +1,3 @@
+-gcc -O2 -Wall -Wshadow -Wcast-align -Wwrite-strings
++gcc ${CFLAGS} -O2 -Wall -Wshadow -Wcast-align -Wwrite-strings
+
+ This will be used to compile .c files.
diff --git a/ldflags.patch b/ldflags.patch
new file mode 100644
index 000000000000..9c6b412038ab
--- /dev/null
+++ b/ldflags.patch
@@ -0,0 +1,7 @@
+--- conf-ld-orig 2018-03-02 19:17:41.199364184 +0100
++++ conf-ld 2018-03-02 19:17:53.917365071 +0100
+@@ -1,3 +1,3 @@
+-gcc -s
++gcc ${LDFLAGS} -s
+
+ This will be used to link .o files into an executable.