[pkgsrc/trunk]: pkgsrc/lang Avoid to generate empty command line on some plat...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/lang Avoid to generate empty command line on some plat...
From: taca <taca%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 17:51:03 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/1ccaa4880c8d
branches:  trunk
changeset: 650986:1ccaa4880c8d
user:      taca <taca%pkgsrc.org@localhost>
date:      Thu Apr 30 03:26:37 2015 +0000

description:
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.

diffstat:

 lang/ruby200-base/Makefile                  |   3 ++-
 lang/ruby200-base/distinfo                  |   3 ++-
 lang/ruby200-base/patches/patch-lib_mkmf.rb |  21 +++++++++++++++++++++
 lang/ruby21-base/Makefile                   |   3 ++-
 lang/ruby21-base/distinfo                   |   3 ++-
 lang/ruby21-base/patches/patch-lib_mkmf.rb  |  21 +++++++++++++++++++++
 lang/ruby22-base/Makefile                   |   3 ++-
 lang/ruby22-base/distinfo                   |   3 ++-
 lang/ruby22-base/patches/patch-lib_mkmf.rb  |  21 +++++++++++++++++++++
 9 files changed, 75 insertions(+), 6 deletions(-)

diffs (167 lines):

diff -r b745158484cf -r 1ccaa4880c8d lang/ruby200-base/Makefile
--- a/lang/ruby200-base/Makefile        Thu Apr 30 03:25:56 2015 +0000
+++ b/lang/ruby200-base/Makefile        Thu Apr 30 03:26:37 2015 +0000
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.15 2015/03/08 14:59:12 taca Exp $
+# $NetBSD: Makefile,v 1.16 2015/04/30 03:26:37 taca Exp $
 #
 
 DISTNAME=      ${RUBY_DISTNAME}
 PKGNAME=       ${RUBY_PKGPREFIX}-base-${RUBY_VERSION_FULL}
+PKGREVISION=   1
 CATEGORIES=    lang ruby
 MASTER_SITES=  ${MASTER_SITE_RUBY}
 
diff -r b745158484cf -r 1ccaa4880c8d lang/ruby200-base/distinfo
--- a/lang/ruby200-base/distinfo        Thu Apr 30 03:25:56 2015 +0000
+++ b/lang/ruby200-base/distinfo        Thu Apr 30 03:26:37 2015 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.23 2015/04/19 16:12:23 taca Exp $
+$NetBSD: distinfo,v 1.24 2015/04/30 03:26:37 taca Exp $
 
 SHA1 (ruby-2.0.0-p645.tar.bz2) = e724dd0e4a1e820a368be307aa0863a8ecf4b694
 RMD160 (ruby-2.0.0-p645.tar.bz2) = cbfd9ca2a5fe5d6ea1d89da9fd934c864bf339ab
@@ -16,6 +16,7 @@
 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 -r b745158484cf -r 1ccaa4880c8d lang/ruby200-base/patches/patch-lib_mkmf.rb
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/ruby200-base/patches/patch-lib_mkmf.rb       Thu Apr 30 03:26:37 2015 +0000
@@ -0,0 +1,21 @@
+$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|
diff -r b745158484cf -r 1ccaa4880c8d lang/ruby21-base/Makefile
--- a/lang/ruby21-base/Makefile Thu Apr 30 03:25:56 2015 +0000
+++ b/lang/ruby21-base/Makefile Thu Apr 30 03:26:37 2015 +0000
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2015/03/08 15:52:51 taca Exp $
+# $NetBSD: Makefile,v 1.12 2015/04/30 03:27:20 taca Exp $
 #
 
 DISTNAME=      ${RUBY_DISTNAME}
 PKGNAME=       ${RUBY_PKGPREFIX}-base-${RUBY_VERSION_FULL}
+PKGREVISION=   1
 CATEGORIES=    lang ruby
 MASTER_SITES=  ${MASTER_SITE_RUBY}
 
diff -r b745158484cf -r 1ccaa4880c8d lang/ruby21-base/distinfo
--- a/lang/ruby21-base/distinfo Thu Apr 30 03:25:56 2015 +0000
+++ b/lang/ruby21-base/distinfo Thu Apr 30 03:26:37 2015 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.16 2015/04/22 19:04:56 sevan Exp $
+$NetBSD: distinfo,v 1.17 2015/04/30 03:27:20 taca Exp $
 
 SHA1 (ruby-2.1.6.tar.bz2) = 380c3a5fa508fdaa2b227dbc00c56f703fd271d4
 RMD160 (ruby-2.1.6.tar.bz2) = fa473e794ee0df4cd30aebfa70af16840a618c43
@@ -15,6 +15,7 @@
 SHA1 (patch-ext_tk_lib_tkextlib_tkimg_dted.rb) = b0786f50ebab4b5a0ccf916054bc13fbd6820541
 SHA1 (patch-ext_tk_lib_tkextlib_tkimg_raw.rb) = 92a4bc7b995554b9933b1e9f9ce4df87e365bcfb
 SHA1 (patch-ext_tk_tcltklib.c) = 475affcb88a06ac6daf622814a9da5027ca3d34e
