Alexander Pyhalov
2016-12-02 524c9842feb47f4b3fb4576a73f56633d7bba819
graphviz: ruby module is linked to libruby 1.9
1 files added
2 files modified
17 ■■■■■ changed files
components/image/graphviz/Makefile 4 ●●● patch | view | raw | blame | history
components/image/graphviz/patches/ruby-23.patch 11 ●●●●● patch | view | raw | blame | history
transforms/ignore-libs 2 ●●●●● patch | view | raw | blame | history
components/image/graphviz/Makefile
@@ -27,7 +27,7 @@
COMPONENT_NAME=        graphviz
COMPONENT_VERSION=    2.38.0
COMPONENT_REVISION=    5
COMPONENT_REVISION=    6
COMPONENT_PROJECT_URL=    http://www.graphviz.org/
COMPONENT_SRC=        $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE=    $(COMPONENT_SRC).tar.gz
@@ -51,6 +51,8 @@
CPPFLAGS +=    $(shell /usr/php/5.6/bin/php-config --includes)
#CXX +=        $(studio_NORUNPATH)
COMPONENT_PREP_ACTION = (cd $(@D) && autoconf)
# Can't find headers without this.
COMPONENT_PRE_CONFIGURE_ACTION =        ($(CLONEY) $(SOURCE_DIR) $(@D))
components/image/graphviz/patches/ruby-23.patch
New file
@@ -0,0 +1,11 @@
--- graphviz-2.38.0/configure.ac.1    2016-12-02 08:24:36.817166614 +0300
+++ graphviz-2.38.0/configure.ac    2016-12-02 08:24:52.526198058 +0300
@@ -1570,7 +1570,7 @@
           RUBY_INSTALL_DIR="`$RUBY $srcdir/config/config_ruby.rb vendorarchdir`"
     fi
       ],[
-        PKG_CHECK_MODULES([RUBY], [ruby-1.9],[
+        PKG_CHECK_MODULES([RUBY], [ruby-2.3],[
       AC_CHECK_PROG(RUBY,ruby,ruby)
           if test "x$RUBY" = "x"; then
             use_ruby="No (ruby not available)"
transforms/ignore-libs
@@ -1,2 +1,4 @@
# Don't depend on PostgreSQL compatibility  symbolic link, specify real PG version
<transform file -> add pkg.depend.bypass-generate usr/lib(.*)/libpq.so.*>
# Don't depend on Ruby 2 compatibility  symbolic link, specify real Ruby
<transform file -> add pkg.depend.bypass-generate usr/lib(.*)/libruby.so.*>