aboutsummaryrefslogtreecommitdiffstats
path: root/testing/exim
diff options
context:
space:
mode:
authorAsh Berlin <ashberlin@gmail.com>2017-02-01 17:20:43 +0000
committerTimo Teräs <timo.teras@iki.fi>2017-02-01 17:58:45 +0000
commita480d71ef44cd22fc59e83aa19649bd854ce751d (patch)
treef0cf13bad38b7138d36cd097ea7bd42298626ba3 /testing/exim
parent30cda290c45e8ffb0dd6613ba874b15fc03b1d75 (diff)
downloadaports-a480d71ef44cd22fc59e83aa19649bd854ce751d.tar.bz2
aports-a480d71ef44cd22fc59e83aa19649bd854ce751d.tar.xz
testing/exim: Fix linking error on loadable modules/subpackages
Something about the gcc invocation was causing it to not link libpq or libmysql so the exim-postgresql and exim-mysql packages were unusable at runtime. linux-headers build-time deb didn't seem to cause any problems, but it issued a warning about linux/ip.h not found, and we can fix that easily enough so we should. Fixes #6775
Diffstat (limited to 'testing/exim')
-rw-r--r--testing/exim/APKBUILD11
-rw-r--r--testing/exim/exim.Makefile6
2 files changed, 9 insertions, 8 deletions
diff --git a/testing/exim/APKBUILD b/testing/exim/APKBUILD
index c5f9d7cacd..f085db9c02 100644
--- a/testing/exim/APKBUILD
+++ b/testing/exim/APKBUILD
@@ -1,10 +1,11 @@
+# Contributor: Ash Berlin-Taylor <ash.berlin@gmail.com>
# Contributor: Valery Kartel <valery.kartel@gmail.com>
# Contributor: Łukasz Jendrysik <scadu@yandex.com>
# Contributor: Jesse Young <jlyo@jlyo.org>
# Maintainer: Jesse Young <jlyo@jlyo.org>
pkgname=exim
pkgver=4.88
-pkgrel=0
+pkgrel=1
pkgdesc="A Message Transfer Agent"
url="http://www.exim.org/"
arch="all"
@@ -14,7 +15,7 @@ depends="ca-certificates"
pkgusers="exim"
pkggroups="exim"
makedepends="bash gawk perl $depends_dev db-dev pcre-dev libressl-dev libspf2-dev mariadb-dev
- postgresql-dev sqlite-dev libidn-dev"
+ postgresql-dev sqlite-dev libidn-dev linux-headers"
install="exim.pre-install"
subpackages="$pkgname-cdb $pkgname-dbmdb $pkgname-dnsdb $pkgname-sqlite $pkgname-mysql $pkgname-postgresql
$pkgname-utils $pkgname-scripts::noarch $pkgname-doc"
@@ -97,17 +98,17 @@ dbmdb() { _mv_ext dbmdb; }
dnsdb() { _mv_ext dnsdb; }
md5sums="4cc10c910fd18bb9e299e98bc0a32ed2 exim-4.88.tar.bz2
-16fdac04fe6721d9fb099456a7713beb exim.Makefile
+26f5370c7f7d326da62da5d87ec5f96c exim.Makefile
186f4491800be8c56ce39320f24d7264 exim.confd
dee893356b9fee4276acb018df1c5adf exim.initd
2eff3af519bdf8acf0292fffe89871a5 exim.logrotate"
sha256sums="119d5fd7e31fc224e84dfa458fe182f200856bae7adf852a8287c242161f8a2d exim-4.88.tar.bz2
-8a39c8bf1c6e1ac1beec02dfd3239836a5238440049502f5f80b38fa6158446e exim.Makefile
+9d0880ba97ca05712521c3cd76ce45695b3dcfd3df7b09131f54ddd1ec884aed exim.Makefile
db711754c48dfb7e3810009a1c6ffa331625c9d74d00dc8fa8256d9fa2c353f0 exim.confd
c7c994777204ec45e0efe791ff818970a819b08ca67ffb252f87323346e6d1b1 exim.initd
b5a6d449cb1998beb44d4144ef97e66a98b46d164445989a6d624c80549f24bc exim.logrotate"
sha512sums="ea094bf703628c201de119fc5f09539475e52158e935f8f2a9e4138c4a1bfe885017145c3cc5e22aa9087b195091955c69385ebf1ea0baec64ed5c1b8e3b1caf exim-4.88.tar.bz2
-58845ba0e4a9f8ac744e0810c0fd717c2be0dde0241cab3d2610145cd49f2589a9ac18bc18a0b177ee89dbdb651d61348adfede2b359a99bcc51f6e9aa2de985 exim.Makefile
+c0733014f52d78e3380c018109cf5628b498cea29e901344598ff128d9f3a190766ce9a5858f4fff6fc4b1c6f921dd1a3589f566eebc1f0ec709d2a8da2bbd82 exim.Makefile
bb6f5ead067af19ace661cc92bcd428da97570aedd1f9dc5b61a34e7e3fb3e028be6c96d51df73353bdfcaf69a3ee053fb03d245f868d63ebf518aa96ec82d66 exim.confd
3769e74a54566362bcdf57c45fbf7d130d7a7529fbc40befce431eef0387df117c71a5b57779c507e30d5b125913b5f26c9d16b17995521a1d94997be6dc3e02 exim.initd
28e748693a6a72d9943fa9c342ff041fe650fa6977f468dee127e845e6c2a91872ce33fb6f5698838906bde3ed92de7a91cdb0349cedc40b806261867e8c06cb exim.logrotate"
diff --git a/testing/exim/exim.Makefile b/testing/exim/exim.Makefile
index 5db92ad80f..c372d73016 100644
--- a/testing/exim/exim.Makefile
+++ b/testing/exim/exim.Makefile
@@ -25,12 +25,12 @@ LOOKUP_DNSDB=2
LOOKUP_PASSWD=yes
LOOKUP_MYSQL=2
LOOKUP_MYSQL_INCLUDE=-I/usr/include/mysql
-LOOKUP_MYSQL_LIBS=-lmysqlclient
+LOOKUP_MYSQL_LIBS=-Wl,--no-as-needed -lmysqlclient
LOOKUP_PGSQL=2
LOOKUP_PGSQL_INCLUDE=-I/usr/include/postgresql
-LOOKUP_PGSQL_LIBS=-lpq
+LOOKUP_PGSQL_LIBS=-Wl,--no-as-needed -lpq
LOOKUP_SQLITE=2
-LOOKUP_SQLITE_PC=sqlite3
+LOOKUP_SQLITE_LIBS=-Wl,--no-as-needed -lsqlite3
PCRE_CONFIG=yes
PCRE_LIBS=-lpcre
WITH_CONTENT_SCAN=yes