diff options
author | khorben <khorben@pkgsrc.org> | 2016-02-22 12:42:56 +0000 |
---|---|---|
committer | khorben <khorben@pkgsrc.org> | 2016-02-22 12:42:56 +0000 |
commit | 7f26bf466c410ea72cd00e6d56c03264782d6e4c (patch) | |
tree | 92a88bb91ecec4fc4e1536504fceaa77eaae3efe /mail/deforaos-mailer | |
parent | db5fb9b04eaeae6d3e4a457b2bc6609a97953745 (diff) | |
download | pkgsrc-7f26bf466c410ea72cd00e6d56c03264782d6e4c.tar.gz |
Add support for LDFLAGS
Fixes build with the default settings.
Diffstat (limited to 'mail/deforaos-mailer')
-rw-r--r-- | mail/deforaos-mailer/Makefile | 3 | ||||
-rw-r--r-- | mail/deforaos-mailer/distinfo | 5 | ||||
-rw-r--r-- | mail/deforaos-mailer/patches/patch-src_Makefile | 26 | ||||
-rw-r--r-- | mail/deforaos-mailer/patches/patch-src_account_Makefile | 17 | ||||
-rw-r--r-- | mail/deforaos-mailer/patches/patch-src_plugins_Makefile | 17 |
5 files changed, 66 insertions, 2 deletions
diff --git a/mail/deforaos-mailer/Makefile b/mail/deforaos-mailer/Makefile index bc82ba2ef99..af3525dec86 100644 --- a/mail/deforaos-mailer/Makefile +++ b/mail/deforaos-mailer/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2016/02/20 14:52:09 khorben Exp $ +# $NetBSD: Makefile,v 1.21 2016/02/22 12:42:56 khorben Exp $ DISTNAME= Mailer-0.1.7 PKGNAME= deforaos-mailer-0.1.7 @@ -21,6 +21,7 @@ MAKE_JOBS_SAFE= no MAKE_FLAGS+= DESTDIR=${DESTDIR} MAKE_FLAGS+= PREFIX=${PREFIX} MAKE_FLAGS+= CFLAGS=${CFLAGS:Q} +MAKE_FLAGS+= LDFLAGS=${LDFLAGS:Q} AUTO_MKDIRS= yes CONFLICTS= john-[0-9]* diff --git a/mail/deforaos-mailer/distinfo b/mail/deforaos-mailer/distinfo index 053ad41f361..4bbc2330519 100644 --- a/mail/deforaos-mailer/distinfo +++ b/mail/deforaos-mailer/distinfo @@ -1,6 +1,9 @@ -$NetBSD: distinfo,v 1.5 2016/02/20 14:52:09 khorben Exp $ +$NetBSD: distinfo,v 1.6 2016/02/22 12:42:56 khorben Exp $ SHA1 (Mailer-0.1.7.tar.gz) = 33ffa684ef30c541bb3e37c2de39bd64c1e3df4b RMD160 (Mailer-0.1.7.tar.gz) = e82282a8fc72af497a41b896946dd199c8eb4cc8 SHA512 (Mailer-0.1.7.tar.gz) = 21124ad22ebcfdcb8479c60817a5934c710626a03246a684902139464e25f52acc437594880e4081dbc4bdbe3d68fd4267a2d90e38dee9af64f5569d0ee770b1 Size (Mailer-0.1.7.tar.gz) = 117673 bytes +SHA1 (patch-src_Makefile) = 3fb9b33e2a3e28446d45ef3137e61c98672ab380 +SHA1 (patch-src_account_Makefile) = e86345144a78f48d2d1caf670f29702df5a4ef1a +SHA1 (patch-src_plugins_Makefile) = 1c55d7d99f64e737faf1ce7635117624e1d30696 diff --git a/mail/deforaos-mailer/patches/patch-src_Makefile b/mail/deforaos-mailer/patches/patch-src_Makefile new file mode 100644 index 00000000000..89f3b0081f5 --- /dev/null +++ b/mail/deforaos-mailer/patches/patch-src_Makefile @@ -0,0 +1,26 @@ +$NetBSD: patch-src_Makefile,v 1.1 2016/02/22 12:42:56 khorben Exp $ + +Always build libraries with -fPIC + +--- src/Makefile.orig 2016-02-20 14:42:07.000000000 +0000 ++++ src/Makefile +@@ -7,8 +7,8 @@ LIBDIR = $(PREFIX)/lib + CC = cc + CPPFLAGSF= + CPPFLAGS= +-CFLAGSF = -W `pkg-config --cflags libDesktop` +-CFLAGS = -Wall -g -O2 -pedantic -fPIC -D_FORTIFY_SOURCE=2 -fstack-protector-all ++CFLAGSF = `pkg-config --cflags libDesktop` ++CFLAGS = -W -Wall -g -O2 -pedantic -D_FORTIFY_SOURCE=2 -fstack-protector-all + LDFLAGSF= `pkg-config --libs libDesktop` -lintl + LDFLAGS = -Wl,-z,relro -Wl,-z,now + EXEEXT = +@@ -34,7 +34,7 @@ subdirs: + else $(MAKE); fi) || exit; done + + libMailer_OBJS = $(OBJDIR)account.o $(OBJDIR)callbacks.o $(OBJDIR)compose.o $(OBJDIR)folder.o $(OBJDIR)helper.o $(OBJDIR)mailer.o $(OBJDIR)message.o +-libMailer_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS) ++libMailer_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS) -fPIC + libMailer_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) `pkg-config --libs openssl` -lssl + + $(OBJDIR)libMailer.a: $(libMailer_OBJS) diff --git a/mail/deforaos-mailer/patches/patch-src_account_Makefile b/mail/deforaos-mailer/patches/patch-src_account_Makefile new file mode 100644 index 00000000000..b2172bfe0f0 --- /dev/null +++ b/mail/deforaos-mailer/patches/patch-src_account_Makefile @@ -0,0 +1,17 @@ +$NetBSD: patch-src_account_Makefile,v 1.1 2016/02/22 12:42:56 khorben Exp $ + +Always build plug-ins with -fPIC + +--- src/account/Makefile.orig 2016-02-20 14:42:07.000000000 +0000 ++++ src/account/Makefile +@@ -6,8 +6,8 @@ LIBDIR = $(PREFIX)/lib + CC = cc + CPPFLAGSF= -I ../../include + CPPFLAGS= +-CFLAGSF = -W `pkg-config --cflags openssl` `pkg-config --cflags glib-2.0` +-CFLAGS = -Wall -g -O2 -pedantic -fPIC -D_FORTIFY_SOURCE=2 -fstack-protector-all ++CFLAGSF = `pkg-config --cflags openssl` `pkg-config --cflags glib-2.0` -fPIC ++CFLAGS = -W -Wall -g -O2 -pedantic -D_FORTIFY_SOURCE=2 -fstack-protector-all + LDFLAGSF= `pkg-config --libs openssl` -lssl `pkg-config --libs glib-2.0` + LDFLAGS = -Wl,-z,relro -Wl,-z,now + EXEEXT = diff --git a/mail/deforaos-mailer/patches/patch-src_plugins_Makefile b/mail/deforaos-mailer/patches/patch-src_plugins_Makefile new file mode 100644 index 00000000000..26fdf15127e --- /dev/null +++ b/mail/deforaos-mailer/patches/patch-src_plugins_Makefile @@ -0,0 +1,17 @@ +$NetBSD: patch-src_plugins_Makefile,v 1.1 2016/02/22 12:42:56 khorben Exp $ + +Always build plug-ins with -fPIC + +--- src/plugins/Makefile.orig 2016-02-20 14:42:07.000000000 +0000 ++++ src/plugins/Makefile +@@ -6,8 +6,8 @@ LIBDIR = $(PREFIX)/lib + CC = cc + CPPFLAGSF= -I ../../include + CPPFLAGS= +-CFLAGSF = -W `pkg-config --cflags libDesktop` +-CFLAGS = -Wall -g -O2 -pedantic -fPIC -D_FORTIFY_SOURCE=2 -fstack-protector-all ++CFLAGSF = `pkg-config --cflags libDesktop` -fPIC ++CFLAGS = -W -Wall -g -O2 -pedantic -D_FORTIFY_SOURCE=2 -fstack-protector-all + LDFLAGSF= `pkg-config --libs openssl` -lssl `pkg-config --libs libDesktop` + LDFLAGS = -Wl,-z,relro -Wl,-z,now + EXEEXT = |