Sun Nov 14 12:09:22 2010 UTC ()
PHP has grown a new flag; disable building the PHP extension as well if we
disable PHP. This fixes the build with PHP disabled.


(tonnerre)
diff -r1.2 -r1.3 pkgsrc/devel/libthrift/options.mk
cvs diff -r1.2 -r1.3 pkgsrc/devel/libthrift/Attic/options.mk (switch to unified diff)

--- pkgsrc/devel/libthrift/Attic/options.mk 2010/10/16 11:38:05 1.2
+++ pkgsrc/devel/libthrift/Attic/options.mk 2010/11/14 12:09:22 1.3
@@ -1,86 +1,88 @@ @@ -1,86 +1,88 @@
1# $NetBSD: options.mk,v 1.2 2010/10/16 11:38:05 tonnerre Exp $ 1# $NetBSD: options.mk,v 1.3 2010/11/14 12:09:22 tonnerre Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.libthrift 3PKG_OPTIONS_VAR= PKG_OPTIONS.libthrift
4PKG_SUPPORTED_OPTIONS= csharp java erlang python perl php ruby 4PKG_SUPPORTED_OPTIONS= csharp java erlang python perl php ruby
5 5
6.include "../../mk/bsd.options.mk" 6.include "../../mk/bsd.options.mk"
7 7
8PLIST_VARS+= perl erlang 8PLIST_VARS+= perl erlang
9 9
10.if !empty(PKG_OPTIONS:Mcsharp) 10.if !empty(PKG_OPTIONS:Mcsharp)
11CONFIGURE_ARGS+= --with-csharp 11CONFIGURE_ARGS+= --with-csharp
12CONFIGURE_ARGS+= --enable-gen-csharp 12CONFIGURE_ARGS+= --enable-gen-csharp
13 13
14.include "../../lang/mono/buildlink3.mk" 14.include "../../lang/mono/buildlink3.mk"
15.else 15.else
16CONFIGURE_ARGS+= --without-csharp 16CONFIGURE_ARGS+= --without-csharp
17CONFIGURE_ARGS+= --disable-gen-csharp 17CONFIGURE_ARGS+= --disable-gen-csharp
18.endif 18.endif
19 19
20.if !empty(PKG_OPTIONS:Mjava) 20.if !empty(PKG_OPTIONS:Mjava)
21CONFIGURE_ARGS+= --with-java 21CONFIGURE_ARGS+= --with-java
22CONFIGURE_ARGS+= --enable-gen-java 22CONFIGURE_ARGS+= --enable-gen-java
23 23
24.include "../../lang/openjdk7/buildlink3.mk" 24.include "../../lang/openjdk7/buildlink3.mk"
25.else 25.else
26CONFIGURE_ARGS+= --without-java 26CONFIGURE_ARGS+= --without-java
27CONFIGURE_ARGS+= --disable-gen-java 27CONFIGURE_ARGS+= --disable-gen-java
28.endif 28.endif
29 29
30.if !empty(PKG_OPTIONS:Merlang) 30.if !empty(PKG_OPTIONS:Merlang)
31CONFIGURE_ARGS+= --with-erlang 31CONFIGURE_ARGS+= --with-erlang
32CONFIGURE_ARGS+= --enable-gen-erl 32CONFIGURE_ARGS+= --enable-gen-erl
33PLIST.erlang= yes 33PLIST.erlang= yes
34 34
35.include "../../lang/erlang/buildlink3.mk" 35.include "../../lang/erlang/buildlink3.mk"
36.else 36.else
37CONFIGURE_ARGS+= --without-erlang 37CONFIGURE_ARGS+= --without-erlang
38CONFIGURE_ARGS+= --disable-gen-erl 38CONFIGURE_ARGS+= --disable-gen-erl
39.endif 39.endif
40 40
41.if !empty(PKG_OPTIONS:Mpython) 41.if !empty(PKG_OPTIONS:Mpython)
42CONFIGURE_ARGS+= --with-py 42CONFIGURE_ARGS+= --with-py
43CONFIGURE_ARGS+= --enable-gen-py 43CONFIGURE_ARGS+= --enable-gen-py
44 44
45.include "../../lang/python/extension.mk" 45.include "../../lang/python/extension.mk"
46.else 46.else
47CONFIGURE_ARGS+= --without-py 47CONFIGURE_ARGS+= --without-py
48CONFIGURE_ARGS+= --disable-gen-py 48CONFIGURE_ARGS+= --disable-gen-py
49.endif 49.endif
50 50
51.if !empty(PKG_OPTIONS:Mperl) 51.if !empty(PKG_OPTIONS:Mperl)
52CONFIGURE_ARGS+= --with-perl 52CONFIGURE_ARGS+= --with-perl
53CONFIGURE_ARGS+= --enable-gen-perl 53CONFIGURE_ARGS+= --enable-gen-perl
54CONFIGURE_ENV+= PERL_PREFIX=${PREFIX} 54CONFIGURE_ENV+= PERL_PREFIX=${PREFIX}
55MAKE_ENV+= INSTALLDIRS=vendor 55MAKE_ENV+= INSTALLDIRS=vendor
56PERL5_CONFIGURE= NO 56PERL5_CONFIGURE= NO
57USE_TOOLS+= perl 57USE_TOOLS+= perl
58PLIST.perl= yes 58PLIST.perl= yes
59 59
60PERL5_PACKLIST= auto/Thrift/.packlist 60#PERL5_PACKLIST= auto/Thrift/.packlist
61 61
62.include "../../lang/perl5/module.mk" 62.include "../../lang/perl5/module.mk"
63.else 63.else
64CONFIGURE_ARGS+= --without-perl 64CONFIGURE_ARGS+= --without-perl
65CONFIGURE_ARGS+= --disable-gen-perl 65CONFIGURE_ARGS+= --disable-gen-perl
66.endif 66.endif
67 67
68.if !empty(PKG_OPTIONS:Mphp) 68.if !empty(PKG_OPTIONS:Mphp)
69CONFIGURE_ARGS+= --with-php 69CONFIGURE_ARGS+= --with-php
 70CONFIGURE_ARGS+= --with-php_extension
70CONFIGURE_ARGS+= --enable-gen-php 71CONFIGURE_ARGS+= --enable-gen-php
71 72
72.include "../../lang/php/ext.mk" 73.include "../../lang/php/ext.mk"
73.else 74.else
74CONFIGURE_ARGS+= --without-php 75CONFIGURE_ARGS+= --without-php
 76CONFIGURE_ARGS+= --without-php_extension
75CONFIGURE_ARGS+= --disable-gen-php 77CONFIGURE_ARGS+= --disable-gen-php
76.endif 78.endif
77 79
78.if !empty(PKG_OPTIONS:Mruby) 80.if !empty(PKG_OPTIONS:Mruby)
79CONFIGURE_ARGS+= --with-ruby 81CONFIGURE_ARGS+= --with-ruby
80CONFIGURE_ARGS+= --enable-gen-rb 82CONFIGURE_ARGS+= --enable-gen-rb
81 83
82.include "../../lang/ruby/buildlink3.mk" 84.include "../../lang/ruby/buildlink3.mk"
83.else 85.else
84CONFIGURE_ARGS+= --without-ruby 86CONFIGURE_ARGS+= --without-ruby
85CONFIGURE_ARGS+= --disable-gen-rb 87CONFIGURE_ARGS+= --disable-gen-rb
86.endif 88.endif