diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-10-16 04:15:19 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-10-16 04:15:19 +0000 |
commit | ae0eea21bf52745c6fbb812f9dd4897ae27e36ed (patch) | |
tree | 6265dbf122a8b6fe9c12a84327bff16ef696a73e | |
parent | 653263d04bbc5dbd0c7f173da9e655ec579dd581 (diff) | |
download | ruby-ae0eea21bf52745c6fbb812f9dd4897ae27e36ed.tar.gz |
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]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60187 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | configure.ac | 6 | ||||
-rw-r--r-- | template/ruby.pc.in | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 68b2a9b46c..ce73acd928 100644 --- a/configure.ac +++ b/configure.ac @@ -3857,8 +3857,8 @@ AS_CASE("$enable_shared", [yes], [ ], [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], [ [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)' diff --git a/template/ruby.pc.in b/template/ruby.pc.in index 2b68f59776..d874f92c3b 100644 --- a/template/ruby.pc.in +++ b/template/ruby.pc.in @@ -9,6 +9,7 @@ MAJOR=@MAJOR@ 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@ rubyarchhdrdir=@rubyarchhdrdir@ vendorarchhdrdir=@vendorarchhdrdir@ sitearchhdrdir=@sitearchhdrdir@ +SOEXT=@SOEXT@ LIBPATH=@LIBPATH@ LIBRUBY_A=@LIBRUBY_A@ LIBRUBY_SO=@LIBRUBY_SO@ |