diff options
| author | John Marino <marino@FreeBSD.org> | 2015-02-21 11:05:23 +0000 |
|---|---|---|
| committer | John Marino <marino@FreeBSD.org> | 2015-02-21 11:05:23 +0000 |
| commit | 0ee2c7409481e0d82e5cbb02c77c041c408c03c8 (patch) | |
| tree | 51cc8156b2ad773b9297b186e66e2d8a457b8a44 /www/litmus | |
| parent | 76249a1970baa3df89940c64b2bb1bb44bffafb7 (diff) | |
| download | ports-0ee2c7409481e0d82e5cbb02c77c041c408c03c8.tar.gz ports-0ee2c7409481e0d82e5cbb02c77c041c408c03c8.zip | |
www/litmus: The "DONTSTRIP" hack didn't work, let's use BSD_INSTALL_* !
Modern binutils squawks if an attempt to strip an non-executable is made,
as seen below DONTSTRIP doesn't work, at least not in all cases:
DONTSTRIP=1 install -s -o root -g wheel -m 555 ./litmus
/wrkdirs/www/litmus/work/stage/usr/local/bin/litmus
/usr/libexec/binutils224/elf/strip:
/wrkdirs/www/litmus/work/stage/usr/local/bin/litmus:
File format not recognized
I closer look at the Makefile.in patch revealed that BSD_INSTALL_SCRIPT
should have been used instead. While here, convert all the install
variables to BSD_INSTALL_*
Approved by: just fix it
Notes
Notes:
svn path=/head/; revision=379496
Diffstat (limited to 'www/litmus')
| -rw-r--r-- | www/litmus/files/patch-Makefile.in | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/www/litmus/files/patch-Makefile.in b/www/litmus/files/patch-Makefile.in index c6a49dbbe748..088a5f9d1bcc 100644 --- a/www/litmus/files/patch-Makefile.in +++ b/www/litmus/files/patch-Makefile.in @@ -1,11 +1,17 @@ ---- Makefile.in.orig 2015-02-11 08:44:24.000000000 +0100 -+++ Makefile.in 2015-02-11 08:44:07.000000000 +0100 -@@ -69,7 +69,7 @@ +--- Makefile.in.orig 2008-09-29 20:22:38 UTC ++++ Makefile.in +@@ -69,11 +69,11 @@ install: $(TESTS) litmus $(INSTALL) -d $(DESTDIR)$(bindir) $(INSTALL) -d $(DESTDIR)$(libexecdir)/litmus $(INSTALL) -d $(DESTDIR)$(datadir)/litmus/htdocs - $(INSTALL_PROGRAM) $(top_builddir)/litmus $(DESTDIR)$(bindir)/litmus -+ DONTSTRIP=1 $(INSTALL_PROGRAM) $(top_builddir)/litmus $(DESTDIR)$(bindir)/litmus ++ $(BSD_INSTALL_SCRIPT) $(top_builddir)/litmus $(DESTDIR)$(bindir)/litmus for t in $(TESTS); do \ - $(INSTALL_PROGRAM) $(top_builddir)/$$t $(DESTDIR)$(libexecdir)/litmus/$$t; done +- $(INSTALL_PROGRAM) $(top_builddir)/$$t $(DESTDIR)$(libexecdir)/litmus/$$t; done ++ $(BSD_INSTALL_PROGRAM) $(top_builddir)/$$t $(DESTDIR)$(libexecdir)/litmus/$$t; done for d in $(HTDOCS); do \ +- $(INSTALL_DATA) $(top_srcdir)/htdocs/$$d $(DESTDIR)$(datadir)/litmus/htdocs/$d; done ++ $(BSD_INSTALL_DATA) $(top_srcdir)/htdocs/$$d $(DESTDIR)$(datadir)/litmus/htdocs/$d; done + + props: src/props.o $(ODEPS) + $(CC) $(LDFLAGS) -o $@ src/props.o $(ALL_LIBS) |