diff options
| author | taca <taca@pkgsrc.org> | 2015-04-30 03:25:56 +0000 |
|---|---|---|
| committer | taca <taca@pkgsrc.org> | 2015-04-30 03:25:56 +0000 |
| commit | 8352d436318a06f586058129c46e2b075e4e5c9c (patch) | |
| tree | 7735b10fd7c8ef4a2addd583e15e1ff2e585b930 | |
| parent | 467b6b35c31f88486d8cc6d5736d31a29bcfdf6d (diff) | |
| download | pkgsrc-8352d436318a06f586058129c46e2b075e4e5c9c.tar.gz | |
Avoid to generate empty command line on some platforms:
$(DLLIB): $(OBJS) Makefile
...
$(Q) $(POSTLINK)
And POSTLINK is empty macro. In such case, GNU make ignore empty command
line but BSD make tries to execute it and causes error.
Bump PKGREVISION.
| -rw-r--r-- | lang/ruby193-base/Makefile | 4 | ||||
| -rw-r--r-- | lang/ruby193-base/distinfo | 3 | ||||
| -rw-r--r-- | lang/ruby193-base/patches/patch-lib_mkmf.rb | 21 |
3 files changed, 25 insertions, 3 deletions
diff --git a/lang/ruby193-base/Makefile b/lang/ruby193-base/Makefile index 54c6af931e3..e8ebf8e17d4 100644 --- a/lang/ruby193-base/Makefile +++ b/lang/ruby193-base/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.49 2015/03/08 14:53:39 taca Exp $ +# $NetBSD: Makefile,v 1.50 2015/04/30 03:25:56 taca Exp $ # DISTNAME= ${RUBY_DISTNAME} PKGNAME= ${RUBY_PKGPREFIX}-base-${RUBY_VERSION_FULL} -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= lang ruby MASTER_SITES= ${MASTER_SITE_RUBY} diff --git a/lang/ruby193-base/distinfo b/lang/ruby193-base/distinfo index c3eb1adb2b4..eb6931eb531 100644 --- a/lang/ruby193-base/distinfo +++ b/lang/ruby193-base/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.43 2015/04/03 08:59:08 jperkin Exp $ +$NetBSD: distinfo,v 1.44 2015/04/30 03:25:56 taca Exp $ SHA1 (ruby-1.9.3-p551.tar.bz2) = 35600f4e2ac98653fa8a634104cb6ab3d47a1535 RMD160 (ruby-1.9.3-p551.tar.bz2) = 59cfcaf4e02957f53bf83557962b0d428156bc01 @@ -18,6 +18,7 @@ SHA1 (patch-ext_tk_lib_tkextlib_tile_treeview.rb) = e31201b5d0f5c333f14b795ac5e6 SHA1 (patch-ext_tk_lib_tkextlib_tkimg_dted.rb) = c73d94032c22cbefb55daee2ba359d70751b1416 SHA1 (patch-ext_tk_lib_tkextlib_tkimg_raw.rb) = 2c99d8f59c0ad5d6a493dd6e663850262487f5ef SHA1 (patch-ext_tk_tcltklib.c) = c58bffdde4a89ea7c442b1cf37c12c5ce53ee890 +SHA1 (patch-lib_mkmf.rb) = ddf539a6c0fa91b751a59788e5dd933fc97d31db SHA1 (patch-lib_rdoc_ri_driver.rb) = acb4cb022893eb8dea2adf7564f5e5e1a0f1e9c8 SHA1 (patch-lib_rdoc_text.rb) = cfbf48096ce14da8016177f6a8e6ef4416929647 SHA1 (patch-lib_rubygems.rb) = e472c981e544b75c3762385895c9a0197be9badd diff --git a/lang/ruby193-base/patches/patch-lib_mkmf.rb b/lang/ruby193-base/patches/patch-lib_mkmf.rb new file mode 100644 index 00000000000..27f2bd081b6 --- /dev/null +++ b/lang/ruby193-base/patches/patch-lib_mkmf.rb @@ -0,0 +1,21 @@ +$NetBSD: patch-lib_mkmf.rb,v 1.3 2015/04/30 03:25:56 taca Exp $ + +Avoid to generate empty command line on some platforms: + +$(DLLIB): $(OBJS) Makefile +... + $(Q) $(POSTLINK) + +And POSTLINK is empty macro. In such case, GNU make ignore empty command +line but BSD make tries to execute it and causes error. + +--- lib/mkmf.rb.orig 2014-02-06 05:20:52.000000000 +0000 ++++ lib/mkmf.rb +@@ -1722,6 +1722,7 @@ LDSHARED = #{CONFIG['LDSHARED']} + LDSHAREDXX = #{config_string('LDSHAREDXX') || '$(LDSHARED)'} + AR = #{CONFIG['AR']} + EXEEXT = #{CONFIG['EXEEXT']} ++POSTLINK = #{CONFIG['POSTLINK']} + + RUBY_BASE_NAME = #{CONFIG['RUBY_BASE_NAME']} + RUBY_INSTALL_NAME = #{CONFIG['RUBY_INSTALL_NAME']} |