epicknex/hererocks
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't use sed for patching Makefile

Browse Source 
'-i' isn't portable, use Python instead.

Fixes #7.
This commit is contained in:
mpeterv 2016-01-03 14:56:59 +03:00
parent 055dd7c8f4
commit 6dae2ebf91
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
hererocks.py
View File

@ -481,13 +481,24 @@ class RioLua(Lua):
self.arch_file = None self.arch_file = None
def make(self): def make(self):
if self.major_version == "5.1": cmd = "make"
# Lua 5.1 doesn't support passing MYCFLAGS to Makefile.
run_command("sed -i s/MYCFLAGS/SYSCFLAGS/g src/Makefile") if opts.cflags is not None:
substitution = "s/-Wall $(SYSCFLAGS)/-Wall $(SYSCFLAGS) $(MYCFLAGS)/g" if self.major_version == "5.1":
run_command("sed -i", quote(substitution), "src/Makefile") # Lua 5.1 doesn't support passing MYCFLAGS to Makefile.
makefile_h = open(os.path.join("src", "Makefile"), "rb")
makefile_src = makefile_h.read()
makefile_h.close()
before, it, after = makefile_src.partition(b"CFLAGS= -O2 -Wall $(MYCFLAGS)")
makefile_src = before + it + " " + opts.cflags + after
makefile_h = open(os.path.join("src", "Makefile"), "wb")
makefile_h.write(makefile_src)
makefile_h.close()
else:
cmd = "make MYCFLAGS=" + quote(opts.cflags)
cmd = "make" if opts.cflags is None else "make MYCFLAGS=" + quote(opts.cflags)
run_command(cmd, opts.target) run_command(cmd, opts.target)
def make_install(self): def make_install(self):