Sat Jun 11 18:31:03 2016 UTC ()
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


(spz)
diff -r1.11 -r1.11.4.1 pkgsrc/devel/libthrift/distinfo
diff -r1.7 -r1.7.22.1 pkgsrc/devel/libthrift/options.mk
diff -r1.1 -r1.1.40.1 pkgsrc/devel/libthrift/patches/patch-lib__rb__setup.rb
diff -r0 -r1.1.2.2 pkgsrc/devel/libthrift/patches/patch-lib_rb_Makefile.in
cvs diff -r1.11 -r1.11.4.1 pkgsrc/devel/libthrift/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/libthrift/Attic/distinfo 2015/11/03 03:27:45 1.11
+++ pkgsrc/devel/libthrift/Attic/distinfo 2016/06/11 18:31:02 1.11.4.1
@@ -1,26 +1,27 @@ @@ -1,26 +1,27 @@
1$NetBSD: distinfo,v 1.11 2015/11/03 03:27:45 agc Exp $ 1$NetBSD: distinfo,v 1.11.4.1 2016/06/11 18:31:02 spz Exp $
2 2
3SHA1 (thrift-0.7.0.tar.gz) = b8f6877bc75878984355da4efe171ad99ff05b6a 3SHA1 (thrift-0.7.0.tar.gz) = b8f6877bc75878984355da4efe171ad99ff05b6a
4RMD160 (thrift-0.7.0.tar.gz) = d9db8ff077347134101cd017e086511c4317b052 4RMD160 (thrift-0.7.0.tar.gz) = d9db8ff077347134101cd017e086511c4317b052
5SHA512 (thrift-0.7.0.tar.gz) = 43f2ef8da3d7dad2d790401da78a2bc9bc5e1d256f05ba4c541ea82b6d4546ee2878ae90c94916ade57a83de25f2ad215ef05339d411570ab0892db5386b640c 5SHA512 (thrift-0.7.0.tar.gz) = 43f2ef8da3d7dad2d790401da78a2bc9bc5e1d256f05ba4c541ea82b6d4546ee2878ae90c94916ade57a83de25f2ad215ef05339d411570ab0892db5386b640c
6Size (thrift-0.7.0.tar.gz) = 2248326 bytes 6Size (thrift-0.7.0.tar.gz) = 2248326 bytes
7SHA1 (patch-ac) = 84032447dc90b7071d8f54fc56dd30584fbc8116 7SHA1 (patch-ac) = 84032447dc90b7071d8f54fc56dd30584fbc8116
8SHA1 (patch-compiler_cpp_src_generate_t__rb__generator.cc) = 1b2e71c38fdf3211be65bc199f348fcbadfe805c 8SHA1 (patch-compiler_cpp_src_generate_t__rb__generator.cc) = 1b2e71c38fdf3211be65bc199f348fcbadfe805c
9SHA1 (patch-compiler_cpp_src_thrifty.yy) = 69ccc48794edf8358ab39950794e1c542641fb3f 9SHA1 (patch-compiler_cpp_src_thrifty.yy) = 69ccc48794edf8358ab39950794e1c542641fb3f
10SHA1 (patch-lib__rb__ext__extconf.rb) = 627725567f6d78070e28d430ebe7ac96910df8ec 10SHA1 (patch-lib__rb__ext__extconf.rb) = 627725567f6d78070e28d430ebe7ac96910df8ec
11SHA1 (patch-lib__rb__setup.rb) = 4e08bb4c0828306ee2391f5d5760e74a5df30a73 11SHA1 (patch-lib__rb__setup.rb) = 9b189208c01a654ff633756d8800fb327ba7a9b7
12SHA1 (patch-lib_cpp_src_async_TAsyncBufferProcessor.h) = 2387b52d1dcd01637bd0853743ede85dd4a3357b 12SHA1 (patch-lib_cpp_src_async_TAsyncBufferProcessor.h) = 2387b52d1dcd01637bd0853743ede85dd4a3357b
13SHA1 (patch-lib_cpp_src_async_TAsyncChannel.cpp) = dd3d65fd83f6ab4ebbc81f7e6ea98b05ef13592e 13SHA1 (patch-lib_cpp_src_async_TAsyncChannel.cpp) = dd3d65fd83f6ab4ebbc81f7e6ea98b05ef13592e
14SHA1 (patch-lib_cpp_src_async_TAsyncChannel.h) = 6a9e25f84d9d1d8b1192c5f3b059ea7a39c8396a 14SHA1 (patch-lib_cpp_src_async_TAsyncChannel.h) = 6a9e25f84d9d1d8b1192c5f3b059ea7a39c8396a
15SHA1 (patch-lib_cpp_src_async_TAsyncProcessor.h) = 15c9b3534276fc6b75f5f3c7978ad7e914b38f61 15SHA1 (patch-lib_cpp_src_async_TAsyncProcessor.h) = 15c9b3534276fc6b75f5f3c7978ad7e914b38f61
16SHA1 (patch-lib_cpp_src_async_TAsyncProtocolProcessor.cpp) = 70b06199d2908c7de3b0b18594e9492480f1a031 16SHA1 (patch-lib_cpp_src_async_TAsyncProtocolProcessor.cpp) = 70b06199d2908c7de3b0b18594e9492480f1a031
17SHA1 (patch-lib_cpp_src_async_TAsyncProtocolProcessor.h) = 49fd58352134e684e92bb9a70c423fe54b2688b5 17SHA1 (patch-lib_cpp_src_async_TAsyncProtocolProcessor.h) = 49fd58352134e684e92bb9a70c423fe54b2688b5
18SHA1 (patch-lib_cpp_src_async_TEvhttpServer.cpp) = 84558ef95935914cccb74405031bc532c9b180ad 18SHA1 (patch-lib_cpp_src_async_TEvhttpServer.cpp) = 84558ef95935914cccb74405031bc532c9b180ad
19SHA1 (patch-lib_cpp_src_concurrency_FunctionRunner.h) = 8e15b54872ad0bb59276d25d7200517382a9fcb4 19SHA1 (patch-lib_cpp_src_concurrency_FunctionRunner.h) = 8e15b54872ad0bb59276d25d7200517382a9fcb4
20SHA1 (patch-lib_cpp_src_concurrency_ThreadManager.h) = e97795f632ed98c19172fa25ff6a83a0c9580ff2 20SHA1 (patch-lib_cpp_src_concurrency_ThreadManager.h) = e97795f632ed98c19172fa25ff6a83a0c9580ff2
21SHA1 (patch-lib_cpp_src_server_TNonblockingServer.cpp) = 1f94bcad637279b151b8c0830854c5fc72919e68 21SHA1 (patch-lib_cpp_src_server_TNonblockingServer.cpp) = 1f94bcad637279b151b8c0830854c5fc72919e68
22SHA1 (patch-lib_cpp_src_transport_TSSLSocket.cpp) = 5b0ee2a0d276affc4ead52492e0100f4c0665550 22SHA1 (patch-lib_cpp_src_transport_TSSLSocket.cpp) = 5b0ee2a0d276affc4ead52492e0100f4c0665550
23SHA1 (patch-lib_cpp_src_transport_TServerSocket.cpp) = dc54a0991f5918de04da73f184c551d7a2bd57ed 23SHA1 (patch-lib_cpp_src_transport_TServerSocket.cpp) = dc54a0991f5918de04da73f184c551d7a2bd57ed
24SHA1 (patch-lib_cpp_test_Benchmark.cpp) = 65a3a873b33f7290551c535b4ef8c9a109aae3e1 24SHA1 (patch-lib_cpp_test_Benchmark.cpp) = 65a3a873b33f7290551c535b4ef8c9a109aae3e1
25SHA1 (patch-lib_erl_Makefile.in) = 74bfbc9f191f685cb175801a495ae4af0eaa6e69 25SHA1 (patch-lib_erl_Makefile.in) = 74bfbc9f191f685cb175801a495ae4af0eaa6e69
26SHA1 (patch-lib_php_src_ext_thrift__protocol_php__thrift__protocol.cpp) = 6c1f1add0bfc652662efa59fc47d15e91a4d6a2b 26SHA1 (patch-lib_php_src_ext_thrift__protocol_php__thrift__protocol.cpp) = 6c1f1add0bfc652662efa59fc47d15e91a4d6a2b
 27SHA1 (patch-lib_rb_Makefile.in) = 4478e76bafded2725ad1146bfc6d3e5855f37d41
