Mon May 30 16:03:13 2016 UTC ()
More build fixes:

* Explict specify ruby's path to avoid path in WRKDIR.
* Do not build again on install stage to fix rpath problem.


(taca)
diff -r1.12 -r1.13 pkgsrc/devel/libthrift/distinfo
diff -r1.7 -r1.8 pkgsrc/devel/libthrift/options.mk
diff -r0 -r1.1 pkgsrc/devel/libthrift/patches/patch-lib_rb_Makefile.in
cvs diff -r1.12 -r1.13 pkgsrc/devel/libthrift/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/libthrift/Attic/distinfo 2016/05/30 09:22:58 1.12
+++ pkgsrc/devel/libthrift/Attic/distinfo 2016/05/30 16:03:13 1.13
@@ -1,26 +1,27 @@ @@ -1,26 +1,27 @@
1$NetBSD: distinfo,v 1.12 2016/05/30 09:22:58 taca Exp $ 1$NetBSD: distinfo,v 1.13 2016/05/30 16:03:13 taca 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) = 9b189208c01a654ff633756d8800fb327ba7a9b7 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) = dced084489c744f60135c7608187a313415ae82b
cvs diff -r1.7 -r1.8 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/05/30 16:03:13 1.8
@@ -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.8 2016/05/30 16:03:13 taca 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
File Added: pkgsrc/devel/libthrift/patches/Attic/patch-lib_rb_Makefile.in
$NetBSD: patch-lib_rb_Makefile.in,v 1.1 2016/05/30 16:03:13 taca 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)