Bug 28765: LibEvent Build for Android

projects/libevent/build

@@ -11,7 +11,7 @@ cd /var/tmp/build/[% project %]-[% c('version') %]
   export MACOSX_DEPLOYMENT_TARGET=[% c("var/macosx_deployment_target") %]
 [% END -%]
 ./autogen.sh
-./configure --disable-static [% c("var/configure_opt") %] --disable-libevent-regress --disable-samples --prefix=$distdir
+./configure [% c("var/configure_opt") %] --disable-libevent-regress --disable-samples --prefix=$distdir
 [% IF c("var/osx") -%]
   export LD_PRELOAD=[% c("var/faketime_path") %]
   export FAKETIME="[% USE date; GET date.format(c('timestamp'), format = '%Y-%m-%d %H:%M:%S') %]"

projects/libevent/config

@@ -9,12 +9,16 @@ filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/buil
 var:
   container:
     use_container: 1
+  configure_opt_project: --disable-static
 
 targets:
   osx-x86_64:
     var:
       arch_deps:
         - faketime
+  android:
+    var:
+      configure_opt_project: --disable-shared
 
 input_files:
   - project: container-image

rbm.conf

@@ -289,12 +289,12 @@ targets:
     var:
       linux-i686: 1
       osname: linux-i686
-      configure_opt_i686: '--host=i686-linux-gnu CFLAGS=-m32 CXXFLAGS=-m32 LDFLAGS=-m32'
-      configure_opt: '[% c("var/configure_opt_i686") %]'
+      configure_opt: '--host=i686-linux-gnu CFLAGS=-m32 CXXFLAGS=-m32 LDFLAGS=-m32 [% c("var/configure_opt_project") %]'
   linux:
     var:
       linux: 1
       compiler: gcc
+      configure_opt: '[% c("var/configure_opt_project") %]'
       # We only build snowflake on the alpha and nightly
       # channels for now.
       snowflake: '[% c("var/alpha") || c("var/nightly") %]'
@@ -343,7 +343,7 @@ targets:
       container:
         suite: stretch
         arch: amd64
-      configure_opt: '--host=[% c("arch") %]-w64-mingw32 CFLAGS="[% c("var/CFLAGS") %]" LDFLAGS="[% c("var/LDFLAGS") %]"'
+      configure_opt: '--host=[% c("arch") %]-w64-mingw32 CFLAGS="[% c("var/CFLAGS") %]" LDFLAGS="[% c("var/LDFLAGS") %]" [% c("var/configure_opt_project") %]'
       CFLAGS: '-fstack-protector-strong -fno-strict-overflow -Wno-missing-field-initializers -Wformat -Wformat-security [% c("var/flag_mwindows") %]'
       LDFLAGS: '-Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -Wl,--no-insert-timestamp -lssp -L$gcclibs [% c("var/flag_HEASLR") %] [% c("var/flag_mwindows") %]'
       flag_mwindows: '-mwindows'
@@ -372,7 +372,7 @@ targets:
         suite: stretch
         arch: amd64
       compiler: 'macosx-toolchain'
-      configure_opt: '--host=x86_64-apple-darwin11 CC="x86_64-apple-darwin11-clang [% c("var/FLAGS") %]" CXX="x86_64-apple-darwin11-clang++ [% c("var/FLAGS") %]"'
+      configure_opt: '--host=x86_64-apple-darwin11 CC="x86_64-apple-darwin11-clang [% c("var/FLAGS") %]" CXX="x86_64-apple-darwin11-clang++ [% c("var/FLAGS") %]" [% c("var/configure_opt_project") %]'
       FLAGS: "-target x86_64-apple-darwin11 -B $cctoolsdir -isysroot $sysrootdir"
       LDFLAGS: "-Wl,-syslibroot,$sysrootdir -Wl,-dead_strip -Wl,-pie"
       macosx_deployment_target: '10.9'