diff options
| author | taca <taca@pkgsrc.org> | 2015-04-30 03:34:31 +0000 |
|---|---|---|
| committer | taca <taca@pkgsrc.org> | 2015-04-30 03:34:31 +0000 |
| commit | 6f6374ffc1ee31e03258d1cd7a38f4fd3d2c9200 (patch) | |
| tree | 50d5bccc493964defb33dc20eed59f46f12f9fa3 | |
| parent | de6ba6bc91ba767825330ed45879416b9eeb33d2 (diff) | |
| download | pkgsrc-6f6374ffc1ee31e03258d1cd7a38f4fd3d2c9200.tar.gz | |
Backout previous commit since ruby200-base dose not need this patch.
| -rw-r--r-- | lang/ruby200-base/Makefile | 3 | ||||
| -rw-r--r-- | lang/ruby200-base/distinfo | 3 | ||||
| -rw-r--r-- | lang/ruby200-base/patches/patch-lib_mkmf.rb | 21 |
3 files changed, 2 insertions, 25 deletions
diff --git a/lang/ruby200-base/Makefile b/lang/ruby200-base/Makefile index cf2cd646709..a2c41647633 100644 --- a/lang/ruby200-base/Makefile +++ b/lang/ruby200-base/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.16 2015/04/30 03:26:37 taca Exp $ +# $NetBSD: Makefile,v 1.17 2015/04/30 03:34:31 taca Exp $ # DISTNAME= ${RUBY_DISTNAME} PKGNAME= ${RUBY_PKGPREFIX}-base-${RUBY_VERSION_FULL} -PKGREVISION= 1 CATEGORIES= lang ruby MASTER_SITES= ${MASTER_SITE_RUBY} diff --git a/lang/ruby200-base/distinfo b/lang/ruby200-base/distinfo index 7f962ca0d81..9e0f3e15298 100644 --- a/lang/ruby200-base/distinfo +++ b/lang/ruby200-base/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.24 2015/04/30 03:26:37 taca Exp $ +$NetBSD: distinfo,v 1.25 2015/04/30 03:34:31 taca Exp $ SHA1 (ruby-2.0.0-p645.tar.bz2) = e724dd0e4a1e820a368be307aa0863a8ecf4b694 RMD160 (ruby-2.0.0-p645.tar.bz2) = cbfd9ca2a5fe5d6ea1d89da9fd934c864bf339ab @@ -16,7 +16,6 @@ SHA1 (patch-ext_tk_lib_tkextlib_tile_treeview.rb) = e31201b5d0f5c333f14b795ac5e6 SHA1 (patch-ext_tk_lib_tkextlib_tkimg_dted.rb) = a330891af14e69f7b7ebcdba33ac81afcd8eba12 SHA1 (patch-ext_tk_lib_tkextlib_tkimg_raw.rb) = 21fcc547c7317d8110ed39d1559d2eaba31e3ec9 SHA1 (patch-ext_tk_tcltklib.c) = fda2652b0a3acc0047004cc43077a393f93c5554 -SHA1 (patch-lib_mkmf.rb) = 53e9943c849b119ffe3fa76d738fc5d1c8781e85 SHA1 (patch-lib_rdoc_ri_driver.rb) = 53ce4055b4c008c8ee13d38a81334d4846debdbc SHA1 (patch-lib_rubygems.rb) = 0f0b8f14745998f5ed0ade9b0b5cdefc8f30d988 SHA1 (patch-lib_rubygems_commands_setup__command.rb) = 46991d63256d0d3cc2f707fb286d1691331ad40e diff --git a/lang/ruby200-base/patches/patch-lib_mkmf.rb b/lang/ruby200-base/patches/patch-lib_mkmf.rb deleted file mode 100644 index 5dd26ec837f..00000000000 --- a/lang/ruby200-base/patches/patch-lib_mkmf.rb +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-lib_mkmf.rb,v 1.1 2015/04/30 03:26:37 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 2015-02-25 05:26:38.000000000 +0000 -+++ lib/mkmf.rb -@@ -1862,6 +1862,7 @@ LDSHARED = #{CONFIG['LDSHARED']} - LDSHAREDXX = #{config_string('LDSHAREDXX') || '$(LDSHARED)'} - AR = #{CONFIG['AR']} - EXEEXT = #{CONFIG['EXEEXT']} -+POSTLINK = #{CONFIG['POSTLINK']} - - } - CONFIG.each do |key, val| |