[MacPorts] #62292: makefile-1.0: can't use makefile.has_destdir no with makefile.override PREFIX
MacPorts
noreply at macports.org
Sun Feb 14 11:17:12 UTC 2021
#62292: makefile-1.0: can't use makefile.has_destdir no with makefile.override
PREFIX
-------------------------+----------------------
Reporter: ryandesign | Owner: (none)
Type: defect | Status: new
Priority: Normal | Milestone:
Component: ports | Version: 2.6.99
Resolution: | Keywords: haspatch
Port: makefile |
-------------------------+----------------------
Changes (by ryandesign):
* keywords: => haspatch
Comment:
This works for me... any objections?
{{{
#!diff
--- _resources/port1.0/group/makefile-1.0.tcl (revision 181486)
+++ _resources/port1.0/group/makefile-1.0.tcl (working copy)
@@ -56,6 +56,14 @@
default compiler.limit_flags no
}
+# please remove when 8a088c3 has been in a released MacPorts version for
at least two weeks
+# see https://github.com/macports/macports-
base/commit/8a088c30d80c7c3eca10848f28835e1c180229b1
+if {[vercmp [macports_version] 2.6.99] < 0} {
+ proc shellescape {arg} {
+ return [regsub -all -- {[^A-Za-z0-9.:@%/+=_-]} $arg {\\&}]
+ }
+}
+
namespace eval makefile_pg {
}
@@ -120,7 +128,7 @@
set makefile_prefix \$(DESTDIR)${prefix}
}
if {[lsearch -exact ${makefile.override} PREFIX] != -1} {
- ${phase}.args-append [option
makefile.prefix_name]=${makefile_prefix}
+ ${phase}.args-append [option
makefile.prefix_name]=[shellescape ${makefile_prefix}]
}
${phase}.env-append [option
makefile.prefix_name]=${makefile_prefix}
}}}
--
Ticket URL: <https://trac.macports.org/ticket/62292#comment:1>
MacPorts <https://www.macports.org/>
Ports system for macOS
More information about the macports-tickets
mailing list