Pullup ticket #4722 - requested by taca lang/ruby22-base: build fix Revisions pulled up: - pkgsrc/lang/ruby22-base/Makefile 1.2 - pkgsrc/lang/ruby22-base/distinfo 1.4 - pkgsrc/lang/ruby22-base/patches/patch-configure 1.2 - pkgsrc/lang/ruby22-base/patches/patch-lib_mkmf.rb 1.1 --- Module Name: pkgsrc Committed By: sevan Date: Wed Apr 22 19:04:35 UTC 2015 Modified Files: pkgsrc/lang/ruby22-base: distinfo pkgsrc/lang/ruby22-base/patches: patch-configure Log Message: Remove mention of MirBSD in patch description as support is there by default now Reviewed by wiz@ --- Module Name: pkgsrc Committed By: taca Date: Thu Apr 30 03:27:52 UTC 2015 Modified Files: pkgsrc/lang/ruby22-base: Makefile distinfo Added Files: pkgsrc/lang/ruby22-base/patches: patch-lib_mkmf.rb Log Message: 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.diff -r1.1 -r1.1.2.1 pkgsrc/lang/ruby22-base/Makefile
(hiramatsu)
@@ -1,18 +1,19 @@ | @@ -1,18 +1,19 @@ | |||
1 | # $NetBSD: Makefile,v 1.1 2015/03/08 16:24:55 taca Exp $ | 1 | # $NetBSD: Makefile,v 1.1.2.1 2015/06/09 02:05:35 hiramatsu Exp $ | |
2 | # | 2 | # | |
3 | 3 | |||
4 | DISTNAME= ${RUBY_DISTNAME} | 4 | DISTNAME= ${RUBY_DISTNAME} | |
5 | PKGNAME= ${RUBY_PKGPREFIX}-base-${RUBY_VERSION_FULL} | 5 | PKGNAME= ${RUBY_PKGPREFIX}-base-${RUBY_VERSION_FULL} | |
6 | PKGREVISION= 1 | |||
6 | CATEGORIES= lang ruby | 7 | CATEGORIES= lang ruby | |
7 | MASTER_SITES= ${MASTER_SITE_RUBY} | 8 | MASTER_SITES= ${MASTER_SITE_RUBY} | |
8 | 9 | |||
9 | MAINTAINER= taca@NetBSD.org | 10 | MAINTAINER= taca@NetBSD.org | |
10 | HOMEPAGE= ${RUBY_HOMEPAGE} | 11 | HOMEPAGE= ${RUBY_HOMEPAGE} | |
11 | COMMENT= Ruby ${RUBY_VERSION} release minimum base package | 12 | COMMENT= Ruby ${RUBY_VERSION} release minimum base package | |
12 | LICENSE= ${RUBY_LICENSE} | 13 | LICENSE= ${RUBY_LICENSE} | |
13 | 14 | |||
14 | RUBY_VERSION_SUPPORTED= 22 | 15 | RUBY_VERSION_SUPPORTED= 22 | |
15 | 16 | |||
16 | USE_LANGUAGES= c | 17 | USE_LANGUAGES= c | |
17 | USE_TOOLS+= pax yacc | 18 | USE_TOOLS+= pax yacc | |
18 | GNU_CONFIGURE= yes | 19 | GNU_CONFIGURE= yes |
@@ -1,20 +1,21 @@ | @@ -1,20 +1,21 @@ | |||
1 | $NetBSD: distinfo,v 1.1.2.1 2015/04/26 08:47:12 tron Exp $ | 1 | $NetBSD: distinfo,v 1.1.2.2 2015/06/09 02:05:35 hiramatsu Exp $ | |
2 | 2 | |||
3 | SHA1 (ruby-2.2.2.tar.bz2) = de97ec6132ac76bb7c0f92b5ca4682138093af1b | 3 | SHA1 (ruby-2.2.2.tar.bz2) = de97ec6132ac76bb7c0f92b5ca4682138093af1b | |
4 | RMD160 (ruby-2.2.2.tar.bz2) = af9f1c4de12fc25c0d6e20bf339cc13e7d89df2d | 4 | RMD160 (ruby-2.2.2.tar.bz2) = af9f1c4de12fc25c0d6e20bf339cc13e7d89df2d | |
5 | Size (ruby-2.2.2.tar.bz2) = 13314437 bytes | 5 | Size (ruby-2.2.2.tar.bz2) = 13314437 bytes | |
6 | SHA1 (patch-configure) = 8653ddb8482539cc3b7b8195c30a5a87a6f8e856 | 6 | SHA1 (patch-configure) = 729397349d70492303534873194e35d4ffb98ba5 | |
7 | SHA1 (patch-ext_dbm_extconf.rb) = ee932265052613d458375ad1a760a09fefb9d959 | 7 | SHA1 (patch-ext_dbm_extconf.rb) = ee932265052613d458375ad1a760a09fefb9d959 | |
8 | SHA1 (patch-lib_mkmf.rb) = f86f1ae5a1053a0643545a2c11c9fd2bbd5a289d | |||
8 | SHA1 (patch-lib_rdoc_ri_driver.rb) = 5bdd3ed6f50a2ea79f643c6bebd7ad0063e79051 | 9 | SHA1 (patch-lib_rdoc_ri_driver.rb) = 5bdd3ed6f50a2ea79f643c6bebd7ad0063e79051 | |
9 | SHA1 (patch-lib_rubygems.rb) = 5b63c96109fa53fb072b6ae12bf91c4b2889e079 | 10 | SHA1 (patch-lib_rubygems.rb) = 5b63c96109fa53fb072b6ae12bf91c4b2889e079 | |
10 | SHA1 (patch-lib_rubygems_commands_setup__command.rb) = 3e7003250d6241a4c4bf879de1b9fb3053cc10c7 | 11 | SHA1 (patch-lib_rubygems_commands_setup__command.rb) = 3e7003250d6241a4c4bf879de1b9fb3053cc10c7 | |
11 | SHA1 (patch-lib_rubygems_config__file.rb) = 64cea598fa63433d432a5e5bcc85cdff96ed0f49 | 12 | SHA1 (patch-lib_rubygems_config__file.rb) = 64cea598fa63433d432a5e5bcc85cdff96ed0f49 | |
12 | SHA1 (patch-lib_rubygems_defaults.rb) = 82d31b7deced68f2dd9e2c60cdc5c39bbfc9a900 | 13 | SHA1 (patch-lib_rubygems_defaults.rb) = 82d31b7deced68f2dd9e2c60cdc5c39bbfc9a900 | |
13 | SHA1 (patch-lib_rubygems_dependency__installer.rb) = 33279f961cc4c530f0d81c8b415a79fdd26a1f84 | 14 | SHA1 (patch-lib_rubygems_dependency__installer.rb) = 33279f961cc4c530f0d81c8b415a79fdd26a1f84 | |
14 | SHA1 (patch-lib_rubygems_install__update__options.rb) = 8ec3a2387f3a83e19d76b7a900ebf3b37bdcc043 | 15 | SHA1 (patch-lib_rubygems_install__update__options.rb) = 8ec3a2387f3a83e19d76b7a900ebf3b37bdcc043 | |
15 | SHA1 (patch-lib_rubygems_installer.rb) = 864f3f8fe2949aedd85f730e447d8495f58d3b25 | 16 | SHA1 (patch-lib_rubygems_installer.rb) = 864f3f8fe2949aedd85f730e447d8495f58d3b25 | |
16 | SHA1 (patch-lib_rubygems_platform.rb) = 2bddd029a2678de5a5d016af33f629caa712fbce | 17 | SHA1 (patch-lib_rubygems_platform.rb) = 2bddd029a2678de5a5d016af33f629caa712fbce | |
17 | SHA1 (patch-man_erb.1) = 1fe6ce4f4fe6418bfabb5e132a63596562030116 | 18 | SHA1 (patch-man_erb.1) = 1fe6ce4f4fe6418bfabb5e132a63596562030116 | |
18 | SHA1 (patch-man_irb.1) = 2bf807b4c1b1c68d1f518caa054cfd900e0fedb7 | 19 | SHA1 (patch-man_irb.1) = 2bf807b4c1b1c68d1f518caa054cfd900e0fedb7 | |
19 | SHA1 (patch-man_ri.1) = b07be05375977cfac0f88765a95e85db4f858885 | 20 | SHA1 (patch-man_ri.1) = b07be05375977cfac0f88765a95e85db4f858885 | |
20 | SHA1 (patch-man_ruby.1) = 88ca6703fd58a89726618ca7dfc7912bad312b1c | 21 | SHA1 (patch-man_ruby.1) = 88ca6703fd58a89726618ca7dfc7912bad312b1c |
@@ -1,16 +1,16 @@ | @@ -1,16 +1,16 @@ | |||
1 | $NetBSD: patch-configure,v 1.1 2015/03/08 16:24:55 taca Exp $ | 1 | $NetBSD: patch-configure,v 1.1.2.1 2015/06/09 02:05:35 hiramatsu Exp $ | |
2 | 2 | |||
3 | * Adding Interix and MirBSD support. | 3 | * Adding Interix support. | |
4 | * Ignore doxygen. | 4 | * Ignore doxygen. | |
5 | 5 | |||
6 | --- configure.orig 2015-02-27 07:34:18.000000000 +0000 | 6 | --- configure.orig 2015-02-27 07:34:18.000000000 +0000 | |
7 | +++ configure | 7 | +++ configure | |
8 | @@ -8846,6 +8846,10 @@ esac | 8 | @@ -8846,6 +8846,10 @@ esac | |
9 | ac_cv_func_isinf=yes | 9 | ac_cv_func_isinf=yes | |
10 | ac_cv_func_isnan=yes | 10 | ac_cv_func_isnan=yes | |
11 | ;; #( | 11 | ;; #( | |
12 | + interix*) : | 12 | + interix*) : | |
13 | + LIBS="-lm $LIBS" | 13 | + LIBS="-lm $LIBS" | |
14 | + ac_cv_func_getpgrp_void=yes | 14 | + ac_cv_func_getpgrp_void=yes | |
15 | + ;; #( | 15 | + ;; #( | |
16 | nacl) : | 16 | nacl) : |
$NetBSD: patch-lib_mkmf.rb,v 1.1.2.2 2015/06/09 02:05:35 hiramatsu 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-13 05:00:23.000000000 +0000
+++ lib/mkmf.rb
@@ -1939,6 +1939,7 @@ LDSHARED = #{CONFIG['LDSHARED']}
LDSHAREDXX = #{config_string('LDSHAREDXX') || '$(LDSHARED)'}
AR = #{CONFIG['AR']}
EXEEXT = #{CONFIG['EXEEXT']}
+POSTLINK = #{CONFIG['POSTLINK']}
}
CONFIG.each do |key, val|