diff options
| author | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2012-11-10 11:57:59 +0100 |
|---|---|---|
| committer | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2012-11-10 11:57:59 +0100 |
| commit | fb38fe2065d8b5e06ae27a0739215293d46ce802 (patch) | |
| tree | ed1a1b78eb610b3264ddc4388f66726c67f1276e /mk/macros.packages.mk | |
| parent | 1d846bff94675b38ddca3e22030d44adb2e93e5e (diff) | |
| download | embtoolkit-fb38fe2065d8b5e06ae27a0739215293d46ce802.tar.gz embtoolkit-fb38fe2065d8b5e06ae27a0739215293d46ce802.tar.bz2 embtoolkit-fb38fe2065d8b5e06ae27a0739215293d46ce802.tar.xz | |
Build system: embtk_decompress_pkg macros improvement
Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
Diffstat (limited to 'mk/macros.packages.mk')
| -rw-r--r-- | mk/macros.packages.mk | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/mk/macros.packages.mk b/mk/macros.packages.mk index eb59552..405ef7d 100644 --- a/mk/macros.packages.mk +++ b/mk/macros.packages.mk @@ -624,11 +624,14 @@ endef # Usage: # $(call embtk_decompress_pkg,pkgname) # + __embtk_applypatch_pkg = \ - $(if $(and $(__embtk_pkg_needpatch),$(__embtk_pkg_notpatched-y)), \ - cd $(__embtk_pkg_srcdir); \ - patch --silent -p1 < $(__embtk_pkg_patch_f) && \ - touch $(__embtk_pkg_dotpatched_f)) + $(if $(__embtk_pkg_needpatch), \ + if [ ! -e $(__embtk_pkg_dotpatched_f) ]; then \ + cd $(__embtk_pkg_srcdir); \ + patch -p1 < $(__embtk_pkg_patch_f); \ + touch $(__embtk_pkg_dotpatched_f); \ + fi,true;) __embtk_decompress_pkg_exitfailure = \ $(call embtk_perror,"!Compression unknown for $(__embtk_pkg_name)!"); \ @@ -665,13 +668,14 @@ __embtk_decompress_pkg = \ ;; \ esac +__embtk_decompress_pkg_msg = $(call embtk_pinfo,"Decrompressing $(__embtk_pkg_package) ...") define embtk_decompress_pkg $(if $(__embtk_pkg_usegit)$(__embtk_pkg_usesvn),true, - $(if $(EMBTK_BUILDSYS_DEBUG), - $(call embtk_pinfo,"Decrompressing $(__embtk_pkg_package) ...")) - $(if $(__embtk_pkg_notdecompressed-y), - $(Q)$(__embtk_decompress_pkg) - $(Q)$(__embtk_applypatch_pkg))) + $(if $(EMBTK_BUILDSYS_DEBUG),$(__embtk_decompress_pkg_msg)) + if [ ! -e $(__embtk_pkg_dotdecompressed_f) ]; then \ + $(call __embtk_decompress_pkg,$(1)) && \ + $(call __embtk_applypatch_pkg,$(1)) \ + fi) $(Q)mkdir -p $(__embtk_pkg_builddir) endef |