Thu Feb 23 12:16:32 2012 UTC ()
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.


(shattered)
diff -r1.17 -r1.18 pkgsrc/sysutils/bacula/options.mk
diff -r1.6 -r1.7 pkgsrc/sysutils/bacula-clientonly/options.mk
cvs diff -r1.17 -r1.18 pkgsrc/sysutils/bacula/options.mk (switch to unified diff)

--- pkgsrc/sysutils/bacula/options.mk 2011/06/18 10:40:33 1.17
+++ pkgsrc/sysutils/bacula/options.mk 2012/02/23 12:16:31 1.18
@@ -1,53 +1,54 @@ @@ -1,53 +1,54 @@
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
3PKG_OPTIONS_VAR= PKG_OPTIONS.bacula 3PKG_OPTIONS_VAR= PKG_OPTIONS.bacula
4PKG_SUPPORTED_OPTIONS= bacula-static ssl python 4# bacula-static is broken -- see PR 42954
 5PKG_SUPPORTED_OPTIONS= ssl python
5PKG_OPTIONS_REQUIRED_GROUPS= database 6PKG_OPTIONS_REQUIRED_GROUPS= database
6PKG_OPTIONS_GROUP.database= catalog-sqlite3 catalog-pgsql catalog-mysql 7PKG_OPTIONS_GROUP.database= catalog-sqlite3 catalog-pgsql catalog-mysql
7PKG_SUGGESTED_OPTIONS= catalog-sqlite3 8PKG_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"
13CONFIGURE_ARGS+= --with-sqlite3=${BUILDLINK_PREFIX.sqlite3} 14CONFIGURE_ARGS+= --with-sqlite3=${BUILDLINK_PREFIX.sqlite3}
14BACULA_DB= sqlite3 15BACULA_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"
17CONFIGURE_ARGS+= --with-postgresql=${PGSQL_PREFIX} 18CONFIGURE_ARGS+= --with-postgresql=${PGSQL_PREFIX}
18BACULA_DB= postgresql 19BACULA_DB= postgresql
19.elif !empty(PKG_OPTIONS:Mcatalog-mysql) 20.elif !empty(PKG_OPTIONS:Mcatalog-mysql)
20. include "../../mk/mysql.buildlink3.mk" 21. include "../../mk/mysql.buildlink3.mk"
21CONFIGURE_ARGS+= --with-mysql=${PREFIX} 22CONFIGURE_ARGS+= --with-mysql=${PREFIX}
22BACULA_DB= mysql 23BACULA_DB= mysql
23.endif 24.endif
24 25
25.if !empty(PKG_OPTIONS:Mpython) 26.if !empty(PKG_OPTIONS:Mpython)
26. include "../../lang/python/application.mk" 27. include "../../lang/python/application.mk"
27. include "${PYPKGSRCDIR}/buildlink3.mk" 28. include "${PYPKGSRCDIR}/buildlink3.mk"
28CONFIGURE_ARGS+= --with-python=yes 29CONFIGURE_ARGS+= --with-python=yes
29CONFIGURE_ENV+= PYVERSSUFFIX=${PYVERSSUFFIX} 30CONFIGURE_ENV+= PYVERSSUFFIX=${PYVERSSUFFIX}
30# we can't use REPLACE_INTERPRETER here because ./configure fills in the 31# we can't use REPLACE_INTERPRETER here because ./configure fills in the
31# python path and the replace-interpreter stage happens before that. 32# python path and the replace-interpreter stage happens before that.
32SUBST_CLASSES+= python 33SUBST_CLASSES+= python
33SUBST_MESSAGE.python= Fixing Python interpreter path. 34SUBST_MESSAGE.python= Fixing Python interpreter path.
34SUBST_STAGE.python= post-configure 35SUBST_STAGE.python= post-configure
35SUBST_FILES.python= scripts/dvd-handler 36SUBST_FILES.python= scripts/dvd-handler
36SUBST_SED.python= -e '1s,^\#!.*,\#! ${PYTHONBIN},' 37SUBST_SED.python= -e '1s,^\#!.*,\#! ${PYTHONBIN},'
37.endif 38.endif
38 39
39.if !empty(PKG_OPTIONS:Mbacula-static) 40.if !empty(PKG_OPTIONS:Mbacula-static)
40CONFIGURE_ARGS+= --enable-static-cons 41CONFIGURE_ARGS+= --enable-static-cons
41CONFIGURE_ARGS+= --enable-static-dir 42CONFIGURE_ARGS+= --enable-static-dir
42CONFIGURE_ARGS+= --enable-static-fd 43CONFIGURE_ARGS+= --enable-static-fd
43CONFIGURE_ARGS+= --enable-static-sd 44CONFIGURE_ARGS+= --enable-static-sd
44CONFIGURE_ARGS+= --enable-static-tools 45CONFIGURE_ARGS+= --enable-static-tools
45PLIST_SUBST+= STATIC= 46PLIST_SUBST+= STATIC=
46.else 47.else
47PLIST_SUBST+= STATIC="@comment " 48PLIST_SUBST+= STATIC="@comment "
48.endif 49.endif
49 50
50.if !empty(PKG_OPTIONS:Mssl) 51.if !empty(PKG_OPTIONS:Mssl)
51. include "../../security/openssl/buildlink3.mk" 52. include "../../security/openssl/buildlink3.mk"
52CONFIGURE_ARGS+= --with-openssl=${BUILDLINK_PREFIX.openssl} 53CONFIGURE_ARGS+= --with-openssl=${BUILDLINK_PREFIX.openssl}
53.endif 54.endif
cvs diff -r1.6 -r1.7 pkgsrc/sysutils/bacula-clientonly/options.mk (switch to unified diff)

