pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/pkgsrc-2016Q1]: pkgsrc/devel/libthrift Pullup ticket #5039 - requeste...
details: https://anonhg.NetBSD.org/pkgsrc/rev/9ef1e11d5502
branches: pkgsrc-2016Q1
changeset: 408918:9ef1e11d5502
user: spz <spz%pkgsrc.org@localhost>
date: Sat Jun 11 18:31:02 2016 +0000
description:
Pullup ticket #5039 - requested by taca
devel/libthrift: build fix
Revisions pulled up:
- devel/libthrift/distinfo 1.12-1.14
- devel/libthrift/options.mk 1.8
- devel/libthrift/patches/patch-lib__rb__setup.rb 1.2
- devel/libthrift/patches/patch-lib_rb_Makefile.in 1.1
-------------------------------------------------------------------
Module Name: pkgsrc
Committed By: taca
Date: Mon May 30 09:22:58 UTC 2016
Modified Files:
pkgsrc/devel/libthrift: distinfo
pkgsrc/devel/libthrift/patches: patch-lib__rb__setup.rb
Log Message:
Fix build problem with Ruby 2.2 and later.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 pkgsrc/devel/libthrift/distinfo
cvs rdiff -u -r1.1 -r1.2 \
pkgsrc/devel/libthrift/patches/patch-lib__rb__setup.rb
-------------------------------------------------------------------
Module Name: pkgsrc
Committed By: taca
Date: Mon May 30 16:03:13 UTC 2016
Modified Files:
pkgsrc/devel/libthrift: distinfo options.mk
Added Files:
pkgsrc/devel/libthrift/patches: patch-lib_rb_Makefile.in
Log Message:
More build fixes:
* Explict specify ruby's path to avoid path in WRKDIR.
* Do not build again on install stage to fix rpath problem.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 pkgsrc/devel/libthrift/distinfo
cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/libthrift/options.mk
cvs rdiff -u -r0 -r1.1 \
pkgsrc/devel/libthrift/patches/patch-lib_rb_Makefile.in
-------------------------------------------------------------------
Module Name: pkgsrc
Committed By: taca
Date: Mon May 30 16:09:07 UTC 2016
Modified Files:
pkgsrc/devel/libthrift: distinfo
Log Message:
Update distinfo.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 pkgsrc/devel/libthrift/distinfo
diffstat:
devel/libthrift/distinfo | 5 ++-
devel/libthrift/options.mk | 3 +-
devel/libthrift/patches/patch-lib__rb__setup.rb | 25 +++++++++++++++++++-
devel/libthrift/patches/patch-lib_rb_Makefile.in | 28 ++++++++++++++++++++++++
4 files changed, 56 insertions(+), 5 deletions(-)
diffs (110 lines):
diff -r 9e0e9d664379 -r 9ef1e11d5502 devel/libthrift/distinfo
--- a/devel/libthrift/distinfo Sat Jun 11 10:06:37 2016 +0000
+++ b/devel/libthrift/distinfo Sat Jun 11 18:31:02 2016 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2015/11/03 03:27:45 agc Exp $
+$NetBSD: distinfo,v 1.11.4.1 2016/06/11 18:31:02 spz Exp $
SHA1 (thrift-0.7.0.tar.gz) = b8f6877bc75878984355da4efe171ad99ff05b6a
RMD160 (thrift-0.7.0.tar.gz) = d9db8ff077347134101cd017e086511c4317b052
@@ -8,7 +8,7 @@
SHA1 (patch-compiler_cpp_src_generate_t__rb__generator.cc) = 1b2e71c38fdf3211be65bc199f348fcbadfe805c
SHA1 (patch-compiler_cpp_src_thrifty.yy) = 69ccc48794edf8358ab39950794e1c542641fb3f
SHA1 (patch-lib__rb__ext__extconf.rb) = 627725567f6d78070e28d430ebe7ac96910df8ec
-SHA1 (patch-lib__rb__setup.rb) = 4e08bb4c0828306ee2391f5d5760e74a5df30a73
+SHA1 (patch-lib__rb__setup.rb) = 9b189208c01a654ff633756d8800fb327ba7a9b7
SHA1 (patch-lib_cpp_src_async_TAsyncBufferProcessor.h) = 2387b52d1dcd01637bd0853743ede85dd4a3357b
SHA1 (patch-lib_cpp_src_async_TAsyncChannel.cpp) = dd3d65fd83f6ab4ebbc81f7e6ea98b05ef13592e
SHA1 (patch-lib_cpp_src_async_TAsyncChannel.h) = 6a9e25f84d9d1d8b1192c5f3b059ea7a39c8396a
@@ -24,3 +24,4 @@
SHA1 (patch-lib_cpp_test_Benchmark.cpp) = 65a3a873b33f7290551c535b4ef8c9a109aae3e1
SHA1 (patch-lib_erl_Makefile.in) = 74bfbc9f191f685cb175801a495ae4af0eaa6e69
SHA1 (patch-lib_php_src_ext_thrift__protocol_php__thrift__protocol.cpp) = 6c1f1add0bfc652662efa59fc47d15e91a4d6a2b
+SHA1 (patch-lib_rb_Makefile.in) = 4478e76bafded2725ad1146bfc6d3e5855f37d41
diff -r 9e0e9d664379 -r 9ef1e11d5502 devel/libthrift/options.mk
--- a/devel/libthrift/options.mk Sat Jun 11 10:06:37 2016 +0000
+++ b/devel/libthrift/options.mk Sat Jun 11 18:31:02 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.7 2013/07/03 15:58:02 jperkin Exp $
+# $NetBSD: options.mk,v 1.7.22.1 2016/06/11 18:31:02 spz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.libthrift
PKG_SUPPORTED_OPTIONS= csharp java erlang python perl php ruby
@@ -93,6 +93,7 @@
.if !empty(PKG_OPTIONS:Mruby)
CONFIGURE_ARGS+= --with-ruby
CONFIGURE_ARGS+= --enable-gen-rb
+CONFIGURE_ENV+= ac_cv_path_RUBY=${RUBY}
PLIST.ruby= yes
.include "../../lang/ruby/buildlink3.mk"
diff -r 9e0e9d664379 -r 9ef1e11d5502 devel/libthrift/patches/patch-lib__rb__setup.rb
--- a/devel/libthrift/patches/patch-lib__rb__setup.rb Sat Jun 11 10:06:37 2016 +0000
+++ b/devel/libthrift/patches/patch-lib__rb__setup.rb Sat Jun 11 18:31:02 2016 +0000
@@ -1,7 +1,11 @@
-$NetBSD: patch-lib__rb__setup.rb,v 1.1 2011/06/03 13:39:45 fhajny Exp $
+$NetBSD: patch-lib__rb__setup.rb,v 1.1.40.1 2016/06/11 18:31:02 spz Exp $
+
+* Changes for pkgsrc.
+* Remove duplicate 'bin-dir' key.
+* Do not use obsolete Config::CONFIG but RbConfig::CONFIG.
pkgsrc prefers vendor Ruby dirs.
---- lib/rb/setup.rb.orig 2011-01-31 01:13:14.000000000 +0000
+--- lib/rb/setup.rb.orig 2011-08-11 13:19:12.000000000 +0000
+++ lib/rb/setup.rb
@@ -165,9 +165,9 @@ class ConfigTable
libruby = "#{c['prefix']}/lib/ruby"
@@ -16,3 +20,20 @@
elsif newpath_p
# 1.4.4 <= V <= 1.6.3
libruby = "#{c['prefix']}/lib/ruby"
+@@ -281,7 +281,6 @@ class ConfigTable
+ 'site-ruby-common' => 'siteruby', # For backward compatibility
+ 'site-ruby' => 'siterubyver', # For backward compatibility
+ 'bin-dir' => 'bindir',
+- 'bin-dir' => 'bindir',
+ 'rb-dir' => 'rbdir',
+ 'so-dir' => 'sodir',
+ 'data-dir' => 'datadir',
+@@ -785,7 +784,7 @@ class ToplevelInstaller
+ else
+ require 'rbconfig'
+ end
+- ::Config::CONFIG
++ ::RbConfig::CONFIG
+ end
+
+ def initialize(ardir_root, config)
diff -r 9e0e9d664379 -r 9ef1e11d5502 devel/libthrift/patches/patch-lib_rb_Makefile.in
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/libthrift/patches/patch-lib_rb_Makefile.in Sat Jun 11 18:31:02 2016 +0000
@@ -0,0 +1,28 @@
+$NetBSD: patch-lib_rb_Makefile.in,v 1.1.2.2 2016/06/11 18:31:02 spz Exp $
+
+* Avoid to build again on install stage.
+
+--- lib/rb/Makefile.in.orig 2011-08-11 13:19:12.000000000 +0000
++++ lib/rb/Makefile.in
+@@ -70,6 +70,7 @@ am__configure_deps = $(am__aclocal_m4_de
+ mkinstalldirs = $(install_sh) -d
+ CONFIG_HEADER = $(top_builddir)/config.h
+ CONFIG_CLEAN_FILES =
++CONFIG_STAMP = config.done
+ SOURCES =
+ DIST_SOURCES =
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+@@ -493,9 +494,12 @@ uninstall-am: uninstall-info-am
+
+ DESTDIR ?= /
+
+-all-local:
++all-local: ${CONFIG_STAMP}
++
++${CONFIG_STAMP}:
+ if [ -n "$(RUBY_PREFIX)" ] ; then $(RUBY) setup.rb config --prefix=$(DESTDIR)$(RUBY_PREFIX) --rbdir='$$libdir/ruby' --sodir='$$libdir/ruby' ; elif [ -n "$(DESTDIR)" ] ; then $(RUBY) setup.rb
config --prefix=$(DESTDIR) ; else $(RUBY) setup.rb config ; fi
+ $(RUBY) setup.rb setup
++ touch $@
+
+ install-exec-hook:
+ $(RUBY) setup.rb install --prefix=$(DESTDIR)
Home |
Main Index |
Thread Index |
Old Index