summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Terjan <pterjan@mageia.org>2018-01-04 03:13:46 +0000
committerPascal Terjan <pterjan@mageia.org>2018-01-04 03:13:46 +0000
commitd24876d991bbcfb83fd523896dba85e2df1fce46 (patch)
tree834de3c33f9a644f089ea50517dd44360fe110f7
parent5dc23a5df6cb831585b20b3725cc27e33adf508d (diff)
downloaddrakx-d24876d991bbcfb83fd523896dba85e2df1fce46.tar
drakx-d24876d991bbcfb83fd523896dba85e2df1fce46.tar.gz
drakx-d24876d991bbcfb83fd523896dba85e2df1fce46.tar.bz2
drakx-d24876d991bbcfb83fd523896dba85e2df1fce46.tar.xz
drakx-d24876d991bbcfb83fd523896dba85e2df1fce46.zip
Fix perl escaping causing commands to not get linked
Noticed in the build log: Unescaped left brace in regex is illegal here in regex; marked by <-- HERE in m/sub (\w+?)_?(\(\))? { <-- HERE .*/ at -e line 1.
-rw-r--r--perl-install/install/Makefile2
-rw-r--r--perl-install/install/NEWS2
2 files changed, 3 insertions, 1 deletions
diff --git a/perl-install/install/Makefile b/perl-install/install/Makefile
index d509c35c4..aea57f78d 100644
--- a/perl-install/install/Makefile
+++ b/perl-install/install/Makefile
@@ -38,7 +38,7 @@ install_pms:
[ -d $(DEST) ] || ../../tools/mdkinst_stage2_tool --uncompress $(STAGE2_DEST)
# commands implemented in perl:
- for i in `perl -ne 's/sub (\w+?)_?(\(\))? {.*/$$1/ and print' commands.pm` sync; do if [ ! -x $(DEST)/usr/bin/$$i ]; then ln -sf commands $(DEST)/usr/bin/$$i; fi; done
+ for i in `perl -ne 's/sub (\w+?)_?(\(\))? \{.*/$$1/ and print' commands.pm` sync; do if [ ! -x $(DEST)/usr/bin/$$i ]; then ln -sf commands $(DEST)/usr/bin/$$i; fi; done
# install & clean perl modules:
install -d $(DESTREP4PMS)
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index d3c352cc1..bb59e6c4e 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,5 @@
+- fix perl escaping causing commands to not get linked
+
Version 17.91 - 4 October 2017
- do not include libnss3 anymore as rpm now uses OpenSSL