sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 17:59:20 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Fix build with clang

Browse source 
PR:		ports/187418
Submitted by:	"Schweigert, Udo" <Udo.Schweigert@siemens.com> (maintainer)
This commit is contained in:
Ryan Steinmetz 2014-03-17 14:48:52 +00:00
parent b7df9d88b2
commit f8cc2a2b97
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=348479
2 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
mail/mutt/Makefile
View file

@ -52,7 +52,7 @@ CONFIGURE_ARGS+= ${MUTT_CONFIGURE_ARGS}
.endif
USE_AUTOTOOLS= automake autoconf
AUTOMAKE_ARGS= --add-missing
AUTOMAKE_ARGS= --add-missing --foreign
USE_OPENSSL= yes
.if defined (MUTT_LITE)
@ -267,18 +267,18 @@ CONFIGURE_ARGS+= --with-gss=${LOCALBASE}
.elif exists(${KRB5_HOME}/bin/krb5-config)
LIB_DEPENDS+= libgssapi_krb5.so:${PORTSDIR}/security/krb5
CONFIGURE_ARGS+= --with-gss=${KRB5_HOME}
LDFLAGS+= -L${KRB5_HOME}/lib -rpath=${KRB5_HOME}/lib -ltinfow
LDFLAGS+= -L${KRB5_HOME}/lib -Wl,-rpath=${KRB5_HOME}/lib -ltinfow
.elif exists(${HEIMDAL_HOME}/bin/krb5-config)
LIB_DEPENDS+= libgssapi_krb5.so:${PORTSDIR}/security/krb5
CONFIGURE_ARGS+= --with-gss=${HEIMDAL_HOME}
LDFLAGS+= -L${HEIMDAL_HOME}/lib -rpath=${HEIMDAL_HOME}/lib -ltinfow
LDFLAGS+= -L${HEIMDAL_HOME}/lib -Wl,-rpath=${HEIMDAL_HOME}/lib -ltinfow
.elif (defined(MAKE_KERBEROS5)) || exists(/usr/lib/libkrb5.a)
CONFIGURE_ARGS+= --with-gss
WITH_KRB5_SYS=YES
.endif
.endif
LDFLAGS+= -L${LOCALBASE}/lib -rpath=${LOCALBASE}/lib:/usr/lib -ltinfow
LDFLAGS+= -L${LOCALBASE}/lib -Wl,-rpath=${LOCALBASE}/lib:/usr/lib -ltinfow
CFLAGS+= ${CFLAGS_ADD}
LDFLAGS+= ${LDFLAGS_ADD}
@ -371,6 +371,7 @@ post-patch::
pre-configure::
@(cd ${WRKSRC}; ${SETENV} ${AUTOMAKE_ENV} ${ACLOCAL} -I m4)
@${RM} -f ${WRKSRC}/missing
.if defined(WITH_KRB5_SYS)
@${ECHO_CMD} "#define HAVE_HEIMDAL" >> ${WRKSRC}/config.h.in
@${REINPLACE_CMD} -e 's|<gssapi/gssapi\.h>|<gssapi.h>|' \

15
mail/mutt/files/patch-Makefile.am
View file

@ -1,6 +1,15 @@
--- Makefile.am.orig 2008-05-19 19:00:44.000000000 +0200
+++ Makefile.am 2008-05-19 19:03:20.000000000 +0200
@@ -136,10 +136,6 @@
--- Makefile.am.orig 2014-03-12 17:03:44.000000000 +0100
+++ Makefile.am 2014-03-16 17:22:07.000000000 +0100
@@ -97,7 +97,7 @@
# If this fails, we will fall back to the implementation in txt2c.sh
txt2c: txt2c.c
- -$${NATIVECC-$(CC)} -o $@ $<
+ -$(CC) -o $@ $<
conststrings.c: txt2c config.status
( \
@@ -162,10 +162,6 @@
install-data-local:
$(srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir)