From c244e79c9db5c3a87feb645cf64ec974bf4c63ce Mon Sep 17 00:00:00 2001 From: Abdoulaye Walsimou Gaye Date: Thu, 4 Oct 2012 21:36:34 +0200 Subject: Build system: replace SYSROOT -> embtk_sysroot Signed-off-by: Abdoulaye Walsimou Gaye --- packages/compression/zlib/zlib.mk | 4 +- packages/development/gdb/gdb.mk | 2 +- packages/graphics/directfb/directfb.mk | 58 +++++++++++----------- packages/graphics/fontconfig/fontconfig.mk | 6 +-- packages/graphics/gtk/gtk.mk | 26 +++++----- packages/graphics/imlib2/imlib2.mk | 4 +- packages/graphics/pango/pango.mk | 8 +-- packages/misc/gettext/gettext.mk | 14 +++--- packages/misc/ncurses/ncurses.mk | 2 +- packages/misc/tslib/tslib.mk | 2 +- .../lua-modules/cgilua/cgilua.mk | 4 +- .../lua-modules/luafilesystem/luafilesystem.mk | 8 +-- .../scripting-languages/lua-modules/rings/rings.mk | 10 ++-- packages/scripting-languages/lua/lua.mk | 10 ++-- packages/security/openssl/openssl.mk | 4 +- packages/system/dbus/dbus.mk | 2 +- packages/system/upstart/upstart.mk | 18 +++---- packages/x11/libx11/libx11.mk | 8 +-- packages/x11/libxcb/libxcb.mk | 4 +- packages/x11/xcbutil/xcbutil.mk | 10 ++-- packages/x11/xf86inputevdev/xf86inputevdev.mk | 2 +- packages/x11/xf86videofbdev/xf86videofbdev.mk | 2 +- packages/x11/xkeyboardconfig/xkeyboardconfig.mk | 2 +- packages/x11/xserver/xserver.mk | 2 +- 24 files changed, 106 insertions(+), 106 deletions(-) (limited to 'packages') diff --git a/packages/compression/zlib/zlib.mk b/packages/compression/zlib/zlib.mk index f6f823b..86a2279 100644 --- a/packages/compression/zlib/zlib.mk +++ b/packages/compression/zlib/zlib.mk @@ -58,8 +58,8 @@ define embtk_configure_zlib OBJCOPY=$(TARGETOBJCOPY) \ CFLAGS="$(TARGET_CFLAGS)" \ CXXFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="-L$(SYSROOT)/$(LIBDIR) -L$(SYSROOT)/usr/$(LIBDIR)" \ - CPPFLAGS="-I$(SYSROOT)/usr/include" \ + LDFLAGS="-L$(embtk_sysroot)/$(LIBDIR) -L$(embtk_sysroot)/usr/$(LIBDIR)" \ + CPPFLAGS="-I$(embtk_sysroot)/usr/include" \ PKG_CONFIG=$(PKGCONFIG_BIN) \ PKG_CONFIG_PATH=$(EMBTK_PKG_CONFIG_PATH) \ $(ZLIB_CONFIGURE_ENV) \ diff --git a/packages/development/gdb/gdb.mk b/packages/development/gdb/gdb.mk index 6247ccd..a68f16b 100644 --- a/packages/development/gdb/gdb.mk +++ b/packages/development/gdb/gdb.mk @@ -66,7 +66,7 @@ $(GDB_BUILD_DIR)/.gdbserver_installed: $(GDB_DEPS) \ $(GDB_BUILD_DIR)/.gdbserver_configured $(Q)$(MAKE) -C $(GDB_BUILD_DIR) $(J) $(Q)$(MAKE) -C $(GDB_BUILD_DIR)/gdb/gdbserver \ - DESTDIR=$(SYSROOT)/$(GDB_SYSROOT_SUFFIX) install + DESTDIR=$(embtk_sysroot)/$(GDB_SYSROOT_SUFFIX) install $(Q)$(MAKE) libtool_files_adapt @touch $@ diff --git a/packages/graphics/directfb/directfb.mk b/packages/graphics/directfb/directfb.mk index c9c54d1..4d82b9c 100644 --- a/packages/graphics/directfb/directfb.mk +++ b/packages/graphics/directfb/directfb.mk @@ -107,54 +107,54 @@ define embtk_postinstall_directfb $(Q)-cp $(DIRECTFB_BUILD_DIR)/fb.modes $(ROOTFS)/etc $(Q)mkdir -p $(ROOTFS)/usr $(Q)mkdir -p $(ROOTFS)/usr/$(LIBDIR) - $(Q)-cp -R $(SYSROOT)/usr/lib/directfb-*-* $(ROOTFS)/usr/$(LIBDIR) + $(Q)-cp -R $(embtk_sysroot)/usr/lib/directfb-*-* $(ROOTFS)/usr/$(LIBDIR) endef $(DIRECTFB_BUILD_DIR)/.patchlibtool: ifeq ($(CONFIG_EMBTK_64BITS_FS_COMPAT32),y) - $(Q)DIRECTFB_LT_FILES=`find $(SYSROOT)/usr/lib32/directfb-* -type f -name *.la`; \ + $(Q)DIRECTFB_LT_FILES=`find $(embtk_sysroot)/usr/lib32/directfb-* -type f -name *.la`; \ for i in $$DIRECTFB_LT_FILES; \ do \ sed \ - -e "s; \/usr\/lib32\/libfusion.la ; $(SYSROOT)\/usr\/lib32\/libfusion.la ;" \ - -e "s; \/usr\/lib32\/libdirect.la ; $(SYSROOT)\/usr\/lib32\/libdirect.la ;" \ - -e "s; \/usr\/lib32\/libdirectfb.la ; $(SYSROOT)\/usr\/lib32\/libdirectfb.la ;" \ + -e "s; \/usr\/lib32\/libfusion.la ; $(embtk_sysroot)\/usr\/lib32\/libfusion.la ;" \ + -e "s; \/usr\/lib32\/libdirect.la ; $(embtk_sysroot)\/usr\/lib32\/libdirect.la ;" \ + -e "s; \/usr\/lib32\/libdirectfb.la ; $(embtk_sysroot)\/usr\/lib32\/libdirectfb.la ;" \ < $$i > $$i.new; \ mv $$i.new $$i; \ done $(Q)sed \ - -e "s; \/usr\/lib32\/libfusion.la ; $(SYSROOT)\/usr\/lib32\/libfusion.la ;" \ - -e "s; \/usr\/lib32\/libdirect.la ; $(SYSROOT)\/usr\/lib32\/libdirect.la ;" \ - -e "s; \/usr\/lib32\/libdirectfb.la ; $(SYSROOT)\/usr\/lib32\/libdirectfb.la ;" \ - < $(SYSROOT)/usr/lib32/libfusion.la > libfusion.la.new; \ - mv libfusion.la.new $(SYSROOT)/usr/lib32/libfusion.la + -e "s; \/usr\/lib32\/libfusion.la ; $(embtk_sysroot)\/usr\/lib32\/libfusion.la ;" \ + -e "s; \/usr\/lib32\/libdirect.la ; $(embtk_sysroot)\/usr\/lib32\/libdirect.la ;" \ + -e "s; \/usr\/lib32\/libdirectfb.la ; $(embtk_sysroot)\/usr\/lib32\/libdirectfb.la ;" \ + < $(embtk_sysroot)/usr/lib32/libfusion.la > libfusion.la.new; \ + mv libfusion.la.new $(embtk_sysroot)/usr/lib32/libfusion.la $(Q)sed \ - -e "s; \/usr\/lib32\/libfusion.la ; $(SYSROOT)\/usr\/lib32\/libfusion.la ;" \ - -e "s; \/usr\/lib32\/libdirect.la ; $(SYSROOT)\/usr\/lib32\/libdirect.la ;" \ - -e "s; \/usr\/lib32\/libdirectfb.la ; $(SYSROOT)\/usr\/lib32\/libdirectfb.la ;" \ - < $(SYSROOT)/usr/lib32/libdirectfb.la > libdirectfb.la.new; \ - mv libdirectfb.la.new $(SYSROOT)/usr/lib32/libdirectfb.la + -e "s; \/usr\/lib32\/libfusion.la ; $(embtk_sysroot)\/usr\/lib32\/libfusion.la ;" \ + -e "s; \/usr\/lib32\/libdirect.la ; $(embtk_sysroot)\/usr\/lib32\/libdirect.la ;" \ + -e "s; \/usr\/lib32\/libdirectfb.la ; $(embtk_sysroot)\/usr\/lib32\/libdirectfb.la ;" \ + < $(embtk_sysroot)/usr/lib32/libdirectfb.la > libdirectfb.la.new; \ + mv libdirectfb.la.new $(embtk_sysroot)/usr/lib32/libdirectfb.la else - $(Q)DIRECTFB_LT_FILES=`find $(SYSROOT)/usr/lib/directfb-* -type f -name *.la`; \ + $(Q)DIRECTFB_LT_FILES=`find $(embtk_sysroot)/usr/lib/directfb-* -type f -name *.la`; \ for i in $$DIRECTFB_LT_FILES; \ do \ sed \ - -e "s; \/usr\/lib\/libfusion.la ; $(SYSROOT)\/usr\/lib\/libfusion.la ;" \ - -e "s; \/usr\/lib\/libdirect.la ; $(SYSROOT)\/usr\/lib\/libdirect.la ;" \ - -e "s; \/usr\/lib\/libdirectfb.la ; $(SYSROOT)\/usr\/lib\/libdirectfb.la ;" \ + -e "s; \/usr\/lib\/libfusion.la ; $(embtk_sysroot)\/usr\/lib\/libfusion.la ;" \ + -e "s; \/usr\/lib\/libdirect.la ; $(embtk_sysroot)\/usr\/lib\/libdirect.la ;" \ + -e "s; \/usr\/lib\/libdirectfb.la ; $(embtk_sysroot)\/usr\/lib\/libdirectfb.la ;" \ < $$i > $$i.new; \ mv $$i.new $$i; \ done $(Q)sed \ - -e "s; \/usr\/lib\/libfusion.la ; $(SYSROOT)\/usr\/lib\/libfusion.la ;" \ - -e "s; \/usr\/lib\/libdirect.la ; $(SYSROOT)\/usr\/lib\/libdirect.la ;" \ - -e "s; \/usr\/lib\/libdirectfb.la ; $(SYSROOT)\/usr\/lib\/libdirectfb.la ;" \ - < $(SYSROOT)/usr/lib/libfusion.la > libfusion.la.new; \ - mv libfusion.la.new $(SYSROOT)/usr/lib/libfusion.la + -e "s; \/usr\/lib\/libfusion.la ; $(embtk_sysroot)\/usr\/lib\/libfusion.la ;" \ + -e "s; \/usr\/lib\/libdirect.la ; $(embtk_sysroot)\/usr\/lib\/libdirect.la ;" \ + -e "s; \/usr\/lib\/libdirectfb.la ; $(embtk_sysroot)\/usr\/lib\/libdirectfb.la ;" \ + < $(embtk_sysroot)/usr/lib/libfusion.la > libfusion.la.new; \ + mv libfusion.la.new $(embtk_sysroot)/usr/lib/libfusion.la $(Q)sed \ - -e "s; \/usr\/lib\/libfusion.la ; $(SYSROOT)\/usr\/lib\/libfusion.la ;" \ - -e "s; \/usr\/lib\/libdirect.la ; $(SYSROOT)\/usr\/lib\/libdirect.la ;" \ - -e "s; \/usr\/lib\/libdirectfb.la ; $(SYSROOT)\/usr\/lib\/libdirectfb.la ;" \ - < $(SYSROOT)/usr/lib/libdirectfb.la > libdirectfb.la.new; \ - mv libdirectfb.la.new $(SYSROOT)/usr/lib/libdirectfb.la + -e "s; \/usr\/lib\/libfusion.la ; $(embtk_sysroot)\/usr\/lib\/libfusion.la ;" \ + -e "s; \/usr\/lib\/libdirect.la ; $(embtk_sysroot)\/usr\/lib\/libdirect.la ;" \ + -e "s; \/usr\/lib\/libdirectfb.la ; $(embtk_sysroot)\/usr\/lib\/libdirectfb.la ;" \ + < $(embtk_sysroot)/usr/lib/libdirectfb.la > libdirectfb.la.new; \ + mv libdirectfb.la.new $(embtk_sysroot)/usr/lib/libdirectfb.la endif diff --git a/packages/graphics/fontconfig/fontconfig.mk b/packages/graphics/fontconfig/fontconfig.mk index 15e4a28..5ee81a6 100644 --- a/packages/graphics/fontconfig/fontconfig.mk +++ b/packages/graphics/fontconfig/fontconfig.mk @@ -37,8 +37,8 @@ FONTCONFIG_INCLUDES = fontconfig FONTCONFIG_LIBS = libfontconfig* FONTCONFIG_PKGCONFIGS = fontconfig.pc -LIBXML2_CFLAGS-y = -I$(SYSROOT)/usr/include/libxml2 -LIBXML2_LIBS-y = -L$(SYSROOT)/usr/$(LIBDIR) -lxml2 +LIBXML2_CFLAGS-y = -I$(embtk_sysroot)/usr/include/libxml2 +LIBXML2_LIBS-y = -L$(embtk_sysroot)/usr/$(LIBDIR) -lxml2 FREETYPE_CFLAGS-y = $(shell \ PKG_CONFIG_PATH=$(EMBTK_PKG_CONFIG_PATH) \ @@ -66,5 +66,5 @@ FONTCONFIG_MAKE_OPTS += FREETYPE_LIBS="$(FREETYPE_LIBS-y)" FONTCONFIG_DEPS := libxml2_install freetype_install define embtk_postinstall_fontconfig - $(Q)-cp -R $(SYSROOT)/usr/etc/fonts $(ROOTFS)/etc/ + $(Q)-cp -R $(embtk_sysroot)/usr/etc/fonts $(ROOTFS)/etc/ endef diff --git a/packages/graphics/gtk/gtk.mk b/packages/graphics/gtk/gtk.mk index db24cb2..dd8bff3 100644 --- a/packages/graphics/gtk/gtk.mk +++ b/packages/graphics/gtk/gtk.mk @@ -59,33 +59,33 @@ GTK_CONFIGURE_OPTS += LIBPNG=-lpng define embtk_postinstall_gtk $(Q)test -e $(GTK_BUILD_DIR)/.patchlibtool || \ $(MAKE) $(GTK_BUILD_DIR)/.patchlibtool - $(Q)-cp -R $(SYSROOT)/usr/$(LIBDIR)/gtk-* $(ROOTFS)/usr/$(LIBDIR)/ + $(Q)-cp -R $(embtk_sysroot)/usr/$(LIBDIR)/gtk-* $(ROOTFS)/usr/$(LIBDIR)/ endef $(GTK_BUILD_DIR)/.patchlibtool: ifeq ($(CONFIG_EMBTK_64BITS_FS_COMPAT32),y) - GTK_LT_FILES=`find $(SYSROOT)/usr/lib32/ -type f -name *.la`; \ + GTK_LT_FILES=`find $(embtk_sysroot)/usr/lib32/ -type f -name *.la`; \ for i in $$GTK_LT_FILES; \ do \ sed \ - -e "s; \/usr\/lib32\/libgtk-directfb-2.0.la ; $(SYSROOT)\/usr\/lib32\/libgtk-directfb-2.0.la ;" \ - -e "s; \/usr\/lib32\/libgdk-directfb-2.0.la ; $(SYSROOT)\/usr\/lib32\/libgdk-directfb-2.0.la ;" \ - -e "s; \/usr\/lib32\/libgdk_pixbuf-2.0.la ; $(SYSROOT)\/usr\/lib32\/libgdk_pixbuf-2.0.la ;" \ - -e "s; \/usr\/lib\/libgtk-x11-2.0.la ; $(SYSROOT)\/usr\/lib\/libgtk-x11-2.0.la ;" \ - -e "s; \/usr\/lib\/libgdk-x11-2.0.la ; $(SYSROOT)\/usr\/lib\/libgdk-x11-2.0.la ;" \ + -e "s; \/usr\/lib32\/libgtk-directfb-2.0.la ; $(embtk_sysroot)\/usr\/lib32\/libgtk-directfb-2.0.la ;" \ + -e "s; \/usr\/lib32\/libgdk-directfb-2.0.la ; $(embtk_sysroot)\/usr\/lib32\/libgdk-directfb-2.0.la ;" \ + -e "s; \/usr\/lib32\/libgdk_pixbuf-2.0.la ; $(embtk_sysroot)\/usr\/lib32\/libgdk_pixbuf-2.0.la ;" \ + -e "s; \/usr\/lib\/libgtk-x11-2.0.la ; $(embtk_sysroot)\/usr\/lib\/libgtk-x11-2.0.la ;" \ + -e "s; \/usr\/lib\/libgdk-x11-2.0.la ; $(embtk_sysroot)\/usr\/lib\/libgdk-x11-2.0.la ;" \ < $$i > $$i.new; \ mv $$i.new $$i; \ done else - GTK_LT_FILES=`find $(SYSROOT)/usr/lib/ -type f -name *.la`; \ + GTK_LT_FILES=`find $(embtk_sysroot)/usr/lib/ -type f -name *.la`; \ for i in $$GTK_LT_FILES; \ do \ sed \ - -e "s; \/usr\/lib\/libgtk-directfb-2.0.la ; $(SYSROOT)\/usr\/lib\/libgtk-directfb-2.0.la ;" \ - -e "s; \/usr\/lib\/libgdk-directfb-2.0.la ; $(SYSROOT)\/usr\/lib\/libgdk-directfb-2.0.la ;" \ - -e "s; \/usr\/lib\/libgdk_pixbuf-2.0.la ; $(SYSROOT)\/usr\/lib\/libgdk_pixbuf-2.0.la ;" \ - -e "s; \/usr\/lib\/libgtk-x11-2.0.la ; $(SYSROOT)\/usr\/lib\/libgtk-x11-2.0.la ;" \ - -e "s; \/usr\/lib\/libgdk-x11-2.0.la ; $(SYSROOT)\/usr\/lib\/libgdk-x11-2.0.la ;" \ + -e "s; \/usr\/lib\/libgtk-directfb-2.0.la ; $(embtk_sysroot)\/usr\/lib\/libgtk-directfb-2.0.la ;" \ + -e "s; \/usr\/lib\/libgdk-directfb-2.0.la ; $(embtk_sysroot)\/usr\/lib\/libgdk-directfb-2.0.la ;" \ + -e "s; \/usr\/lib\/libgdk_pixbuf-2.0.la ; $(embtk_sysroot)\/usr\/lib\/libgdk_pixbuf-2.0.la ;" \ + -e "s; \/usr\/lib\/libgtk-x11-2.0.la ; $(embtk_sysroot)\/usr\/lib\/libgtk-x11-2.0.la ;" \ + -e "s; \/usr\/lib\/libgdk-x11-2.0.la ; $(embtk_sysroot)\/usr\/lib\/libgdk-x11-2.0.la ;" \ < $$i > $$i.new; \ mv $$i.new $$i; \ done diff --git a/packages/graphics/imlib2/imlib2.mk b/packages/graphics/imlib2/imlib2.mk index b3cb0e6..1503bec 100644 --- a/packages/graphics/imlib2/imlib2.mk +++ b/packages/graphics/imlib2/imlib2.mk @@ -43,7 +43,7 @@ IMLIB2_DEPS := libpng_install freetype_install libjpeg_install define embtk_postinstall_imlib2 $(Q)mkdir -p $(ROOTFS)/usr/$(LIBDIR) - $(Q)-cp -R $(SYSROOT)/usr/$(LIBDIR)/imlib2 $(ROOTFS)/usr/$(LIBDIR) + $(Q)-cp -R $(embtk_sysroot)/usr/$(LIBDIR)/imlib2 $(ROOTFS)/usr/$(LIBDIR) $(Q)-mkdir -p $(ROOTFS)/usr/share - $(Q)-cp -R $(SYSROOT)/usr/share/imlib2 $(ROOTFS)/usr/share + $(Q)-cp -R $(embtk_sysroot)/usr/share/imlib2 $(ROOTFS)/usr/share endef diff --git a/packages/graphics/pango/pango.mk b/packages/graphics/pango/pango.mk index 0b2632c..e1300f6 100644 --- a/packages/graphics/pango/pango.mk +++ b/packages/graphics/pango/pango.mk @@ -51,16 +51,16 @@ PANGO_DEPS := glib_install fontconfig_install $(PANGO_DEPS-y) \ define embtk_postinstall_pango $(Q)test -e $(PANGO_BUILD_DIR)/.patchlibtool || \ $(MAKE) $(PANGO_BUILD_DIR)/.patchlibtool - $(Q)-cp -R $(SYSROOT)/usr/$(LIBDIR)/pango $(ROOTFS)/usr/$(LIBDIR)/ + $(Q)-cp -R $(embtk_sysroot)/usr/$(LIBDIR)/pango $(ROOTFS)/usr/$(LIBDIR)/ endef $(PANGO_BUILD_DIR)/.patchlibtool: - $(Q)PANGO_LT_FILES=`find $(SYSROOT)/usr/$(LIBDIR)/* -type f -name *.la`; \ + $(Q)PANGO_LT_FILES=`find $(embtk_sysroot)/usr/$(LIBDIR)/* -type f -name *.la`; \ for i in $$PANGO_LT_FILES; \ do \ sed \ - -e "s;\/usr\/$(LIBDIR)\/libpangoft2-1.0.la ; $(SYSROOT)\/usr\/$(LIBDIR)\/libpangoft2-1.0.la ;" \ - -e "s;\/usr\/$(LIBDIR)\/libpango-1.0.la ; $(SYSROOT)\/usr\/$(LIBDIR)\/libpango-1.0.la ;" \ + -e "s;\/usr\/$(LIBDIR)\/libpangoft2-1.0.la ; $(embtk_sysroot)\/usr\/$(LIBDIR)\/libpangoft2-1.0.la ;" \ + -e "s;\/usr\/$(LIBDIR)\/libpango-1.0.la ; $(embtk_sysroot)\/usr\/$(LIBDIR)\/libpango-1.0.la ;" \ < $$i > $$i.new; \ mv $$i.new $$i; \ done diff --git a/packages/misc/gettext/gettext.mk b/packages/misc/gettext/gettext.mk index 5ccdac6..f0c357d 100644 --- a/packages/misc/gettext/gettext.mk +++ b/packages/misc/gettext/gettext.mk @@ -47,7 +47,7 @@ GETTEXT_CONFIGURE_ENV := gl_cv_func_wcwidth_works=yes \ gt_cv_int_divbyzero_sigfpe=no GETTEXT_CONFIGURE_OPTS := --enable-relocatable --with-included-gettext \ --disable-rpath --disable-openmp --disable-java \ - --with-libxml2-prefix=$(SYSROOT)/usr \ + --with-libxml2-prefix=$(embtk_sysroot)/usr \ --disable-openmp GETTEXT_DEPS = ncurses_install libxml2_install @@ -61,13 +61,13 @@ endef #FIXME: this should be fixed in gettext project $(GETTEXT_BUILD_DIR)/.patchlibtool: $(Q)sed \ - -i "s;/usr/$(LIBDIR)/libintl.la;$(SYSROOT)/$(LIBDIR)/libintl.la;" \ - $(SYSROOT)/usr/$(LIBDIR)/libgettextlib.la \ - $(SYSROOT)/usr/$(LIBDIR)/libgettextpo.la \ - $(SYSROOT)/usr/$(LIBDIR)/libgettextsrc.la + -i "s;/usr/$(LIBDIR)/libintl.la;$(embtk_sysroot)/$(LIBDIR)/libintl.la;" \ + $(embtk_sysroot)/usr/$(LIBDIR)/libgettextlib.la \ + $(embtk_sysroot)/usr/$(LIBDIR)/libgettextpo.la \ + $(embtk_sysroot)/usr/$(LIBDIR)/libgettextsrc.la $(Q)sed \ - -i "s;/usr/$(LIBDIR)/libgettextlib.la;$(SYSROOT)/$(LIBDIR)/libgettextlib.la;" \ - $(SYSROOT)/usr/$(LIBDIR)/libgettextsrc.la + -i "s;/usr/$(LIBDIR)/libgettextlib.la;$(embtk_sysroot)/$(LIBDIR)/libgettextlib.la;" \ + $(embtk_sysroot)/usr/$(LIBDIR)/libgettextsrc.la @touch $@ # gettext for host development machine diff --git a/packages/misc/ncurses/ncurses.mk b/packages/misc/ncurses/ncurses.mk index 20168e1..b941095 100644 --- a/packages/misc/ncurses/ncurses.mk +++ b/packages/misc/ncurses/ncurses.mk @@ -51,5 +51,5 @@ NCURSES_CONFIGURE_OPTS := --disable-rpath --without-cxx-binding \ define embtk_postinstall_ncurses $(Q)mkdir -p $(ROOTFS)/usr/share - $(Q)-cp -R $(SYSROOT)/usr/share/tabset $(ROOTFS)/usr/share/ + $(Q)-cp -R $(embtk_sysroot)/usr/share/tabset $(ROOTFS)/usr/share/ endef diff --git a/packages/misc/tslib/tslib.mk b/packages/misc/tslib/tslib.mk index b8727ad..4ee0aaf 100644 --- a/packages/misc/tslib/tslib.mk +++ b/packages/misc/tslib/tslib.mk @@ -40,5 +40,5 @@ TSLIB_PKGCONFIGS = tslib*.pc TSLIB_DEPS = define embtk_postinstall_tslib - $(Q)-cp -R $(SYSROOT)/usr/$(LIBDIR)/ts $(ROOTFS)/usr/$(LIBDIR)/ + $(Q)-cp -R $(embtk_sysroot)/usr/$(LIBDIR)/ts $(ROOTFS)/usr/$(LIBDIR)/ endef 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 diff --git a/packages/security/openssl/openssl.mk b/packages/security/openssl/openssl.mk index 2653ea3..58a94c7 100644 --- a/packages/security/openssl/openssl.mk +++ b/packages/security/openssl/openssl.mk @@ -32,7 +32,7 @@ OPENSSL_SRC_DIR := $(PACKAGES_BUILD)/openssl-$(OPENSSL_VERSION) OPENSSL_BUILD_DIR := $(PACKAGES_BUILD)/openssl-$(OPENSSL_VERSION) OPENSSL_NODESTDIR := y -OPENSSL_MAKE_OPTS := CC=$(TARGETCC_CACHED) INSTALL_PREFIX=$(SYSROOT) +OPENSSL_MAKE_OPTS := CC=$(TARGETCC_CACHED) INSTALL_PREFIX=$(embtk_sysroot) OPENSSL_MAKE_OPTS += LIBDIR=$(LIBDIR) MANDIR=/usr/share/man -j1 OPENSSL_ETC = ssl @@ -72,5 +72,5 @@ define embtk_postinstall_openssl fi $(Q)mkdir -p $(ROOTFS) $(Q)mkdir -p $(ROOTFS)/etc - $(Q)-cp -R $(SYSROOT)/etc/ssl $(ROOTFS)/etc/ + $(Q)-cp -R $(embtk_sysroot)/etc/ssl $(ROOTFS)/etc/ endef diff --git a/packages/system/dbus/dbus.mk b/packages/system/dbus/dbus.mk index 32b37be..92ec7f5 100644 --- a/packages/system/dbus/dbus.mk +++ b/packages/system/dbus/dbus.mk @@ -45,5 +45,5 @@ DBUS_CONFIGURE_OPTS := --enable-abstract-sockets --with-xml=libxml \ define embtk_postinstall_dbus $(Q)-mkdir -p $(ROOTFS)/usr/libexec - $(Q)-cp -R $(SYSROOT)/usr/libexec/dbus* $(ROOTFS)/usr/libexec/ + $(Q)-cp -R $(embtk_sysroot)/usr/libexec/dbus* $(ROOTFS)/usr/libexec/ endef diff --git a/packages/system/upstart/upstart.mk b/packages/system/upstart/upstart.mk index 980138e..086329d 100644 --- a/packages/system/upstart/upstart.mk +++ b/packages/system/upstart/upstart.mk @@ -85,8 +85,8 @@ $(UPSTART_BUILD_DIR)/.configured: OBJCOPY=$(TARGETOBJCOPY) \ CFLAGS="$(TARGET_CFLAGS)" \ CXXFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="-L$(SYSROOT)/$(LIBDIR) -L$(SYSROOT)/usr/$(LIBDIR)" \ - CPPFLAGS="-I$(SYSROOT)/usr/include" \ + LDFLAGS="-L$(embtk_sysroot)/$(LIBDIR) -L$(embtk_sysroot)/usr/$(LIBDIR)" \ + CPPFLAGS="-I$(embtk_sysroot)/usr/include" \ PKG_CONFIG=$(PKGCONFIG_BIN) \ PKG_CONFIG_PATH=$(EMBTK_PKG_CONFIG_PATH) \ ./configure --build=$(HOST_BUILD) --host=$(STRICT_GNU_TARGET) \ @@ -96,17 +96,17 @@ $(UPSTART_BUILD_DIR)/.configured: upstart_clean: $(call embtk_pinfo,"cleanup upstart...") - $(Q)-cd $(SYSROOT)/usr/bin; rm -rf $(UPSTART_BINS) - $(Q)-cd $(SYSROOT)/usr/sbin; rm -rf $(UPSTART_SBINS) - $(Q)-cd $(SYSROOT)/usr/include; rm -rf $(UPSTART_INCLUDES) - $(Q)-cd $(SYSROOT)/usr/$(LIBDIR); rm -rf $(UPSTART_LIBS) - $(Q)-cd $(SYSROOT)/usr/$(LIBDIR)/pkgconfig; rm -rf $(UPSTART_PKGCONFIGS) + $(Q)-cd $(embtk_sysroot)/usr/bin; rm -rf $(UPSTART_BINS) + $(Q)-cd $(embtk_sysroot)/usr/sbin; rm -rf $(UPSTART_SBINS) + $(Q)-cd $(embtk_sysroot)/usr/include; rm -rf $(UPSTART_INCLUDES) + $(Q)-cd $(embtk_sysroot)/usr/$(LIBDIR); rm -rf $(UPSTART_LIBS) + $(Q)-cd $(embtk_sysroot)/usr/$(LIBDIR)/pkgconfig; rm -rf $(UPSTART_PKGCONFIGS) $(Q)-rm -rf $(UPSTART_BUILD_DIR)* $(UPSTART_BUILD_DIR)/.special: $(Q)-mkdir -p $(ROOTFS)/etc $(Q)-mkdir -p $(ROOTFS)/etc/dbus-1 $(Q)-mkdir -p $(ROOTFS)/etc/dbus-1/system.d - $(Q)-cp $(SYSROOT)/etc/dbus-1/system.d/Upstart.conf \ + $(Q)-cp $(embtk_sysroot)/etc/dbus-1/system.d/Upstart.conf \ $(ROOTFS)/etc/dbus-1/system.d - $(Q)-cp -R $(SYSROOT)/etc/init $(ROOTFS)/etc/ + $(Q)-cp -R $(embtk_sysroot)/etc/init $(ROOTFS)/etc/ diff --git a/packages/x11/libx11/libx11.mk b/packages/x11/libx11/libx11.mk index 05bd9e8..59416c5 100644 --- a/packages/x11/libx11/libx11.mk +++ b/packages/x11/libx11/libx11.mk @@ -57,14 +57,14 @@ define embtk_postinstall_libx11 $(MAKE) $(LIBX11_BUILD_DIR)/.patchlibtool $(Q)-mkdir -p $(ROOTFS)/usr/share $(Q)-mkdir -p $(ROOTFS)/usr/share/X11 - $(Q)-cp $(SYSROOT)/usr/share/X11/XErrorDB $(ROOTFS)/usr/share/X11/ - $(Q)-cp $(SYSROOT)/usr/share/X11/XKeysymDB $(ROOTFS)/usr/share/X11/ + $(Q)-cp $(embtk_sysroot)/usr/share/X11/XErrorDB $(ROOTFS)/usr/share/X11/ + $(Q)-cp $(embtk_sysroot)/usr/share/X11/XKeysymDB $(ROOTFS)/usr/share/X11/ endef $(LIBX11_BUILD_DIR)/.patchlibtool: - @LIBX11_LT_FILES=`find $(SYSROOT)/usr/$(LIBDIR)/libX11-* -type f -name *.la`; \ + @LIBX11_LT_FILES=`find $(embtk_sysroot)/usr/$(LIBDIR)/libX11-* -type f -name *.la`; \ for i in $$LIBX11_LT_FILES; \ do \ sed \ - -i "s; /usr/$(LIBDIR)/libX11.la ; $(SYSROOT)/usr/$(LIBDIR)/libX11.la ;" $$i; \ + -i "s; /usr/$(LIBDIR)/libX11.la ; $(embtk_sysroot)/usr/$(LIBDIR)/libX11.la ;" $$i; \ done diff --git a/packages/x11/libxcb/libxcb.mk b/packages/x11/libxcb/libxcb.mk index a5d1761..a26430f 100644 --- a/packages/x11/libxcb/libxcb.mk +++ b/packages/x11/libxcb/libxcb.mk @@ -48,10 +48,10 @@ endef $(LIBXCB_BUILD_DIR)/.patchlibtool: - $(Q)LIBXCB_LT_FILES=`find $(SYSROOT)/usr/$(LIBDIR)/libxcb-* -type f -name *.la`; \ + $(Q)LIBXCB_LT_FILES=`find $(embtk_sysroot)/usr/$(LIBDIR)/libxcb-* -type f -name *.la`; \ for i in $$LIBXCB_LT_FILES; \ do \ sed \ - -i "s; /usr/$(LIBDIR)/libxcb.la ; $(SYSROOT)/usr/$(LIBDIR)/libxcb.la ;" $$i; \ + -i "s; /usr/$(LIBDIR)/libxcb.la ; $(embtk_sysroot)/usr/$(LIBDIR)/libxcb.la ;" $$i; \ done diff --git a/packages/x11/xcbutil/xcbutil.mk b/packages/x11/xcbutil/xcbutil.mk index e23dffc..437b8db 100644 --- a/packages/x11/xcbutil/xcbutil.mk +++ b/packages/x11/xcbutil/xcbutil.mk @@ -52,16 +52,16 @@ define embtk_postinstall_xcbutil endef $(XCBUTIL_BUILD_DIR)/.patchlibtool: - $(Q)XCBUTIL_LT_FILES=`find $(SYSROOT)/usr/$(LIBDIR)/libxcb-* -type f -name *.la`; \ + $(Q)XCBUTIL_LT_FILES=`find $(embtk_sysroot)/usr/$(LIBDIR)/libxcb-* -type f -name *.la`; \ for i in $$XCBUTIL_LT_FILES; \ do \ sed \ - -i "s; /usr/$(LIBDIR)/libxcb-event.la ; $(SYSROOT)/usr/$(LIBDIR)/libxcb-event.la ;" $$i; \ + -i "s; /usr/$(LIBDIR)/libxcb-event.la ; $(embtk_sysroot)/usr/$(LIBDIR)/libxcb-event.la ;" $$i; \ sed \ - -i "s; /usr/$(LIBDIR)/libxcb-aux.la ; $(SYSROOT)/usr/$(LIBDIR)/libxcb-aux.la ;" $$i; \ + -i "s; /usr/$(LIBDIR)/libxcb-aux.la ; $(embtk_sysroot)/usr/$(LIBDIR)/libxcb-aux.la ;" $$i; \ sed \ - -i "s; /usr/$(LIBDIR)/libxcb-property.la ; $(SYSROOT)/usr/$(LIBDIR)/libxcb-property.la ;" $$i; \ + -i "s; /usr/$(LIBDIR)/libxcb-property.la ; $(embtk_sysroot)/usr/$(LIBDIR)/libxcb-property.la ;" $$i; \ sed \ - -i "s; /usr/$(LIBDIR)/libxcb-atom.la ; $(SYSROOT)/usr/$(LIBDIR)/libxcb-atom.la ;" $$i; \ + -i "s; /usr/$(LIBDIR)/libxcb-atom.la ; $(embtk_sysroot)/usr/$(LIBDIR)/libxcb-atom.la ;" $$i; \ done $(Q)touch $@ diff --git a/packages/x11/xf86inputevdev/xf86inputevdev.mk b/packages/x11/xf86inputevdev/xf86inputevdev.mk index 1936680..1ad860b 100644 --- a/packages/x11/xf86inputevdev/xf86inputevdev.mk +++ b/packages/x11/xf86inputevdev/xf86inputevdev.mk @@ -40,5 +40,5 @@ XF86INPUTEVDEV_PKGCONFIGS = xorg-evdev.pc XF86INPUTEVDEV_DEPS = xserver_install define embtk_postinstall_xf86inputevdev - $(Q)-cp -R $(SYSROOT)/usr/$(LIBDIR)/xorg $(ROOTFS)/usr/$(LIBDIR)/ + $(Q)-cp -R $(embtk_sysroot)/usr/$(LIBDIR)/xorg $(ROOTFS)/usr/$(LIBDIR)/ endef diff --git a/packages/x11/xf86videofbdev/xf86videofbdev.mk b/packages/x11/xf86videofbdev/xf86videofbdev.mk index 749bcdd..9f5aaa7 100644 --- a/packages/x11/xf86videofbdev/xf86videofbdev.mk +++ b/packages/x11/xf86videofbdev/xf86videofbdev.mk @@ -40,5 +40,5 @@ XF86VIDEOFBDEV_PKGCONFIGS = XF86VIDEOFBDEV_DEPS = xserver_install define embtk_postinstall_xf86videofbdev - $(Q)-cp -R $(SYSROOT)/usr/$(LIBDIR)/xorg $(ROOTFS)/usr/$(LIBDIR)/ + $(Q)-cp -R $(embtk_sysroot)/usr/$(LIBDIR)/xorg $(ROOTFS)/usr/$(LIBDIR)/ endef diff --git a/packages/x11/xkeyboardconfig/xkeyboardconfig.mk b/packages/x11/xkeyboardconfig/xkeyboardconfig.mk index 82671e3..5ff0a35 100644 --- a/packages/x11/xkeyboardconfig/xkeyboardconfig.mk +++ b/packages/x11/xkeyboardconfig/xkeyboardconfig.mk @@ -36,5 +36,5 @@ XKEYBOARDCONFIG_DEPS := intltool_host_install xkbcomp_install define embtk_postinstall_xkeyboardconfig $(Q)-mkdir -p $(ROOTFS)/usr/share $(Q)-mkdir -p $(ROOTFS)/usr/share/X11 - $(Q)-cp -R $(SYSROOT)/usr/share/X11/xkb $(ROOTFS)/usr/share/X11/ + $(Q)-cp -R $(embtk_sysroot)/usr/share/X11/xkb $(ROOTFS)/usr/share/X11/ endef diff --git a/packages/x11/xserver/xserver.mk b/packages/x11/xserver/xserver.mk index fe2936a..67098ac 100644 --- a/packages/x11/xserver/xserver.mk +++ b/packages/x11/xserver/xserver.mk @@ -82,5 +82,5 @@ XSERVER_CONFIGURE_OPTS += --disable-tslib endif define embtk_postinstall_xserver - $(Q)-cp -R $(SYSROOT)/usr/$(LIBDIR)/xorg $(ROOTFS)/usr/$(LIBDIR)/ + $(Q)-cp -R $(embtk_sysroot)/usr/$(LIBDIR)/xorg $(ROOTFS)/usr/$(LIBDIR)/ endef -- cgit v1.2.3