From: Stephen Smalley <sds@tycho.nsa.gov>
To: Thomas Petazzoni <thomas.petazzoni@bootlin.com>, selinux@vger.kernel.org
Subject: Re: [PATCH libselinux 1/2] libselinux/src/Makefile: don't use ln --relative option
Date: Mon, 28 Oct 2019 13:06:36 -0400 [thread overview]
Message-ID: <f942a0b3-de30-3043-2993-40be6cfc7910@tycho.nsa.gov> (raw)
In-Reply-To: <20191025134304.12666-1-thomas.petazzoni@bootlin.com>
On 10/25/19 9:43 AM, Thomas Petazzoni wrote:
> The ln --relative option is not available in fairly old versions of
> ln, which are still in use in older Linux distributions.
>
> Since the two use of ln --relative can very trivially be implemented
> differently in libselinux/src/Makefile, let's do so.
This changes where the libselinux.so symlink is created (from LIBDIR to
SHLIBDIR), and yields a broken build for make DESTDIR=~/obj install. As
a result, the travis build breaks.
>
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
> ---
> libselinux/src/Makefile | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/libselinux/src/Makefile b/libselinux/src/Makefile
> index 2b1696a0..dc675a49 100644
> --- a/libselinux/src/Makefile
> +++ b/libselinux/src/Makefile
> @@ -170,12 +170,12 @@ install: all
> install -m 755 $(LIBSO) $(DESTDIR)$(SHLIBDIR)
> test -d $(DESTDIR)$(LIBDIR)/pkgconfig || install -m 755 -d $(DESTDIR)$(LIBDIR)/pkgconfig
> install -m 644 $(LIBPC) $(DESTDIR)$(LIBDIR)/pkgconfig
> - ln -sf --relative $(DESTDIR)$(SHLIBDIR)/$(LIBSO) $(DESTDIR)$(LIBDIR)/$(TARGET)
> + cd $(DESTDIR)$(SHLIBDIR) && ln -sf $(LIBSO) $(TARGET)
>
> install-pywrap: pywrap
> $(PYTHON) setup.py install --prefix=$(PREFIX) `test -n "$(DESTDIR)" && echo --root $(DESTDIR)`
> install -m 644 $(SWIGPYOUT) $(DESTDIR)$(PYTHONLIBDIR)/selinux/__init__.py
> - ln -sf --relative $(DESTDIR)$(PYTHONLIBDIR)/selinux/_selinux$(PYCEXT) $(DESTDIR)$(PYTHONLIBDIR)/_selinux$(PYCEXT)
> + cd $(DESTDIR)$(PYTHONLIBDIR) && ln -sf selinux/_selinux$(PYCEXT) _selinux$(PYCEXT)
>
> install-rubywrap: rubywrap
> test -d $(DESTDIR)$(RUBYINSTALL) || install -m 755 -d $(DESTDIR)$(RUBYINSTALL)
>
prev parent reply other threads:[~2019-10-28 17:06 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-25 13:43 [PATCH libselinux 1/2] libselinux/src/Makefile: don't use ln --relative option Thomas Petazzoni
2019-10-25 13:43 ` [PATCH libselinux 2/2] libselinux/src/Makefile: do not use PYCEXT, and rely on the installed file name Thomas Petazzoni
2019-10-31 17:40 ` Nicolas Iooss
2019-10-28 17:06 ` Stephen Smalley [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=f942a0b3-de30-3043-2993-40be6cfc7910@tycho.nsa.gov \
--to=sds@tycho.nsa.gov \
--cc=selinux@vger.kernel.org \
--cc=thomas.petazzoni@bootlin.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).