diff options
| author | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2012-10-04 21:36:34 +0200 |
|---|---|---|
| committer | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2012-10-04 21:36:34 +0200 |
| commit | c244e79c9db5c3a87feb645cf64ec974bf4c63ce (patch) | |
| tree | 60671debebd42d7b90d1ed41222c2ac0819bfebc /packages/scripting-languages | |
| parent | 02bd09eea9470d4817d5e13b6d73d3d34c2c7647 (diff) | |
| download | embtoolkit-c244e79c9db5c3a87feb645cf64ec974bf4c63ce.tar.gz embtoolkit-c244e79c9db5c3a87feb645cf64ec974bf4c63ce.tar.bz2 embtoolkit-c244e79c9db5c3a87feb645cf64ec974bf4c63ce.tar.xz | |
Build system: replace SYSROOT -> embtk_sysroot
Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
Diffstat (limited to 'packages/scripting-languages')
4 files changed, 16 insertions, 16 deletions
diff --git a/packages/scripting-languages/lua-modules/cgilua/cgilua.mk b/packages/scripting-languages/lua-modules/cgilua/cgilua.mk index 003066b..5ebf879 100644 --- a/packages/scripting-languages/lua-modules/cgilua/cgilua.mk +++ b/packages/scripting-languages/lua-modules/cgilua/cgilua.mk @@ -34,7 +34,7 @@ CGILUA_LIBS = CGILUA_DEPS = lua_install luafilesystem_install rings_install -CGILUA_MAKE_OPTS = PREFIX=$(SYSROOT)/usr/ +CGILUA_MAKE_OPTS = PREFIX=$(embtk_sysroot)/usr/ cgilua_install: $(call embtk_makeinstall_pkg,cgilua) @@ -43,5 +43,5 @@ define embtk_postinstall_cgilua $(Q)mkdir -p $(ROOTFS) $(Q)mkdir -p $(ROOTFS)/usr $(Q)mkdir -p $(ROOTFS)/usr/share - $(Q)cp -R $(SYSROOT)/usr/share/lua $(ROOTFS)/usr/share/ + $(Q)cp -R $(embtk_sysroot)/usr/share/lua $(ROOTFS)/usr/share/ endef diff --git a/packages/scripting-languages/lua-modules/luafilesystem/luafilesystem.mk b/packages/scripting-languages/lua-modules/luafilesystem/luafilesystem.mk index ff1d413..e9cacde 100644 --- a/packages/scripting-languages/lua-modules/luafilesystem/luafilesystem.mk +++ b/packages/scripting-languages/lua-modules/luafilesystem/luafilesystem.mk @@ -34,10 +34,10 @@ LUAFILESYSTEM_LIBS = LUAFILESYSTEM_DEPS = lua_install -LUAFILESYSTEM_MAKE_OPTS = PREFIX=$(SYSROOT)/usr/ LIBDIR=$(LIBDIR) +LUAFILESYSTEM_MAKE_OPTS = PREFIX=$(embtk_sysroot)/usr/ LIBDIR=$(LIBDIR) LUAFILESYSTEM_MAKE_OPTS += CC=$(TARGETCC_CACHED) -LUAFILESYSTEM_MAKE_OPTS += LDFLAGS="-L$(SYSROOT)/$(LIBDIR) -L$(SYSROOT)/usr/$(LIBDIR)" -LUAFILESYSTEM_MAKE_OPTS += CFLAGS="$(TARGET_CFLAGS) -I$(SYSROOT)/usr/include" +LUAFILESYSTEM_MAKE_OPTS += LDFLAGS="-L$(embtk_sysroot)/$(LIBDIR) -L$(embtk_sysroot)/usr/$(LIBDIR)" +LUAFILESYSTEM_MAKE_OPTS += CFLAGS="$(TARGET_CFLAGS) -I$(embtk_sysroot)/usr/include" luafilesystem_install: $(call embtk_makeinstall_pkg,luafilesystem) @@ -46,5 +46,5 @@ define embtk_postinstall_luafilesystem $(Q)mkdir -p $(ROOTFS) $(Q)mkdir -p $(ROOTFS)/usr $(Q)mkdir -p $(ROOTFS)/usr/$(LIBDIR) - $(Q)cp -R $(SYSROOT)/usr/$(LIBDIR)/lua $(ROOTFS)/usr/$(LIBDIR)/ + $(Q)cp -R $(embtk_sysroot)/usr/$(LIBDIR)/lua $(ROOTFS)/usr/$(LIBDIR)/ endef diff --git a/packages/scripting-languages/lua-modules/rings/rings.mk b/packages/scripting-languages/lua-modules/rings/rings.mk index d353627..05ba548 100644 --- a/packages/scripting-languages/lua-modules/rings/rings.mk +++ b/packages/scripting-languages/lua-modules/rings/rings.mk @@ -34,10 +34,10 @@ RINGS_LIBS = RINGS_DEPS = lua_install -RINGS_MAKE_OPTS = PREFIX=$(SYSROOT)/usr/ LIBDIR=$(LIBDIR) +RINGS_MAKE_OPTS = PREFIX=$(embtk_sysroot)/usr/ LIBDIR=$(LIBDIR) RINGS_MAKE_OPTS += CC=$(TARGETCC_CACHED) -RINGS_MAKE_OPTS += LDFLAGS="-L$(SYSROOT)/$(LIBDIR) -L$(SYSROOT)/usr/$(LIBDIR)" -RINGS_MAKE_OPTS += CFLAGS="$(TARGET_CFLAGS) -I$(SYSROOT)/usr/include" +RINGS_MAKE_OPTS += LDFLAGS="-L$(embtk_sysroot)/$(LIBDIR) -L$(embtk_sysroot)/usr/$(LIBDIR)" +RINGS_MAKE_OPTS += CFLAGS="$(TARGET_CFLAGS) -I$(embtk_sysroot)/usr/include" rings_install: $(call embtk_makeinstall_pkg,rings) @@ -47,6 +47,6 @@ define embtk_postinstall_rings $(Q)mkdir -p $(ROOTFS)/usr $(Q)mkdir -p $(ROOTFS)/usr/$(LIBDIR) $(Q)mkdir -p $(ROOTFS)/usr/share - $(Q)cp -R $(SYSROOT)/usr/$(LIBDIR)/lua $(ROOTFS)/usr/$(LIBDIR)/ - $(Q)cp -R $(SYSROOT)/usr/share/lua $(ROOTFS)/usr/share/ + $(Q)cp -R $(embtk_sysroot)/usr/$(LIBDIR)/lua $(ROOTFS)/usr/$(LIBDIR)/ + $(Q)cp -R $(embtk_sysroot)/usr/share/lua $(ROOTFS)/usr/share/ endef diff --git a/packages/scripting-languages/lua/lua.mk b/packages/scripting-languages/lua/lua.mk index f62fbf2..9e9bb6d 100644 --- a/packages/scripting-languages/lua/lua.mk +++ b/packages/scripting-languages/lua/lua.mk @@ -42,7 +42,7 @@ LUACONF_H_OPTS = -DCONFIG_LUA_ROOT="/usr/" -DCONFIG_SYSTEM_LIBDIR="$(LIBDIR)/" LUACONF_H_OPTS += -DLUA_USE_DLOPEN -DLUA_USE_MKSTEMP -DLUA_USE_ULONGJMP LUACONF_H_OPTS += -DLUA_USE_POPEN -DLUA_USE_ISATTY -LUA_MAKE_OPTS = INSTALL_TOP=$(SYSROOT)/usr/ LIBDIR=$(LIBDIR) PLAT=ansi +LUA_MAKE_OPTS = INSTALL_TOP=$(embtk_sysroot)/usr/ LIBDIR=$(LIBDIR) PLAT=ansi lua_install: $(call embtk_makeinstall_pkg,lua) @@ -50,8 +50,8 @@ lua_install: define embtk_beforeinstall_lua $(Q)$(MAKE) -C $(LUA_BUILD_DIR) PLAT=ansi CC=$(TARGETCC_CACHED) \ AR="$(TARGETAR) rcu" RANLIB=$(TARGETRANLIB) \ - LDFLAGS="-L$(SYSROOT)/$(LIBDIR) -L$(SYSROOT)/usr/$(LIBDIR)" \ - CFLAGS="$(TARGET_CFLAGS) -I$(SYSROOT)/usr/include $(LUACONF_H_OPTS)" + LDFLAGS="-L$(embtk_sysroot)/$(LIBDIR) -L$(embtk_sysroot)/usr/$(LIBDIR)" \ + CFLAGS="$(TARGET_CFLAGS) -I$(embtk_sysroot)/usr/include $(LUACONF_H_OPTS)" endef define embtk_postinstall_lua @@ -59,6 +59,6 @@ define embtk_postinstall_lua $(Q)mkdir -p $(ROOTFS)/usr $(Q)mkdir -p $(ROOTFS)/usr/$(LIBDIR) $(Q)mkdir -p $(ROOTFS)/usr/share - $(Q)cp -R $(SYSROOT)/usr/$(LIBDIR)/lua $(ROOTFS)/usr/$(LIBDIR)/ - $(Q)cp -R $(SYSROOT)/usr/share/lua $(ROOTFS)/usr/share/ + $(Q)cp -R $(embtk_sysroot)/usr/$(LIBDIR)/lua $(ROOTFS)/usr/$(LIBDIR)/ + $(Q)cp -R $(embtk_sysroot)/usr/share/lua $(ROOTFS)/usr/share/ endef |