diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-09-11 16:35:59 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-09-11 17:00:14 +0200 |
| commit | e9e996ed233e4ce1bd043b4e80dec2660005006e (patch) | |
| tree | 007da32a243e04a021278cab59d55c71c1acbc22 | |
| parent | 2e594d1685e052b56946273dd3b66600c658fb73 (diff) | |
gbuild: UnpackedTarball: don't need over-engineered 82 line
... perl script to convert line ends.
Change-Id: Ia2f6f38b39876946ba4471f99a7622241ae72017
| -rw-r--r-- | solenv/gbuild/UnpackedTarball.mk | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/solenv/gbuild/UnpackedTarball.mk b/solenv/gbuild/UnpackedTarball.mk index 72b7d4d89115..c69d5e66da47 100644 --- a/solenv/gbuild/UnpackedTarball.mk +++ b/solenv/gbuild/UnpackedTarball.mk @@ -102,8 +102,10 @@ endef # converted, it is better to be changed to 1. gb_UnpackedTarball_PATCHLEVEL_DEFAULT := 3 -gb_UnpackedTarball_CONVERTTARGET := $(SRCDIR)/solenv/bin/leconvert.pl -gb_UnpackedTarball_CONVERTCOMMAND := $(PERL) -w $(gb_UnpackedTarball_CONVERTTARGET) +gb_UnpackedTarball_CONVERTTODOS = \ + $(gb_AWK) 'sub("$$","\r")' $(1) > $(1).TEMP && mv $(1).TEMP $(1) +gb_UnpackedTarball_CONVERTTOUNIX = \ + tr -d '\r' < $(1) > $(1).TEMP && mv $(1).TEMP $(1) define gb_UnpackedTarball__copy_files_impl $(if $(1),\ @@ -125,13 +127,13 @@ define gb_UnpackedTarball__command $(call gb_Output_announce,$(2),$(true),PAT,2) $(call gb_Helper_abbreviate_dirs,\ cd $(3) && \ - $(if $(UNPACKED_FIX_EOL),$(gb_UnpackedTarball_CONVERTCOMMAND) unix $(UNPACKED_FIX_EOL) &&) \ + $(foreach file,$(UNPACKED_FIX_EOL),$(call gb_UnpackedTarball_CONVERTTOUNIX,$(file)) && ) \ $(if $(UNPACKED_PATCHES),\ for p in $(UNPACKED_PATCHES); do \ $(GNUPATCH) -s -p$(UNPACKED_PATCHLEVEL) < "$$p" || exit 1;\ done && \ ) \ - $(if $(UNPACKED_FIX_EOL),$(gb_UnpackedTarball_CONVERTCOMMAND) dos $(UNPACKED_FIX_EOL) &&) \ + $(foreach file,$(UNPACKED_FIX_EOL),$(call gb_UnpackedTarball_CONVERTTODOS,$(file)) && ) \ $(if $(UNPACKED_FILES),\ mkdir -p $(sort $(dir $(UNPACKED_DESTFILES))) && \ $(call gb_UnpackedTarball__copy_files,$(UNPACKED_FILES),$(UNPACKED_DESTFILES)) && \ |