kpriv/pkgsrc-wip
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Make build successfully on NetBSD/alpha by limiting the optimization level

Browse source 
while compiling.. -O2 brings seg faults and bogus errors, -O1 works.
Reintroduce SASL selections, although only GNU SASL (sasl-gnu) is
known to work.
This commit is contained in:
Eric Schnoebelen 2008-05-14 03:22:09 +00:00 committed by Thomas Klausner
parent 7658ec6968
commit 6993cdddf1
2 changed files with 32 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
jabberd2/Makefile
View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.48 2008/05/05 15:50:12 schnoebe Exp $
# $NetBSD: Makefile,v 1.49 2008/05/14 03:22:09 schnoebe Exp $
#
DISTNAME= jabberd-2.1.24.1
@ -32,7 +32,16 @@ CONFIGURE_ARGS+= --enable-anon
CONFIGURE_ARGS+= --enable-ssl
CONFIGURE_ARGS+= --enable-fs
# only GNU sasl is really supported
CONFIGURE_ARGS+= --with-sasl=gsasl
# CONFIGURE_ARGS+= --with-sasl=gsasl
.if (${MACHINE_ARCH} == alpha)
CONFIGURE_ARGS+= CXXFLAGS=${CXXFLAGS:M*:C/-O./-O1/:Q}
CONFIGURE_ENV+= CXXFLAGS=${CXXFLAGS:M*:C/-O./-O1/:Q}
MAKE_ENV+= CXXFLAGS=${CXXFLAGS:M*:C/-O./-O1/:Q}
CONFIGURE_ARGS+= CFLAGS=${CFLAGS:M*:C/-O./-O1/:Q}
CONFIGURE_ENV+= CFLAGS=${CFLAGS:M*:C/-O./-O1/:Q}
MAKE_ENV+= CFLAGS=${CFLAGS:M*:C/-O./-O1/:Q}
.endif
USE_TOOLS+= perl:run
REPLACE_PERL+= tools/*.pl
@ -115,7 +124,7 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/${f} ${DOCDIR}
.endfor
.include "../../security/gsasl/buildlink3.mk"
# .include "../../security/gsasl/buildlink3.mk"
.include "../../converters/libiconv/buildlink3.mk"
.include "../../devel/libidn/buildlink3.mk"
.include "../../security/gsasl/buildlink3.mk"

23
jabberd2/options.mk
View file

@ -1,8 +1,8 @@
# $NetBSD: options.mk,v 1.2 2008/01/17 16:41:12 schnoebe Exp $
# $NetBSD: options.mk,v 1.3 2008/05/14 03:22:09 schnoebe Exp $
#
PKG_OPTIONS_VAR= PKG_OPTIONS.jabberd2
PKG_OPTIONS_REQUIRED_GROUPS= auth storage
PKG_OPTIONS_REQUIRED_GROUPS= auth storage sasl
# Authentication backend
PKG_OPTIONS_GROUP.auth= auth-mysql auth-pgsql auth-sqlite
PKG_OPTIONS_GROUP.auth+= auth-db auth-ldap auth-pam
@ -10,11 +10,27 @@ PKG_OPTIONS_GROUP.auth+= auth-db auth-ldap auth-pam
PKG_OPTIONS_GROUP.storage= storage-mysql storage-pgsql
PKG_OPTIONS_GROUP.storage+= storage-sqlite storage-db
# SASL implementation
PKG_OPTIONS_GROUP.sasl= sasl-cyrus sasl-gnu sasl-scod
# debugging
PKG_SUPPORTED_OPTIONS+= debug
PKG_SUGGESTED_OPTIONS= auth-sqlite storage-sqlite
PKG_SUGGESTED_OPTIONS= auth-sqlite storage-sqlite sasl-cyrus
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Msasl-cyrus)
CONFIGURE_ARGS+= --with-sasl=cyrus
.include "../../security/cyrus-sasl/buildlink3.mk"
.endif
.if !empty(PKG_OPTIONS:Msasl-gnu)
CONFIGURE_ARGS+= --with-sasl=gsasl
.include "../../security/gsasl/buildlink3.mk"
.endif
.if !empty(PKG_OPTIONS:Msasl-scod)
CONFIGURE_ARGS+= --with-sasl=scod
.endif
.if !empty(PKG_OPTIONS:Mauth-db) || !empty(PKG_OPTIONS:Mstorage-db)
SUBST_CLASSES+= fixdb
SUBST_STAGE.fixdb= post-configure
@ -78,4 +94,5 @@ CONFIGURE_ARGS+= --disable-pam
.if !empty(PKG_OPTIONS:Mdebug)
CONFIGURE_ARGS+= --enable-debug
CONFIGURE_ARGS+= --enable-developer
.endif