--- pkgsrc/sysutils/bacula-clientonly/options.mk 2012/02/03 09:57:19 1.6
+++ pkgsrc/sysutils/bacula-clientonly/options.mk 2012/02/23 12:16:32 1.7
@@ -1,23 +1,24 @@ @@ -1,23 +1,24 @@
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
3PKG_OPTIONS_VAR= PKG_OPTIONS.bacula-clientonly 3PKG_OPTIONS_VAR= PKG_OPTIONS.bacula-clientonly
4PKG_SUPPORTED_OPTIONS= bacula-static ssl 4# bacula-static is broken -- see PR 42954
 5PKG_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)
9CONFIGURE_ARGS+= --enable-static-cons 10CONFIGURE_ARGS+= --enable-static-cons
10CONFIGURE_ARGS+= --enable-static-dir 11CONFIGURE_ARGS+= --enable-static-dir
11CONFIGURE_ARGS+= --enable-static-fd 12CONFIGURE_ARGS+= --enable-static-fd
12CONFIGURE_ARGS+= --enable-static-sd 13CONFIGURE_ARGS+= --enable-static-sd
13CONFIGURE_ARGS+= --enable-static-tools 14CONFIGURE_ARGS+= --enable-static-tools
14CONFIGURE_ARGS+= --disable-libtool 15CONFIGURE_ARGS+= --disable-libtool
15PLIST_SUBST+= STATIC= 16PLIST_SUBST+= STATIC=
16.else 17.else
17PLIST_SUBST+= STATIC="@comment " 18PLIST_SUBST+= STATIC="@comment "
18.endif 19.endif
19 20
20.if !empty(PKG_OPTIONS:Mssl) 21.if !empty(PKG_OPTIONS:Mssl)
21. include "../../security/openssl/buildlink3.mk" 22. include "../../security/openssl/buildlink3.mk"
22CONFIGURE_ARGS+= --with-openssl=${BUILDLINK_PREFIX.openssl} 23CONFIGURE_ARGS+= --with-openssl=${BUILDLINK_PREFIX.openssl}
23.endif 24.endif