Fix variables provided by ruby.pc (rhbz#789532, comment 8).
This commit is contained in:
parent
a80c9ddd65
commit
fd812ccb12
2 changed files with 40 additions and 1 deletions
|
|
@ -0,0 +1,35 @@
|
|||
From bf4959bc763167b2245a5f4c699fcb72afead5a5 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch@redhat.com>
|
||||
Date: Fri, 18 Jan 2013 15:51:49 +0100
|
||||
Subject: [PATCH] Expand ruby.pc variable by configuration process.
|
||||
|
||||
---
|
||||
template/ruby.pc.in | 12 ++++++------
|
||||
1 file changed, 6 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/template/ruby.pc.in b/template/ruby.pc.in
|
||||
index 2d6716c..25e42f3 100644
|
||||
--- a/template/ruby.pc.in
|
||||
+++ b/template/ruby.pc.in
|
||||
@@ -25,12 +25,12 @@ LIBS=@LIBS@
|
||||
DLDFLAGS=@DLDFLAGS@
|
||||
ruby=${bindir}/${RUBY_INSTALL_NAME}@EXEEXT@
|
||||
rubylibprefix=@rubylibprefix@
|
||||
-rubylibdir=${rubylibprefix}/${ruby_version}
|
||||
-vendordir=${rubylibprefix}/vendor_ruby
|
||||
-sitedir=${rubylibprefix}/site_ruby
|
||||
-rubyarchdir=${rubylibdir}/${arch}
|
||||
-vendorarchdir=${vendordir}/${sitearch}
|
||||
-sitearchdir=${sitedir}/${sitearch}
|
||||
+rubylibdir=@rubylibprefix@
|
||||
+vendordir=@vendordir@
|
||||
+sitedir=@sitedir@
|
||||
+rubyarchdir=@archdir@
|
||||
+vendorarchdir=@vendorarchdir@
|
||||
+sitearchdir=@sitearchdir@
|
||||
rubyhdrdir=@rubyhdrdir@
|
||||
vendorhdrdir=@vendorhdrdir@
|
||||
sitehdrdir=@sitehdrdir@
|
||||
--
|
||||
1.8.0.2
|
||||
|
||||
|
|
@ -105,6 +105,9 @@ Patch8: ruby-1.9.3-custom-rubygems-location.patch
|
|||
# Add support for installing binary extensions according to FHS.
|
||||
# https://github.com/rubygems/rubygems/issues/210
|
||||
Patch9: rubygems-1.8.11-binary-extensions.patch
|
||||
# Fixes issues mentioned in rhbz#789532, comment 8.
|
||||
# TODO: Should be probably upstreamed with #5281.
|
||||
Patch10: ruby-2.0.0-Expand-ruby.pc-variable-by-configuration-process.patch
|
||||
# Make mkmf verbose by default
|
||||
Patch12: ruby-1.9.3-mkmf-verbose.patch
|
||||
|
||||
|
|
@ -362,6 +365,7 @@ Tcl/Tk interface for the object-oriented scripting language Ruby.
|
|||
%patch4 -p1
|
||||
%patch8 -p1
|
||||
%patch9 -p1
|
||||
%patch10 -p1
|
||||
%patch12 -p1
|
||||
|
||||
# Provide an example of usage of the tapset:
|
||||
|
|
@ -801,7 +805,7 @@ make check TESTS="-v $DISABLE_TESTS"
|
|||
* Fri Jan 18 2013 Vít Ondruch <vondruch@redhat.com> - 2.0.0.0-0.1.r38848
|
||||
- Upgrade to Ruby 2.0.0 (r38848).
|
||||
- Build against libdb instead of libdb4 (rhbz#894022).
|
||||
- Provide nonversioned packageconfig (rhbz#789532).
|
||||
- Provide nonversioned packageconfig (rhbz#789532) and fix provided variables.
|
||||
- Move native extensions from exts to ruby directory.
|
||||
|
||||
* Mon Dec 10 2012 Vít Ondruch <vondruch@redhat.com> - 2.0.0.0-0.1.r38422
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue