diff options
| author | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2012-11-24 15:10:21 +0100 |
|---|---|---|
| committer | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2012-11-24 15:10:21 +0100 |
| commit | ec8e1d2e452487fa81bc480a3b20063d8d20c3a7 (patch) | |
| tree | bf7194142d7b14a3e5d8297c0c7aa6945b3bb9c9 /mk | |
| parent | 9c107bf0c2a867a002d7df9dca9a4cacbe3d6907 (diff) | |
| parent | 4b996a7b9f4faaed5fbb44aa899f1f581edf244e (diff) | |
| download | embtoolkit-ec8e1d2e452487fa81bc480a3b20063d8d20c3a7.tar.gz embtoolkit-ec8e1d2e452487fa81bc480a3b20063d8d20c3a7.tar.bz2 embtoolkit-ec8e1d2e452487fa81bc480a3b20063d8d20c3a7.tar.xz | |
Merge branch 'master' into llvm-support
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/macros.packages.mk | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/mk/macros.packages.mk b/mk/macros.packages.mk index 43787bf..816dccb 100644 --- a/mk/macros.packages.mk +++ b/mk/macros.packages.mk @@ -39,11 +39,11 @@ define embtk_wget endef # -# embtk_pkgconfig_getlibs: +# embtk_pkgconfig-libs: # A macro to get pkg-config libs entry for a target package # Usage: $(call embtk_pkgconfig_getlibs,pkgname) # -define embtk_pkgconfig_getlibs +define embtk_pkgconfig-libs $(shell \ PKG_CONFIG_PATH=$(EMBTK_PKG_CONFIG_PATH) \ PKG_CONFIG_LIBDIR="$(EMBTK_PKG_CONFIG_LIBDIR)" \ @@ -51,11 +51,11 @@ define embtk_pkgconfig_getlibs endef # -# embtk_pkgconfig_getcflags: +# embtk_pkgconfig-cflags: # A macro to get pkg-config cflags entry for a target package # Usage: $(call embtk_pkgconfig_getcflags,pkgname) # -define embtk_pkgconfig_getcflags +define embtk_pkgconfig-cflags $(shell \ PKG_CONFIG_PATH=$(EMBTK_PKG_CONFIG_PATH) \ PKG_CONFIG_LIBDIR="$(EMBTK_PKG_CONFIG_LIBDIR)" \ @@ -77,7 +77,7 @@ __lt_usr/lib = $(embtk_space)\/usr\/$(LIBDIR)\/ __lt_sysroot/usr/lib = $(embtk_space)$(embtk_sysroot)\/usr\/$(LIBDIR)\/ __lt_path = $(addprefix $(embtk_sysroot)/usr/,$(or $(1),$(LIBDIR))) define __embtk_fix_libtool_files - __lt_las=`find $(__lt_path) -name *.la`; \ + __lt_las=$$(find $(__lt_path) -name '*.la'); \ for la in $$__lt_las; do \ sed -i "s;$(__ltlibdirold);$(__ltlibdirnew);" $$la; \ sed -i "s;$(__lt_usr/lib);$(__lt_sysroot/usr/lib);g" $$la; \ @@ -309,8 +309,8 @@ define embtk_configure_pkg OBJCOPY=$(TARGETOBJCOPY) \ CFLAGS="$(TARGET_CFLAGS)" \ CXXFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="-L$(embtk_sysroot)/$(LIBDIR) -L$(embtk_sysroot)/usr/$(LIBDIR)" \ - CPPFLAGS="-I$(embtk_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)" \ PKG_CONFIG_LIBDIR="$(EMBTK_PKG_CONFIG_LIBDIR)" \ @@ -403,10 +403,10 @@ define __embtk_install_pkg_make $(call embtk_decompress_pkg,$(1)) $(if $(embtk_beforeinstall_$(pkgv)),$(embtk_beforeinstall_$(pkgv))) $(if $(__embtk_autotoolspkg-y),$(call embtk_configure_pkg,$(1))) - $(if $(__embtk_pkg_makedirs), \ + $(if $(__embtk_pkg_makedirs), \ $(__embtk_multi_make), \ $(__embtk_single_make)) - $(if $(__embtk_pkg_makedirs), \ + $(if $(__embtk_pkg_makedirs), \ $(__embtk_multi_make_install), \ $(__embtk_single_make_install)) $(if $(__embtk_autotoolspkg-y)$(__embtk_pkg_pkgconfigs), @@ -421,10 +421,10 @@ define __embtk_install_hostpkg_make $(call embtk_decompress_pkg,$(1)) $(if $(embtk_beforeinstall_$(pkgv)),$(embtk_beforeinstall_$(pkgv))) $(if $(__embtk_autotoolspkg-y),$(call embtk_configure_hostpkg,$(1))) - $(if $(__embtk_pkg_makedirs), \ + $(if $(__embtk_pkg_makedirs), \ $(__embtk_multi_make), \ $(__embtk_single_make)) - $(if $(__embtk_pkg_makedirs), \ + $(if $(__embtk_pkg_makedirs), \ $(__embtk_multi_make_hostinstall), \ $(__embtk_single_make_hostinstall)) $(Q)touch $(__embtk_pkg_dotinstalled_f) |