cvs diff -r1.7 -r1.7.22.1 pkgsrc/devel/libthrift/Attic/options.mk (expand / switch to unified diff)

--- pkgsrc/devel/libthrift/Attic/options.mk 2013/07/03 15:58:02 1.7
+++ pkgsrc/devel/libthrift/Attic/options.mk 2016/06/11 18:31:02 1.7.22.1
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: options.mk,v 1.7 2013/07/03 15:58:02 jperkin Exp $ 1# $NetBSD: options.mk,v 1.7.22.1 2016/06/11 18:31:02 spz Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.libthrift 3PKG_OPTIONS_VAR= PKG_OPTIONS.libthrift
4PKG_SUPPORTED_OPTIONS= csharp java erlang python perl php ruby 4PKG_SUPPORTED_OPTIONS= csharp java erlang python perl php ruby
5 5
6.include "../../mk/bsd.options.mk" 6.include "../../mk/bsd.options.mk"
7 7
8PLIST_VARS+= csharp erlang java perl php python ruby 8PLIST_VARS+= csharp erlang java perl php python ruby
9 9
10.if !empty(PKG_OPTIONS:Mcsharp) 10.if !empty(PKG_OPTIONS:Mcsharp)
11CONFIGURE_ARGS+= --with-csharp 11CONFIGURE_ARGS+= --with-csharp
12CONFIGURE_ARGS+= --enable-gen-csharp 12CONFIGURE_ARGS+= --enable-gen-csharp
13PLIST.csharp= yes 13PLIST.csharp= yes
14INSTALLATION_DIRS+= lib/thrift 14INSTALLATION_DIRS+= lib/thrift
@@ -83,19 +83,20 @@ PLIST.php= yes @@ -83,19 +83,20 @@ PLIST.php= yes
83EXTRACT_SUFX= .tar.gz 83EXTRACT_SUFX= .tar.gz
84 84
85.include "../../lang/php/phpversion.mk" 85.include "../../lang/php/phpversion.mk"
86.include "${PHPPKGSRCDIR}/Makefile.common" 86.include "${PHPPKGSRCDIR}/Makefile.common"
87.include "${PHPPKGSRCDIR}/buildlink3.mk" 87.include "${PHPPKGSRCDIR}/buildlink3.mk"
88.else 88.else
89CONFIGURE_ARGS+= --without-php 89CONFIGURE_ARGS+= --without-php
90CONFIGURE_ARGS+= --without-php_extension 90CONFIGURE_ARGS+= --without-php_extension
91.endif 91.endif
92 92
93.if !empty(PKG_OPTIONS:Mruby) 93.if !empty(PKG_OPTIONS:Mruby)
94CONFIGURE_ARGS+= --with-ruby 94CONFIGURE_ARGS+= --with-ruby
95CONFIGURE_ARGS+= --enable-gen-rb 95CONFIGURE_ARGS+= --enable-gen-rb
 96CONFIGURE_ENV+= ac_cv_path_RUBY=${RUBY}
