Github messages for voidlinux
 help / color / mirror / Atom feed
From: ailiop-git <ailiop-git@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] postfix: add build options
Date: Wed, 16 Jun 2021 00:36:39 +0200	[thread overview]
Message-ID: <20210615223639.sYHRZuTk6fvvFeMHOHtyf3pxfJyOU_k7WDTX7rKwiXw@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-31230@inbox.vuxu.org>

[-- Attachment #1: Type: text/plain, Size: 1798 bytes --]

There is an updated pull request by ailiop-git against master on the void-packages repository

https://github.com/ailiop-git/void-packages postfix
https://github.com/void-linux/void-packages/pull/31230

postfix: add build options
Enable build to be more modular by making most of the dependencies
optional. Specifically, mysql, pgsql, sqlite, ldap, sasl and pcre are
not strictly required and are all optional dependencies.

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/31230.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-postfix-31230.patch --]
[-- Type: text/x-diff, Size: 3320 bytes --]

From fa1cfee5d136a638d4ac47cc49b2a1b9c163caff Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Mon, 31 May 2021 12:57:20 +0200
Subject: [PATCH] postfix: add build options

Enable build to be more modular by making most of the dependencies
optional. Specifically, mysql, pgsql, sqlite, ldap, sasl and pcre are
not strictly required and are all optional dependencies.
---
 srcpkgs/postfix/template | 45 +++++++++++++++++++++++++++-------------
 1 file changed, 31 insertions(+), 14 deletions(-)

diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index 80d321fb726c..bec92941ad92 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -3,8 +3,14 @@ pkgname=postfix
 version=3.6.1
 revision=1
 hostmakedepends="perl m4"
-makedepends="icu-devel libldap-devel libmariadbclient-devel pcre-devel
- postgresql-libs-devel sqlite-devel"
+makedepends="icu-devel openssl-devel
+ $(vopt_if bdb db-devel)
+ $(vopt_if ldap libldap-devel)
+ $(vopt_if mysql libmariadbclient-devel)
+ $(vopt_if pcre pcre-devel)
+ $(vopt_if pgsql postgresql-libs-devel)
+ $(vopt_if sasl libsasl-devel)
+ $(vopt_if sqlite sqlite-devel)"
 short_desc="High-performance mail transport agent"
 maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="IPL-1.0, EPL-2.0"
@@ -12,6 +18,14 @@ homepage="http://www.postfix.org/"
 distfiles="http://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${version}.tar.gz"
 checksum=20a805625601e7b95989220832c8fa14ce374f0711da054188f8cec6a92fd71c
 
+build_options="bdb ldap mysql pcre pgsql sasl sqlite"
+build_options_default="ldap mysql pcre pgsql sasl sqlite"
+desc_option_bdb="Enable support for BerkeleyDB"
+desc_option_pcre="Enable support for pcre"
+desc_option_pgsql="Enable support for postgresql"
+desc_option_mysql="Enable support for mysql"
+desc_option_sqlite="Enable support for sqlite"
+
 system_accounts="postfix"
 postfix_homedir="/var/spool/postfix"
 system_groups="postdrop"
@@ -57,27 +71,30 @@ do_build() {
 		-i makedefs
 
 	make makefiles CCARGS=" \
-		-DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I${XBPS_CROSS_BASE}/usr/include/sasl \
+		$(vopt_if bdb '' -DNO_DB) \
+		$(vopt_if ldap -DHAS_LDAP) \
+		$(vopt_if mysql '-DHAS_MYSQL -I${XBPS_CROSS_BASE}/usr/include/mysql') \
+		$(vopt_if pgsql '-DHAS_PGSQL -I${XBPS_CROSS_BASE}/usr/include/postgresql') \
+		$(vopt_if sasl '-DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I${XBPS_CROSS_BASE}/usr/include/sasl') \
+		$(vopt_if sqlite -DHAS_SQLITE) \
 		-DNO_NIS \
-		-DHAS_LDAP \
 		-DUSE_TLS \
 		-DHAS_EAI -I${XBPS_CROSS_BASE}/usr/include \
-		-DHAS_MYSQL -I${XBPS_CROSS_BASE}/usr/include/mysql \
-		-DHAS_PGSQL -I${XBPS_CROSS_BASE}/usr/include/postgresql \
-		-DHAS_SQLITE \
 		-DDEF_COMMAND_DIR=\\\"/usr/bin\\\" \
 		-DDEF_SENDMAIL_PATH=\\\"/usr/bin/sendmail\\\" \
 		-DDEF_README_DIR=\\\"/usr/share/doc/postfix\\\" \
 		-DDEF_MANPAGE_DIR=\\\"/usr/share/man\\\" \
-	" AUXLIBS=' \
-		-lsasl2 \
-		-lldap -llber \
+	" AUXLIBS=" \
+		$(vopt_if ldap '-lldap -llber') \
+		$(vopt_if mysql -lmysqlclient) \
+		$(vopt_if pgsql -lpq) \
+		$(vopt_if sasl -lsasl2) \
+		$(vopt_if sqlite -lsqlite3) \
 		-lssl -lcrypto \
-		-lmysqlclient -lz -lm \
-		-lpq \
-		-lsqlite3 -lpthread \
+		-lm \
+		-lpthread \
 		-licuuc \
-	' OPT="${CFLAGS} ${LDFLAGS}"
+	" OPT="${CFLAGS} ${LDFLAGS}"
 
 	make ${makejobs}
 }

  reply	other threads:[~2021-06-15 22:36 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-05-31 11:01 [PR PATCH] " ailiop-git
2021-06-15 22:36 ` ailiop-git [this message]
2021-07-21  3:52 ` ericonr
2021-07-22  9:50 ` [PR PATCH] [Updated] " ailiop-git
2022-05-21  2:00 ` github-actions
2022-06-04  2:09 ` [PR PATCH] [Closed]: " github-actions

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210615223639.sYHRZuTk6fvvFeMHOHtyf3pxfJyOU_k7WDTX7rKwiXw@z \
    --to=ailiop-git@users.noreply.github.com \
    --cc=ml@inbox.vuxu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).