nobu	2017-10-16 13:15:19 +0900 (Mon, 16 Oct 2017)

  New Revision: 60187

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=60187

  Log:
    fix missing variables in ruby.pc
    
    * configure.ac (LIBRUBY_SO): get rid of referrence to
      LIBRUBY_SONAME which is not present in ruby.pc.
    
    * template/ruby.pc.in (RUBY_API_VERSION, SOEXT): add new
      variables.  [ruby-core:83208] [Bug #14002]

  Modified files:
    trunk/configure.ac
    trunk/template/ruby.pc.in
Index: template/ruby.pc.in
===================================================================
--- template/ruby.pc.in	(revision 60186)
+++ template/ruby.pc.in	(revision 60187)
@@ -9,6 +9,7 @@ MAJOR=@MAJOR@ https://github.com/ruby/ruby/blob/trunk/template/ruby.pc.in#L9
 MINOR=@MINOR@
 TEENY=@TEENY@
 ruby_version=@ruby_version@
+RUBY_API_VERSION=@RUBY_API_VERSION@
 RUBY_PROGRAM_VERSION=@RUBY_PROGRAM_VERSION@
 RUBY_BASE_NAME=@RUBY_BASE_NAME@
 RUBY_VERSION_NAME=@RUBY_VERSION_NAME@
@@ -37,6 +38,7 @@ sitehdrdir=@sitehdrdir@ https://github.com/ruby/ruby/blob/trunk/template/ruby.pc.in#L38
 rubyarchhdrdir=@rubyarchhdrdir@
 vendorarchhdrdir=@vendorarchhdrdir@
 sitearchhdrdir=@sitearchhdrdir@
+SOEXT=@SOEXT@
 LIBPATH=@LIBPATH@
 LIBRUBY_A=@LIBRUBY_A@
 LIBRUBY_SO=@LIBRUBY_SO@
Index: configure.ac
===================================================================
--- configure.ac	(revision 60186)
+++ configure.ac	(revision 60187)
@@ -3857,8 +3857,8 @@ AS_CASE("$enable_shared", [yes], [ https://github.com/ruby/ruby/blob/trunk/configure.ac#L3857
 	],
     [freebsd*|dragonfly*], [
 	SOLIBS='$(LIBS)'
-	LIBRUBY_SONAME='lib$(RUBY_SO_NAME).$(SOEXT).$(MAJOR)$(MINOR)'
-	LIBRUBY_SO='$(LIBRUBY_SONAME)'
+	LIBRUBY_SO='lib$(RUBY_SO_NAME).$(SOEXT).$(MAJOR)$(MINOR)'
+	LIBRUBY_SONAME='$(LIBRUBY_SO)'
 	AS_IF([test "$rb_cv_binary_elf" != "yes" ], [
 	    LIBRUBY_SO="$LIBRUBY_SO.\$(TEENY)"
 	    LIBRUBY_ALIASES=''
@@ -3867,7 +3867,7 @@ AS_CASE("$enable_shared", [yes], [ https://github.com/ruby/ruby/blob/trunk/configure.ac#L3867
     [netbsd*], [
 	SOLIBS='$(LIBS)'
 	LIBRUBY_SONAME='lib$(RUBY_SO_NAME).$(SOEXT).$(MAJOR)$(MINOR)'
-	LIBRUBY_SO='$(LIBRUBY_SONAME).$(TEENY)'
+	LIBRUBY_SO="${LIBRUBY_SONAME}"'.$(TEENY)'
 	RUBY_APPEND_OPTIONS(LIBRUBY_DLDFLAGS, ['-Wl,-soname,$(LIBRUBY_SONAME)' "$LDFLAGS_OPTDIR"])
 	AS_IF([test "$rb_cv_binary_elf" = yes], [ # ELF platforms
 	   LIBRUBY_ALIASES='$(LIBRUBY_SONAME) lib$(RUBY_SO_NAME).$(SOEXT)'

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/