diff options
| author | grant <grant> | 2006-04-07 00:35:02 +0000 |
|---|---|---|
| committer | grant <grant> | 2006-04-07 00:35:02 +0000 |
| commit | 0fb0d13f5ce8ffd790d7368c2f4d00f2b126f122 (patch) | |
| tree | ae6c6052cf59178fa5886684848ba3ec7d50b099 /databases/openldap | |
| parent | 313df3f4b0ed5fecbe15476c4657c658a2338ec8 (diff) | |
| download | pkgsrc-0fb0d13f5ce8ffd790d7368c2f4d00f2b126f122.tar.gz | |
fix avl_* function prototype conflicts on Solaris, so this now builds
on Solaris.
Diffstat (limited to 'databases/openldap')
| -rw-r--r-- | databases/openldap/Makefile | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/databases/openldap/Makefile b/databases/openldap/Makefile index 467b46398bf..39b4bce2cd6 100644 --- a/databases/openldap/Makefile +++ b/databases/openldap/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.110 2006/03/14 16:23:46 joerg Exp $ +# $NetBSD: Makefile,v 1.111 2006/04/07 00:35:02 grant Exp $ DISTNAME= openldap-2.3.11 PKGREVISION= 2 @@ -28,6 +28,21 @@ FILES_SUBST+= OPENLDAP_ETCDIR=${OPENLDAP_ETCDIR:Q} .include "../../mk/bsd.prefs.mk" .include "options.mk" +# the internal avl_* prototypes conflict with those in <sys/avl.h> which +# is included by another system header file on Solaris, so subst them. +.if ${OPSYS} == "SunOS" +SUBST_CLASSES+= conflict +SUBST_STAGE.conflict= post-patch +SUBST_FILES.conflict= ${WRKSRC}/*/*.h +SUBST_FILES.conflict+= ${WRKSRC}/*/*/*.c ${WRKSRC}/*/*/*/*.c +SUBST_SED.conflict+= -e 's,avl_free,openldap_avl_free,g' +SUBST_SED.conflict+= -e 's,avl_insert,openldap_avl_insert,g' +SUBST_SED.conflict+= -e 's,avl_delete,openldap_avl_delete,g' +SUBST_SED.conflict+= -e 's,avl_find,openldap_avl_find,g' +SUBST_SED.conflict+= -e 's,avl_find2,openldap_avl_find2,g' +SUBST_MESSAGE.conflict= Fixing conflicting function prototypes. +.endif + CPPFLAGS.Darwin+= -DBIND_8_COMPAT CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} |