diff options
| author | Wolfgang Schupp <w.schupp@a1.net> | 2014-05-03 07:04:59 +0200 |
|---|---|---|
| committer | Wolfgang Schupp <w.schupp@a1.net> | 2014-05-03 07:04:59 +0200 |
| commit | 7f7623920036685f46dc26724880f3dd1de0a0a2 (patch) | |
| tree | 45c3f0e9caac4406a9ec1095ad26eec59f83d77c | |
| parent | af7ffe0b4afb2cc23b0b27fc03afb98009de4a7d (diff) | |
| parent | dd312c213f7cb9124030066cbe46512124f20b33 (diff) | |
Merge pull request #4634 from wsnipex/upstream-master
fix JsonBuilder on rpi
| -rw-r--r-- | codegenerator.mk | 3 | ||||
| -rwxr-xr-x | tools/buildsteps/rbpi/prepare-xbmc | 3 | ||||
| -rw-r--r-- | tools/depends/native/JsonSchemaBuilder/Makefile | 13 |
3 files changed, 16 insertions, 3 deletions
diff --git a/codegenerator.mk b/codegenerator.mk index 02b08e5ca6..0cd5309035 100644 --- a/codegenerator.mk +++ b/codegenerator.mk @@ -20,8 +20,11 @@ endif GENERATED_JSON = $(INTERFACES_DIR)/json-rpc/ServiceDescription.h ifeq ($(wildcard $(JSON_BUILDER)),) + JSON_BUILDER = $(shell which JsonSchemaBuilder) +ifeq ($(JSON_BUILDER),) JSON_BUILDER = tools/depends/native/JsonSchemaBuilder/JsonSchemaBuilder endif +endif GENDIR = $(INTERFACES_DIR)/python/generated GROOVY_DIR = $(TOPDIR)/lib/groovy diff --git a/tools/buildsteps/rbpi/prepare-xbmc b/tools/buildsteps/rbpi/prepare-xbmc index 36e91b4367..c47ee7dd9d 100755 --- a/tools/buildsteps/rbpi/prepare-xbmc +++ b/tools/buildsteps/rbpi/prepare-xbmc @@ -2,4 +2,5 @@ WORKSPACE=${WORKSPACE:-$( cd $(dirname $0)/../../.. ; pwd -P )} XBMC_PLATFORM_DIR=rbpi . $WORKSPACE/tools/buildsteps/defaultenv -cd $WORKSPACE;./bootstrap;autoreconf -vif +cd $WORKSPACE +JSON_BUILDER=$XBMC_DEPENDS_ROOT/i686-linux-gnu-native/bin/JsonSchemaBuilder ./bootstrap diff --git a/tools/depends/native/JsonSchemaBuilder/Makefile b/tools/depends/native/JsonSchemaBuilder/Makefile index 2503bb5e76..e2fccf7917 100644 --- a/tools/depends/native/JsonSchemaBuilder/Makefile +++ b/tools/depends/native/JsonSchemaBuilder/Makefile @@ -6,12 +6,21 @@ else PREFIX = $(NATIVEPREFIX)/bin endif -all: $(PREFIX)/JsonSchemaBuilder +ifeq ($(NATIVEPLATFORM),) + PLATFORM = native +else + PLATFORM = $(NATIVEPLATFORM) +endif + +all: .installed-$(PLATFORM) $(PREFIX)/JsonSchemaBuilder: make -C src cp src/JsonSchemaBuilder $(PREFIX) clean: - @rm -f JsonSchemaBuilder make -C src clean + @rm -f JsonSchemaBuilder .installed-$(PLATFORM) + +.installed-$(PLATFORM): $(PREFIX)/JsonSchemaBuilder + touch $@ |