PR/42954: bacula-static option is broken. It requires non-libtool build, but Makefiles' "all" targets include both dynamic and static targets. Package PLISTs also don't support static-only build.diff -r1.17 -r1.18 pkgsrc/sysutils/bacula/options.mk
(shattered)
@@ -1,17 +1,18 @@ | @@ -1,17 +1,18 @@ | |||
1 | # $NetBSD: options.mk,v 1.17 2011/06/18 10:40:33 shattered Exp $ | 1 | # $NetBSD: options.mk,v 1.18 2012/02/23 12:16:31 shattered Exp $ | |
2 | 2 | |||
3 | PKG_OPTIONS_VAR= PKG_OPTIONS.bacula | 3 | PKG_OPTIONS_VAR= PKG_OPTIONS.bacula | |
4 | PKG_SUPPORTED_OPTIONS= bacula-static ssl python | 4 | # bacula-static is broken -- see PR 42954 | |
5 | PKG_SUPPORTED_OPTIONS= ssl python | |||
5 | PKG_OPTIONS_REQUIRED_GROUPS= database | 6 | PKG_OPTIONS_REQUIRED_GROUPS= database | |
6 | PKG_OPTIONS_GROUP.database= catalog-sqlite3 catalog-pgsql catalog-mysql | 7 | PKG_OPTIONS_GROUP.database= catalog-sqlite3 catalog-pgsql catalog-mysql | |
7 | PKG_SUGGESTED_OPTIONS= catalog-sqlite3 | 8 | PKG_SUGGESTED_OPTIONS= catalog-sqlite3 | |
8 | 9 | |||
9 | .include "../../mk/bsd.options.mk" | 10 | .include "../../mk/bsd.options.mk" | |
10 | 11 | |||
11 | .if !empty(PKG_OPTIONS:Mcatalog-sqlite3) | 12 | .if !empty(PKG_OPTIONS:Mcatalog-sqlite3) | |
12 | . include "../../databases/sqlite3/buildlink3.mk" | 13 | . include "../../databases/sqlite3/buildlink3.mk" | |
13 | CONFIGURE_ARGS+= --with-sqlite3=${BUILDLINK_PREFIX.sqlite3} | 14 | CONFIGURE_ARGS+= --with-sqlite3=${BUILDLINK_PREFIX.sqlite3} | |
14 | BACULA_DB= sqlite3 | 15 | BACULA_DB= sqlite3 | |
15 | .elif !empty(PKG_OPTIONS:Mcatalog-pgsql) | 16 | .elif !empty(PKG_OPTIONS:Mcatalog-pgsql) | |
16 | . include "../../mk/pgsql.buildlink3.mk" | 17 | . include "../../mk/pgsql.buildlink3.mk" | |
17 | CONFIGURE_ARGS+= --with-postgresql=${PGSQL_PREFIX} | 18 | CONFIGURE_ARGS+= --with-postgresql=${PGSQL_PREFIX} |
@@ -1,17 +1,18 @@ | @@ -1,17 +1,18 @@ | |||
1 | # $NetBSD: options.mk,v 1.6 2012/02/03 09:57:19 shattered Exp $ | 1 | # $NetBSD: options.mk,v 1.7 2012/02/23 12:16:32 shattered Exp $ | |
2 | 2 | |||
3 | PKG_OPTIONS_VAR= PKG_OPTIONS.bacula-clientonly | 3 | PKG_OPTIONS_VAR= PKG_OPTIONS.bacula-clientonly | |
4 | PKG_SUPPORTED_OPTIONS= bacula-static ssl | 4 | # bacula-static is broken -- see PR 42954 | |
5 | PKG_SUPPORTED_OPTIONS= ssl | |||
5 | 6 | |||
6 | .include "../../mk/bsd.options.mk" | 7 | .include "../../mk/bsd.options.mk" | |
7 | 8 | |||
8 | .if !empty(PKG_OPTIONS:Mbacula-static) | 9 | .if !empty(PKG_OPTIONS:Mbacula-static) | |
9 | CONFIGURE_ARGS+= --enable-static-cons | 10 | CONFIGURE_ARGS+= --enable-static-cons | |
10 | CONFIGURE_ARGS+= --enable-static-dir | 11 | CONFIGURE_ARGS+= --enable-static-dir | |
11 | CONFIGURE_ARGS+= --enable-static-fd | 12 | CONFIGURE_ARGS+= --enable-static-fd | |
12 | CONFIGURE_ARGS+= --enable-static-sd | 13 | CONFIGURE_ARGS+= --enable-static-sd | |
13 | CONFIGURE_ARGS+= --enable-static-tools | 14 | CONFIGURE_ARGS+= --enable-static-tools | |
14 | CONFIGURE_ARGS+= --disable-libtool | 15 | CONFIGURE_ARGS+= --disable-libtool | |
15 | PLIST_SUBST+= STATIC= | 16 | PLIST_SUBST+= STATIC= | |
16 | .else | 17 | .else | |
17 | PLIST_SUBST+= STATIC="@comment " | 18 | PLIST_SUBST+= STATIC="@comment " |