convert to SLOT-ed libbase
See this thread for background info:
https://groups.google.com/a/chromium.org/group/chromium-os-dev/browse_thread/thread/75a1fdee269c41e4
BUG=chromium-os:16623
TEST=`emerge-x86-alex update_engine` still works
TEST=`cros_run_unit_tests --board x86-alex -p update_engine` passes
Change-Id: I9eb597ccd4d0cf6fb290e4410fd153546e4cddf0
Reviewed-on: https://gerrit.chromium.org/gerrit/17697
Reviewed-by: Gilad Arnold <garnold@chromium.org>
Reviewed-by: Darin Petkov <petkov@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
Commit-Ready: Mike Frysinger <vapier@chromium.org>
diff --git a/SConstruct b/SConstruct
index ba33d52..e2f21d0 100644
--- a/SConstruct
+++ b/SConstruct
@@ -193,8 +193,8 @@
-I/usr/include/libxml2""".split());
env['CCFLAGS'] += (' ' + ' '.join(env['CFLAGS']))
-env['LIBS'] = Split("""base
- bz2
+BASE_VER = os.environ.get('BASE_VER', '85268')
+env['LIBS'] = Split("""bz2
crypto
curl
ext2fs
@@ -203,13 +203,13 @@
gthread-2.0
libpcrecpp
metrics
- policy
+ policy-%s
protobuf
pthread
rootdev
ssl
udev
- xml2""")
+ xml2""" % BASE_VER)
env['CPPPATH'] = ['..']
env['BUILDERS']['ProtocolBuffer'] = proto_builder
env['BUILDERS']['DbusBindings'] = dbus_bindings_builder
@@ -224,7 +224,8 @@
pkgconfig = os.environ.get('PKG_CONFIG', 'pkg-config')
env.ParseConfig(pkgconfig + ' --cflags --libs '
- 'dbus-1 dbus-glib-1 gio-2.0 gio-unix-2.0 glib-2.0 libchromeos')
+ 'dbus-1 dbus-glib-1 gio-2.0 gio-unix-2.0 glib-2.0 libchrome-%s '
+ 'libchromeos-%s' % (BASE_VER, BASE_VER))
env.ProtocolBuffer('update_metadata.pb.cc', 'update_metadata.proto')
env.PublicKey('unittest_key.pub.pem', 'unittest_key.pem')
env.PublicKey('unittest_key2.pub.pem', 'unittest_key2.pem')