+SHA1 (patch-lib_mkmf.rb) = 04607b73702a8ee7edfbb371ebf88ebe8a4fc428
 SHA1 (patch-lib_rdoc_ri_driver.rb) = 5bdd3ed6f50a2ea79f643c6bebd7ad0063e79051
 SHA1 (patch-lib_rubygems.rb) = adfbb16b9d90fe38e253bcbd34d0efa712077f21
 SHA1 (patch-lib_rubygems_commands_setup__command.rb) = 46991d63256d0d3cc2f707fb286d1691331ad40e
diff -r b745158484cf -r 1ccaa4880c8d lang/ruby21-base/patches/patch-lib_mkmf.rb
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/ruby21-base/patches/patch-lib_mkmf.rb        Thu Apr 30 03:26:37 2015 +0000
@@ -0,0 +1,21 @@
+$NetBSD: patch-lib_mkmf.rb,v 1.1 2015/04/30 03:27:20 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-03-17 16:56:55.000000000 +0000
++++ lib/mkmf.rb
+@@ -1909,6 +1909,7 @@ LDSHARED = #{CONFIG['LDSHARED']}
+ LDSHAREDXX = #{config_string('LDSHAREDXX') || '$(LDSHARED)'}
+ AR = #{CONFIG['AR']}
+ EXEEXT = #{CONFIG['EXEEXT']}
++POSTLINK = #{CONFIG['POSTLINK']}
+ 
+ }
+     CONFIG.each do |key, val|
diff -r b745158484cf -r 1ccaa4880c8d lang/ruby22-base/Makefile
--- a/lang/ruby22-base/Makefile Thu Apr 30 03:25:56 2015 +0000
+++ b/lang/ruby22-base/Makefile Thu Apr 30 03:26:37 2015 +0000
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2015/03/08 16:24:55 taca Exp $
+# $NetBSD: Makefile,v 1.2 2015/04/30 03:27:52 taca Exp $
 #
 
 DISTNAME=      ${RUBY_DISTNAME}
 PKGNAME=       ${RUBY_PKGPREFIX}-base-${RUBY_VERSION_FULL}
+PKGREVISION=   1
 CATEGORIES=    lang ruby
 MASTER_SITES=  ${MASTER_SITE_RUBY}
 
diff -r b745158484cf -r 1ccaa4880c8d lang/ruby22-base/distinfo
--- a/lang/ruby22-base/distinfo Thu Apr 30 03:25:56 2015 +0000
+++ b/lang/ruby22-base/distinfo Thu Apr 30 03:26:37 2015 +0000
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.3 2015/04/22 19:04:35 sevan Exp $
+$NetBSD: distinfo,v 1.4 2015/04/30 03:27:52 taca Exp $
 
 SHA1 (ruby-2.2.2.tar.bz2) = de97ec6132ac76bb7c0f92b5ca4682138093af1b
 RMD160 (ruby-2.2.2.tar.bz2) = af9f1c4de12fc25c0d6e20bf339cc13e7d89df2d
 Size (ruby-2.2.2.tar.bz2) = 13314437 bytes
 SHA1 (patch-configure) = 729397349d70492303534873194e35d4ffb98ba5
 SHA1 (patch-ext_dbm_extconf.rb) = ee932265052613d458375ad1a760a09fefb9d959
+SHA1 (patch-lib_mkmf.rb) = f86f1ae5a1053a0643545a2c11c9fd2bbd5a289d
 SHA1 (patch-lib_rdoc_ri_driver.rb) = 5bdd3ed6f50a2ea79f643c6bebd7ad0063e79051
 SHA1 (patch-lib_rubygems.rb) = 5b63c96109fa53fb072b6ae12bf91c4b2889e079
 SHA1 (patch-lib_rubygems_commands_setup__command.rb) = 3e7003250d6241a4c4bf879de1b9fb3053cc10c7
diff -r b745158484cf -r 1ccaa4880c8d lang/ruby22-base/patches/patch-lib_mkmf.rb
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/ruby22-base/patches/patch-lib_mkmf.rb        Thu Apr 30 03:26:37 2015 +0000
@@ -0,0 +1,21 @@
+$NetBSD: patch-lib_mkmf.rb,v 1.1 2015/04/30 03:27:52 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-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|
Prev by Date: [pkgsrc/trunk]: pkgsrc/doc Updated sysutils/liblognorm to 1.1.1
Next by Date: [pkgsrc/trunk]: pkgsrc/devel Changes 2.3.6:
Previous by Thread: [pkgsrc/trunk]: pkgsrc/doc Updated sysutils/liblognorm to 1.1.1
Next by Thread: [pkgsrc/trunk]: pkgsrc/devel Changes 2.3.6:
Indexes:
Home | Main Index | Thread Index | Old Index