96PLIST.ruby= yes 97PLIST.ruby= yes
97 98
98.include "../../lang/ruby/buildlink3.mk" 99.include "../../lang/ruby/buildlink3.mk"
99.else 100.else
100CONFIGURE_ARGS+= --without-ruby 101CONFIGURE_ARGS+= --without-ruby
101.endif 102.endif
cvs diff -r1.1 -r1.1.40.1 pkgsrc/devel/libthrift/patches/Attic/patch-lib__rb__setup.rb (expand / switch to unified diff)

--- pkgsrc/devel/libthrift/patches/Attic/patch-lib__rb__setup.rb 2011/06/03 13:39:45 1.1
+++ pkgsrc/devel/libthrift/patches/Attic/patch-lib__rb__setup.rb 2016/06/11 18:31:02 1.1.40.1
@@ -1,18 +1,39 @@ @@ -1,18 +1,39 @@
1$NetBSD: patch-lib__rb__setup.rb,v 1.1 2011/06/03 13:39:45 fhajny Exp $ 1$NetBSD: patch-lib__rb__setup.rb,v 1.1.40.1 2016/06/11 18:31:02 spz Exp $
 2
 3* Changes for pkgsrc.
 4* Remove duplicate 'bin-dir' key.
 5* Do not use obsolete Config::CONFIG but RbConfig::CONFIG.
2 6
3pkgsrc prefers vendor Ruby dirs. 7pkgsrc prefers vendor Ruby dirs.
4--- lib/rb/setup.rb.orig 2011-01-31 01:13:14.000000000 +0000 8--- lib/rb/setup.rb.orig 2011-08-11 13:19:12.000000000 +0000
5+++ lib/rb/setup.rb 9+++ lib/rb/setup.rb
6@@ -165,9 +165,9 @@ class ConfigTable 10@@ -165,9 +165,9 @@ class ConfigTable
7 libruby = "#{c['prefix']}/lib/ruby" 11 libruby = "#{c['prefix']}/lib/ruby"
8 librubyver = c['rubylibdir'] 12 librubyver = c['rubylibdir']
9 librubyverarch = c['archdir'] 13 librubyverarch = c['archdir']
10- siteruby = c['sitedir'] 14- siteruby = c['sitedir']
11- siterubyver = c['sitelibdir'] 15- siterubyver = c['sitelibdir']
12- siterubyverarch = c['sitearchdir'] 16- siterubyverarch = c['sitearchdir']
13+ siteruby = c['vendordir'] 17+ siteruby = c['vendordir']
14+ siterubyver = c['vendorlibdir'] 18+ siterubyver = c['vendorlibdir']
15+ siterubyverarch = c['vendorarchdir'] 19+ siterubyverarch = c['vendorarchdir']
16 elsif newpath_p 20 elsif newpath_p
17 # 1.4.4 <= V <= 1.6.3 21 # 1.4.4 <= V <= 1.6.3
18 libruby = "#{c['prefix']}/lib/ruby" 22 libruby = "#{c['prefix']}/lib/ruby"
 23@@ -281,7 +281,6 @@ class ConfigTable
 24 'site-ruby-common' => 'siteruby', # For backward compatibility
 25 'site-ruby' => 'siterubyver', # For backward compatibility
 26 'bin-dir' => 'bindir',
 27- 'bin-dir' => 'bindir',
 28 'rb-dir' => 'rbdir',
 29 'so-dir' => 'sodir',
 30 'data-dir' => 'datadir',
 31@@ -785,7 +784,7 @@ class ToplevelInstaller
 32 else
 33 require 'rbconfig'
 34 end
 35- ::Config::CONFIG
 36+ ::RbConfig::CONFIG
 37 end
 38
 39 def initialize(ardir_root, config)
File Added: pkgsrc/devel/libthrift/patches/Attic/patch-lib_rb_Makefile.in
$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)