pkgsrc-Bugs archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Re: pkg/44480: lang/python18-base and lang/python19-base build invalid +CONTENTS under Solaris



On Sat, 29 Jan 2011, OBATA Akio wrote:

From: "OBATA Akio" <obache%netbsd.org@localhost>
To: gnats-bugs%netbsd.org@localhost
Cc:
Subject: Re: pkg/44480: lang/python18-base and lang/python19-base build
invalid +CONTENTS under Solaris
Date: Sat, 29 Jan 2011 11:09:40 +0900

>> Fix:
I feel it's not python, but ruby.
Yes, of course.

Then, following patch fix the issue?

Index: lang/ruby/rubyversion.mk
===================================================================
RCS file: /cvsroot/pkgsrc/lang/ruby/rubyversion.mk,v
retrieving revision 1.55
diff -u -r1.55 rubyversion.mk
--- lang/ruby/rubyversion.mk    26 Dec 2010 12:29:07 -0000      1.55
+++ lang/ruby/rubyversion.mk    29 Jan 2011 02:07:36 -0000
@@ -173,7 +173,7 @@
  #
  RUBY_SHLIBVER?=                ${RUBY_API_VERSION}
  RUBY_SHLIB?=           ${RUBY_VER}.${RUBY_SLEXT}.${RUBY_SHLIBVER}
-RUBY_SHLIBALIAS?=      @comment
+RUBY_SHLIBALIAS?=      @comment No SHLIBALIAS
  RUBY_STATICLIB?=       ${RUBY_VER}-static.a

  .if ${OPSYS} == "NetBSD" || ${OPSYS} == "Interix"
@@ -389,7 +389,7 @@
  PRINT_PLIST_AWK+=      /${RUBY_SLEXT}\.${RUBY_SHLIBVER}$$/ \
                         { sub(/${RUBY_SLEXT}\.${RUBY_SHLIBVER}$$/, \
                         "$${RUBY_SLEXT}.$${RUBY_SHLIBVER}"); }
-.if ${RUBY_SHLIBALIAS} != "@comment"
+.if !empty(_RUBY_SHLIBALIAS)
  PRINT_PLIST_AWK+=      /${RUBY_SHLIBALIAS:S/\//\\\//}$$/ \
                         { sub(/${RUBY_SHLIBALIAS:S/\//\\\//}$$/, \
                         "$${RUBY_SHLIBALIAS}"); }

No.

The libraries are installed as follows
# ls -lai /opt/pkg/lib/libruby19*
87270 -rw-r--r-- 1 root root 3527692 Jan 30 15:01 /opt/pkg/lib/libruby19-static.a 87272 lrwxrwxrwx 1 root root 14 Jan 30 15:01 /opt/pkg/lib/libruby19.so -> libruby19.so.1 87269 -rwxr-xr-x 1 root root 2525856 Jan 30 15:01 /opt/pkg/lib/libruby19.so.1 87271 lrwxrwxrwx 1 root root 14 Jan 30 15:01 /opt/pkg/lib/libruby19.so.1.9.1 -> libruby19.so.1

The corresponding part in +CONTENTS looks now

lib/libruby19-static.a
@comment MD5:24df1f6e4ce8d3c952236be931e8b3cf
lib/libruby19.so
@comment Symlink:libruby19.so.1
@comment No SHLIBALIAS
lib/libruby19.so.1.9.1
@comment Symlink:libruby19.so.1

This means the main shared library lib/libruby19.so.1 is not part of the binary package.

Best regards,
Uwe


Home | Main Index | Thread Index | Old Index