diff mbox

[2/4] libselinux, libsemanage: link Ruby wrapper with -lruby

Message ID CAJfZ7=nTwJxwCfttodtjuk8M3eU+2PyJGKJ0PmVraiDdJ=F-vg@mail.gmail.com (mailing list archive)
State Not Applicable
Headers show

Commit Message

Nicolas Iooss June 26, 2017, 9:08 p.m. UTC 
On Fri, Jun 23, 2017 at 4:14 PM, Stephen Smalley <sds@tycho.nsa.gov> wrote:
> On Wed, 2017-06-21 at 22:27 +0800, Jason Zaman wrote:
>> On Wed, Jun 21, 2017 at 04:02:29PM +0200, Nicolas Iooss wrote:
>> > On Wed, Jun 21, 2017 at 3:42 PM, Stephen Smalley <sds@tycho.nsa.gov
>> > > wrote:
>> > > On Wed, 2017-06-21 at 11:38 +0200, Laurent Bigonville wrote:
>> > > > Hello,
>> > > >
>> > > > Le 14/11/16 à 22:28, Nicolas Iooss a écrit :
>> > > > > When linking with -Wl,-no-undefined in LDFLAGS (in order to
>> > > > > find
>> > > > > possible link-time errors), the Ruby wrapper module needs to
>> > > > > be
>> > > > > linked
>> > > > > with the libruby.so which is used by $(RUBY). Introduce a new
>> > > > > RUBYLIBS
>> > > > > variable to find this library.
>> > > > >
>> > > > > Signed-off-by: Nicolas Iooss <nicolas.iooss@m4x.org>
>> > > > > ---
>> > > > >   libselinux/src/Makefile  | 3 ++-
>> > > > >   libsemanage/src/Makefile | 3 ++-
>> > > > >   2 files changed, 4 insertions(+), 2 deletions(-)
>> > > > >
>> > > > > diff --git a/libselinux/src/Makefile
>> > > > > b/libselinux/src/Makefile
>> > > > > index 4fe1f7002181..82a1010af2d8 100644
>> > > > > --- a/libselinux/src/Makefile
>> > > > > +++ b/libselinux/src/Makefile
>> > > > > @@ -15,6 +15,7 @@ INCLUDEDIR ?= $(PREFIX)/include
>> > > > >   PYINC ?= $(shell $(PKG_CONFIG) --cflags $(PYPREFIX))
>> > > > >   PYSITEDIR ?= $(DESTDIR)$(shell $(PYTHON) -c 'import site;
>> > > > > print(site.getsitepackages()[0])')
>> > > > >   RUBYINC ?= $(shell $(RUBY) -e 'puts "-I" +
>> > > > > RbConfig::CONFIG["rubyarchhdrdir"] + " -I" +
>> > > > > RbConfig::CONFIG["rubyhdrdir"]')
>> > > > > +RUBYLIBS ?= $(shell $(RUBY) -e 'puts "-L" +
>> > > > > RbConfig::CONFIG["libdir"] + " -lruby"')
>> > > >
>> > > > I'm trying to package 2.7-rc2 in debian and unfortunately this
>> > > > is
>> > > > not
>> > > > working out of the box for me. The library is not installed as
>> > > > -lruby
>> > > > but as -lruby-2.3 (for ruby 2.3). In addition the lib is not
>> > > > installed
>> > > > in /usr/lib.
>> > > >
>> > > > I can see in the RbConfig::CONFIG hash a key called
>> > > > LIBRUBYARG_SHARED
>> > > > or
>> > > > LIBRUBYARG which contains "-lruby-2.3". Also I see a
>> > > > "archlibdir" or
>> > > > "sitearchlibdir" key which contains the correct path to the lib
>> > > > (the
>> > > > multiarch path)
>> > > >
>> > > > RUBYLIBS ?= $(shell $@ -e 'puts "-L" +
>> > > > RbConfig::CONFIG["archlibdir"]
>> > > > +
>> > > > " " + RbConfig::CONFIG["LIBRUBYARG_SHARED"]')
>> > > >
>> > > > Could this be a possible alternatives for the other
>> > > > distributions?
>> > >
>> > > Assuming you mean $(RUBY) rather than $@ above, that works for me
>> > > on
>> > > Fedora:
>> > > $ ruby -e 'puts "-L" + RbConfig::CONFIG["archlibdir"] + " " +
>> > > RbConfig::CONFIG["LIBRUBYARG_SHARED"]'
>> > > -L/usr/lib64 -lruby
>> >
>> > On Arch Linux:
>> >
>> > $ ruby -e 'puts RbConfig::CONFIG["LIBRUBYARG"]'
>> > -lruby
>> > $ ruby -e 'puts RbConfig::CONFIG["LIBRUBYARG_SHARED"]'
>> > -lruby
>> > $ ruby -e 'puts RbConfig::CONFIG["archlibdir"]'
>> > /usr/lib/x86_64-linux
>> > $ ls -l /usr/lib/x86_64-linux/libruby.so
>> > ls: cannot access '/usr/lib/x86_64-linux/libruby.so': No such file
>> > or directory
>> > $ ruby -e 'puts RbConfig::CONFIG["libdir"]'
>> > /usr/lib
>> > $ ls -l /usr/lib/libruby.so
>> > lrwxrwxrwx 1 root root 16 2017-04-22 15:40 /usr/lib/libruby.so ->
>> > libruby.so.2.4.1*
>> >
>> > So replacing -lruby with RbConfig::CONFIG["LIBRUBYARG_SHARED"] and
>> > adding "-L" + RbConfig::CONFIG["archlibdir"] in RUBYLIBS definition
>> > seem to work fine.
>> >
>> > Nicolas
>>
>> Heres gentoo:
>> $ ruby -e 'puts RbConfig::CONFIG["LIBRUBYARG"]'
>> -lruby21
>> $ ruby -e 'puts RbConfig::CONFIG["LIBRUBYARG_SHARED"]'
>> -lruby21
>> $ ruby -e 'puts RbConfig::CONFIG["archlibdir"]'
>> /usr/lib64/x86_64-linux
>> $ stat /usr/lib64/x86_64-linux
>> stat: cannot stat '/usr/lib64/x86_64-linux': No such file or
>> directory
>> $ ruby -e 'puts RbConfig::CONFIG["libdir"]'
>> /usr/lib64
>> $ ls -l /usr/lib64/libruby2*
>> -rw-r--r--. 1 root root 4078832 May  8 16:27 /usr/lib64/libruby21-
>> static.a
>> lrwxrwxrwx. 1 root root      18 May  8 16:27 /usr/lib64/libruby21.so
>> -> libruby21.so.2.1.0*
>> lrwxrwxrwx. 1 root root      18 May  8 16:27
>> /usr/lib64/libruby21.so.2.1 -> libruby21.so.2.1.0*
>> -rwxr-xr-x. 1 root root 2506160 May  8 16:27
>> /usr/lib64/libruby21.so.2.1.0*
>> -rw-r--r--. 1 root root 4588894 May  6 12:28 /usr/lib64/libruby22-
>> static.a
>> lrwxrwxrwx. 1 root root      18 May  6 12:28 /usr/lib64/libruby22.so
>> -> libruby22.so.2.2.0*
>> lrwxrwxrwx. 1 root root      18 May  6 12:28
>> /usr/lib64/libruby22.so.2.2 -> libruby22.so.2.2.0*
>> -rwxr-xr-x. 1 root root 2622488 May  6 12:28
>> /usr/lib64/libruby22.so.2.2.0*
>>
>> $ qlist -Iv ruby
>> ...
>> dev-lang/ruby-2.1.9
>> dev-lang/ruby-2.2.6
>
> So, what's the conclusion?  Do we have a consensus on replacing it as
> proposed?  Looks like from the output above that archlibdir doesn't
> actually work on gentoo or arch since the file doesn't exist there?

>From the previous messages, I conclude that both "libdir" and
"archlibdir" are needed and that "LIBRUBYARG" and "LIBRUBYARG_SHARED"
share the same value. As the linker does not issue any error when
using -L with a non-existent path, a possible solution would be to use
both directories. For example for libselinux:

-RUBYLIBS ?= $(shell $(RUBY) -e 'puts "-L" +
RbConfig::CONFIG["libdir"] + " -lruby"')
+RUBYLIBS ?= $(shell $(RUBY) -e 'puts "-L" +
RbConfig::CONFIG["libdir"] + " -L" + RbConfig::CONFIG["archlibdir"] +
" " + RbConfig::CONFIG["LIBRUBYARG_SHARED"]')
 RUBYINSTALL ?= $(DESTDIR)$(shell $(RUBY) -e 'puts
RbConfig::CONFIG["vendorarchdir"]')
 LIBBASE ?= $(shell basename $(LIBDIR))
 LIBSEPOLA ?= $(LIBDIR)/libsepol.a

With this, "make install-rubywrap" works fine on my system and should
work on other ones.

Nicolas
diff mbox

Patch

--- a/libselinux/src/Makefile
+++ b/libselinux/src/Makefile
@@ -17,7 +17,7 @@  PYLIBS ?= $(shell $(PKG_CONFIG) --libs $(PYPREFIX))
 PYSITEDIR ?= $(DESTDIR)$(shell $(PYTHON) -c 'import site;
print(site.getsitepackages()[0])')
 PYCEXT ?= $(shell $(PYTHON) -c 'import imp;print([s for s,m,t in
imp.get_suffixes() if t == imp.C_EXTENSION][0])')
 RUBYINC ?= $(shell $(RUBY) -e 'puts "-I" +
RbConfig::CONFIG["rubyarchhdrdir"] + " -I" +
RbConfig::CONFIG["rubyhdrdir"]')