From 6ed916653f67b93eba27e6594c0ff1b526de8ad9 Mon Sep 17 00:00:00 2001 From: Josh Haberman Date: Sun, 31 Aug 2014 15:07:37 -0700 Subject: Rewrite of build system. Notable changes: - We now only build things by default that require no dependencies. So you can build upb even if you don't have Lua or Google protobuf installed. - Checked in a pre-built version of the JIT, so you don't need Lua installed at build time to run DynASM. It will still notice if you change the .dasc file and attempt to re-run DynASM in that case. - The build system now builds all modules of upb into separate libraries, reflecting the modularity that is already inherent in upb's design. This should make it easier to trim the fat. - removed the GDB JIT interface. I wasn't using it much; using a .so is easier and more robust. --- upb/bindings/lua/upb.c | 1 + upb/bindings/ruby/extconf.rb | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'upb/bindings') diff --git a/upb/bindings/lua/upb.c b/upb/bindings/lua/upb.c index dbeb937..f938b26 100644 --- a/upb/bindings/lua/upb.c +++ b/upb/bindings/lua/upb.c @@ -1622,6 +1622,7 @@ static void lupb_sethasbit(lupb_msg *msg, uint32_t hasbit) { static size_t strhandler(void *closure, const void *hd, const char *str, size_t len, const upb_bufhandle *handle) { + UPB_UNUSED(handle); lupb_msg *msg = closure; const lupb_handlerdata *data = hd; lua_State *L = msg->lmd->L; diff --git a/upb/bindings/ruby/extconf.rb b/upb/bindings/ruby/extconf.rb index 67fddba..3637511 100644 --- a/upb/bindings/ruby/extconf.rb +++ b/upb/bindings/ruby/extconf.rb @@ -2,6 +2,8 @@ require 'mkmf' find_header("upb/upb.h", "../../..") or raise "Can't find upb headers" -find_library("upb_pic", "upb_msgdef_new", "../..") or raise "Can't find upb lib" +find_library("upb_pic", "upb_msgdef_new", "../../../lib") or raise "Can't find upb lib" +find_library("upb.pb_pic", "upb_decoder_init", "../../../lib") or raise "Can't find upb.pb lib" +find_library("upb.descriptor_pic", "upb_descreader_init", "../../../lib") or raise "Can't find upb.descriptor lib" $CFLAGS += " -Wall" create_makefile("upb") -- cgit v1.2.3