diff options
| author | jperkin <jperkin@pkgsrc.org> | 2018-01-26 13:25:29 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2018-01-26 13:25:29 +0000 |
| commit | e3fb7ee5a8f61189d890b652ba2306ca05e279b4 (patch) | |
| tree | d1aa44e3aeff39efedeb6f96f1a1da399b1b8463 /lang/ruby25-base | |
| parent | a39b1fad5ada1b7b4073f4a08c90afcf15b8cd21 (diff) | |
| download | pkgsrc-e3fb7ee5a8f61189d890b652ba2306ca05e279b4.tar.gz | |
ruby25-base: Put -std= in CFLAGS not CPPFLAGS. Bump PKGREVISION.
Diffstat (limited to 'lang/ruby25-base')
| -rw-r--r-- | lang/ruby25-base/Makefile | 3 | ||||
| -rw-r--r-- | lang/ruby25-base/distinfo | 4 | ||||
| -rw-r--r-- | lang/ruby25-base/patches/patch-configure | 17 |
3 files changed, 19 insertions, 5 deletions
diff --git a/lang/ruby25-base/Makefile b/lang/ruby25-base/Makefile index a6c9bc345fd..6ee5174a58f 100644 --- a/lang/ruby25-base/Makefile +++ b/lang/ruby25-base/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.2 2018/01/17 11:19:46 jperkin Exp $ +# $NetBSD: Makefile,v 1.3 2018/01/26 13:25:29 jperkin Exp $ DISTNAME= ${RUBY_DISTNAME} PKGNAME= ${RUBY_PKGPREFIX}-base-${RUBY_VERSION} +PKGREVISION= 1 CATEGORIES= lang ruby MASTER_SITES= ${MASTER_SITE_RUBY} diff --git a/lang/ruby25-base/distinfo b/lang/ruby25-base/distinfo index 8be72b6c3be..dab4e7081ad 100644 --- a/lang/ruby25-base/distinfo +++ b/lang/ruby25-base/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.3 2018/01/17 11:19:46 jperkin Exp $ +$NetBSD: distinfo,v 1.4 2018/01/26 13:25:29 jperkin Exp $ SHA1 (ruby-2.5.0.tar.bz2) = 827b9a3bcffa86d1fc9ed96d403cb9dc37731688 RMD160 (ruby-2.5.0.tar.bz2) = e09d8b3f89d3b494231026cf1295c5bf5da794e5 SHA512 (ruby-2.5.0.tar.bz2) = 8f6fdf6708e7470f55bc009db2567cd8d4e633ad0678d83a015441ecf5b5d88bd7da8fb8533a42157ff83b74d00b6dc617d39bbb17fc2c6c12287a1d8eaa0f2c Size (ruby-2.5.0.tar.bz2) = 13955820 bytes -SHA1 (patch-configure) = 5e7e4f1ef02d0b094bedc772133d405b3c41521b +SHA1 (patch-configure) = 965f31ec3ae2fb91479f02cb3b19ea7518685718 SHA1 (patch-ext_dbm_extconf.rb) = c998f8735db54b1ae2bc8b6caa359ce88bc7a45b SHA1 (patch-lib_mkmf.rb) = 75d2261a8282a00cd5f811a5e629302d1667207e SHA1 (patch-lib_rdoc_ri_driver.rb) = f4d3e59e35b608acd4edc17916142c7f033e6198 diff --git a/lang/ruby25-base/patches/patch-configure b/lang/ruby25-base/patches/patch-configure index bc88ffdb5d3..cb90d3a302d 100644 --- a/lang/ruby25-base/patches/patch-configure +++ b/lang/ruby25-base/patches/patch-configure @@ -1,9 +1,10 @@ -$NetBSD: patch-configure,v 1.3 2018/01/17 11:19:46 jperkin Exp $ +$NetBSD: patch-configure,v 1.4 2018/01/26 13:25:29 jperkin Exp $ * Adding Interix support. * Ignore doxygen. * Ignore VCS. * Handle SSP in pkgsrc. +* Put -std= in CFLAGS not CPPFLAGS. --- configure.orig 2017-12-25 07:00:28.000000000 +0000 +++ configure @@ -33,6 +34,18 @@ $NetBSD: patch-configure,v 1.3 2018/01/17 11:19:46 jperkin Exp $ # RUBY_APPEND_OPTIONS(CPPFLAGS) for rb_opt in ${ansi_options}; do +@@ -9303,9 +9304,9 @@ rm -f core conftest.err conftest.$ac_obj + *" ${rb_opt} "*) : + ;; #( + ' ') : +- CPPFLAGS="${rb_opt}" ;; #( ++ CFLAGS="${rb_opt}" ;; #( + *) : +- CPPFLAGS="$CPPFLAGS ${rb_opt}" ;; ++ CFLAGS="$CFLAGS ${rb_opt}" ;; + esac + done + ;; #( @@ -9536,6 +9537,10 @@ esac LIBS="-lm $LIBS" ac_cv_func_round=no @@ -120,7 +133,7 @@ $NetBSD: patch-configure,v 1.3 2018/01/17 11:19:46 jperkin Exp $ if test "$install_capi" != no -a -n "$DOXYGEN"; then : CAPITARGET="capi" -@@ -29143,31 +29152,7 @@ which seems to be undefined. Please mak +@@ -29143,31 +29150,7 @@ which seems to be undefined. Please mak "Makefile":F) tmpmk=confmk$$.tmp { |