diff options
| author | taca <taca@pkgsrc.org> | 2016-05-30 16:03:13 +0000 |
|---|---|---|
| committer | taca <taca@pkgsrc.org> | 2016-05-30 16:03:13 +0000 |
| commit | 33fcf9d1808fdd3c5f340c251fa948560fbfa11f (patch) | |
| tree | 8b7915664573958b31eae75835ff200ea0dbf6e1 | |
| parent | 705935a656c6049695bba65527b46bf1cab94ecb (diff) | |
| download | pkgsrc-33fcf9d1808fdd3c5f340c251fa948560fbfa11f.tar.gz | |
More build fixes:
* Explict specify ruby's path to avoid path in WRKDIR.
* Do not build again on install stage to fix rpath problem.
| -rw-r--r-- | devel/libthrift/distinfo | 3 | ||||
| -rw-r--r-- | devel/libthrift/options.mk | 3 | ||||
| -rw-r--r-- | devel/libthrift/patches/patch-lib_rb_Makefile.in | 28 |
3 files changed, 32 insertions, 2 deletions
diff --git a/devel/libthrift/distinfo b/devel/libthrift/distinfo index ccbbd0099e1..72c93101828 100644 --- a/devel/libthrift/distinfo +++ b/devel/libthrift/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.12 2016/05/30 09:22:58 taca Exp $ +$NetBSD: distinfo,v 1.13 2016/05/30 16:03:13 taca Exp $ SHA1 (thrift-0.7.0.tar.gz) = b8f6877bc75878984355da4efe171ad99ff05b6a RMD160 (thrift-0.7.0.tar.gz) = d9db8ff077347134101cd017e086511c4317b052 @@ -24,3 +24,4 @@ SHA1 (patch-lib_cpp_src_transport_TServerSocket.cpp) = dc54a0991f5918de04da73f18 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) = dced084489c744f60135c7608187a313415ae82b diff --git a/devel/libthrift/options.mk b/devel/libthrift/options.mk index 507e6b4a279..853cf2d8f48 100644 --- a/devel/libthrift/options.mk +++ b/devel/libthrift/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.7 2013/07/03 15:58:02 jperkin Exp $ +# $NetBSD: options.mk,v 1.8 2016/05/30 16:03:13 taca Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.libthrift PKG_SUPPORTED_OPTIONS= csharp java erlang python perl php ruby @@ -93,6 +93,7 @@ CONFIGURE_ARGS+= --without-php_extension .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 --git a/devel/libthrift/patches/patch-lib_rb_Makefile.in b/devel/libthrift/patches/patch-lib_rb_Makefile.in new file mode 100644 index 00000000000..d1993545b05 --- /dev/null +++ b/devel/libthrift/patches/patch-lib_rb_Makefile.in @@ -0,0 +1,28 @@ +$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) |