Date: Sat, 21 Feb 2015 11:05:24 +0000 (UTC) From: John Marino <marino@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r379496 - head/www/litmus/files Message-ID: <201502211105.t1LB5OuN085141@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marino Date: Sat Feb 21 11:05:23 2015 New Revision: 379496 URL: https://svnweb.freebsd.org/changeset/ports/379496 QAT: https://qat.redports.org/buildarchive/r379496/ Log: 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 Modified: head/www/litmus/files/patch-Makefile.in Modified: head/www/litmus/files/patch-Makefile.in ============================================================================== --- head/www/litmus/files/patch-Makefile.in Sat Feb 21 10:14:37 2015 (r379495) +++ head/www/litmus/files/patch-Makefile.in Sat Feb 21 11:05:23 2015 (r379496) @@ -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)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201502211105.t1LB5OuN085141>