pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/lang ruby*-base: Don't add SSP flags, leave that to pk...
details: https://anonhg.NetBSD.org/pkgsrc/rev/ea385e3299a2
branches: trunk
changeset: 374134:ea385e3299a2
user: jperkin <jperkin%pkgsrc.org@localhost>
date: Tue Jan 16 14:53:27 2018 +0000
description:
ruby*-base: Don't add SSP flags, leave that to pkgsrc.
diffstat:
lang/ruby22-base/distinfo | 4 +-
lang/ruby22-base/patches/patch-configure | 37 +++++++++++++++++++------------
lang/ruby23-base/distinfo | 4 +-
lang/ruby23-base/patches/patch-configure | 35 +++++++++++++++++++-----------
lang/ruby24-base/distinfo | 4 +-
lang/ruby24-base/patches/patch-configure | 31 +++++++++++++++++---------
lang/ruby25-base/distinfo | 4 +-
lang/ruby25-base/patches/patch-configure | 29 ++++++++++++++++--------
8 files changed, 92 insertions(+), 56 deletions(-)
diffs (truncated from 530 to 300 lines):
diff -r 3cc5c46ebfe0 -r ea385e3299a2 lang/ruby22-base/distinfo
--- a/lang/ruby22-base/distinfo Tue Jan 16 14:22:30 2018 +0000
+++ b/lang/ruby22-base/distinfo Tue Jan 16 14:53:27 2018 +0000
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.21 2017/12/15 03:26:03 taca Exp $
+$NetBSD: distinfo,v 1.22 2018/01/16 14:53:27 jperkin Exp $
SHA1 (ruby-2.2.9.tar.bz2) = 773ba9b51bde612866f656c4531f59660e2b0087
RMD160 (ruby-2.2.9.tar.bz2) = 0973ec6a23ec909af7dec7c7152ca0a4e79fe959
SHA512 (ruby-2.2.9.tar.bz2) = 2a8c8770fda20a22b79c9115b6f468f8e7ea1092c84a5089af7a3122163e5ad298b493e6637e4d93ba02d899d8a619c94064dda8ac98cf3b93f64f45d5401085
Size (ruby-2.2.9.tar.bz2) = 13371232 bytes
-SHA1 (patch-configure) = fda86ab23ec6291f3a51001793686904d4433b38
+SHA1 (patch-configure) = c3050191a117febacf65d0c798bf5a171fb19f05
SHA1 (patch-ext_dbm_extconf.rb) = ee932265052613d458375ad1a760a09fefb9d959
SHA1 (patch-ext_openssl_ossl__ssl.c) = e887a5576959921da116a5cee629c25610169593
SHA1 (patch-lib_mkmf.rb) = f86f1ae5a1053a0643545a2c11c9fd2bbd5a289d
diff -r 3cc5c46ebfe0 -r ea385e3299a2 lang/ruby22-base/patches/patch-configure
--- a/lang/ruby22-base/patches/patch-configure Tue Jan 16 14:22:30 2018 +0000
+++ b/lang/ruby22-base/patches/patch-configure Tue Jan 16 14:53:27 2018 +0000
@@ -1,10 +1,11 @@
-$NetBSD: patch-configure,v 1.5 2017/07/06 16:35:05 taca Exp $
+$NetBSD: patch-configure,v 1.6 2018/01/16 14:53:27 jperkin Exp $
* Adding Interix support.
* Ignore doxygen.
* Pass LDFLAGS to LIBRUBY_DLDFLAGS via DLDFLAGS as Ruby 2.4 dose.
+* Handle SSP in pkgsrc.
---- configure.orig 2017-03-28 07:53:45.000000000 +0000
+--- configure.orig 2017-12-14 16:00:13.000000000 +0000
+++ configure
@@ -5581,7 +5581,7 @@ esac
else
@@ -23,7 +24,15 @@
case $RUBY_PATCHLEVEL in #(
-*) :
-@@ -8909,6 +8910,10 @@ esac
+@@ -7796,6 +7797,7 @@ esac
+ stack_protector=no
+ ;; #(
+ *) :
++ stack_protector=no
+ ;;
+ esac
+ if test -z "${stack_protector+set}"; then
+@@ -8909,6 +8911,10 @@ esac
LIBS="-lm $LIBS"
ac_cv_func_round=no
;; #(
@@ -34,7 +43,7 @@
nacl) :
LIBS="-lm $LIBS"
-@@ -17004,6 +17009,8 @@ else
+@@ -17004,6 +17010,8 @@ else
# ifdef _MSC_VER
# include <malloc.h>
# define alloca _alloca
@@ -43,7 +52,7 @@
# else
# ifdef HAVE_ALLOCA_H
# include <alloca.h>
-@@ -21293,7 +21300,9 @@ esac ;; #(
+@@ -21293,7 +21301,9 @@ esac ;; #(
interix*) :
: ${LDSHARED='$(CC) -shared'}
XLDFLAGS="$XLDFLAGS -Wl,-E"
@@ -53,7 +62,7 @@
rb_cv_dlopen=yes ;; #(
freebsd*|dragonfly*) :
-@@ -22503,7 +22512,17 @@ esac
+@@ -22503,7 +22513,17 @@ esac
;; #(
linux* | gnu* | k*bsd*-gnu | atheos* | kopensolaris*-gnu) :
@@ -72,7 +81,7 @@
LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR) lib$(RUBY_SO_NAME).so'
if test "$load_relative" = yes; then
libprefix="'\$\${ORIGIN}/../${libdir_basename}'"
-@@ -22514,7 +22533,7 @@ esac
+@@ -22514,7 +22534,7 @@ esac
freebsd*|dragonfly*) :
SOLIBS='$(LIBS)'
@@ -81,7 +90,7 @@
if test "$rb_cv_binary_elf" != "yes" ; then
LIBRUBY_SO="$LIBRUBY_SO.\$(TEENY)"
LIBRUBY_ALIASES=''
-@@ -22524,7 +22543,17 @@ esac
+@@ -22524,7 +22544,17 @@ esac
SOLIBS='$(LIBS)'
LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR).$(TEENY)'
@@ -100,7 +109,7 @@
if test "$rb_cv_binary_elf" = yes; then # ELF platforms
LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR) lib$(RUBY_SO_NAME).so'
else # a.out platforms
-@@ -22556,7 +22585,17 @@ esac
+@@ -22556,7 +22586,17 @@ esac
;; #(
aix*) :
@@ -119,7 +128,7 @@
LIBRUBYARG_SHARED='-L${libdir} -l${RUBY_SO_NAME}'
SOLIBS='-lm -lc'
;; #(
-@@ -22565,7 +22604,7 @@ esac
+@@ -22565,7 +22605,7 @@ esac
case "$target_cpu" in #(
powerpc*) :
@@ -128,7 +137,7 @@
;; #(
*) :
;;
-@@ -22593,7 +22632,12 @@ esac
+@@ -22593,7 +22633,12 @@ esac
;; #(
interix*) :
@@ -142,7 +151,7 @@
;; #(
mingw*|cygwin*|mswin*) :
-@@ -22766,7 +22810,7 @@ if test "$enable_rpath" = yes; then
+@@ -22766,7 +22811,7 @@ if test "$enable_rpath" = yes; then
esac
rpathflag=`IFS="$PATH_SEPARATOR"
echo x "$rpathflag" |
@@ -151,7 +160,7 @@
`
LIBRUBY_RPATHFLAGS="$LIBRUBY_RPATHFLAGS${rpathflag}"
LIBRUBYARG_SHARED="$LIBRUBY_RPATHFLAGS $LIBRUBYARG_SHARED"
-@@ -23085,11 +23129,7 @@ if test "$install_doc" != no; then
+@@ -23085,11 +23130,7 @@ if test "$install_doc" != no; then
else
RDOCTARGET="nodoc"
fi
@@ -164,7 +173,7 @@
else
RDOCTARGET="nodoc"
CAPITARGET="nodoc"
-@@ -25195,17 +25235,7 @@ which seems to be undefined. Please mak
+@@ -25195,17 +25236,7 @@ which seems to be undefined. Please mak
"Makefile":F)
tmpmk=confmk$$.tmp
{
diff -r 3cc5c46ebfe0 -r ea385e3299a2 lang/ruby23-base/distinfo
--- a/lang/ruby23-base/distinfo Tue Jan 16 14:22:30 2018 +0000
+++ b/lang/ruby23-base/distinfo Tue Jan 16 14:53:27 2018 +0000
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.11 2017/12/15 03:19:29 taca Exp $
+$NetBSD: distinfo,v 1.12 2018/01/16 14:53:27 jperkin Exp $
SHA1 (ruby-2.3.6.tar.bz2) = 07c3b66d544dd22c22fbae3f16cfb3eeb88b7b1e
RMD160 (ruby-2.3.6.tar.bz2) = 664e027a6f172212ac8ebff3aa9b99df4e99906b
SHA512 (ruby-2.3.6.tar.bz2) = bc3c7a115745a38e44bd91eb5637b1e412011c471d9749db7960185ef75737b944dd0e524f22432809649952ca7d93f46d458990e9cd2b0db5ca8abf4bc8ea99
Size (ruby-2.3.6.tar.bz2) = 14429114 bytes
-SHA1 (patch-configure) = dbe68752f6458052ff89cb403a194eb3bd668f33
+SHA1 (patch-configure) = 90f18fa8a591a9b913d6b95bc55756ba913e6599
SHA1 (patch-ext_dbm_extconf.rb) = c998f8735db54b1ae2bc8b6caa359ce88bc7a45b
SHA1 (patch-ext_openssl_ossl__ssl.c) = 24e794aae278da6204e29212d9e2add0b0119ea4
SHA1 (patch-lib_mkmf.rb) = d01302bac014ec1d72bbf19df64bc2c93c07ec5e
diff -r 3cc5c46ebfe0 -r ea385e3299a2 lang/ruby23-base/patches/patch-configure
--- a/lang/ruby23-base/patches/patch-configure Tue Jan 16 14:22:30 2018 +0000
+++ b/lang/ruby23-base/patches/patch-configure Tue Jan 16 14:53:27 2018 +0000
@@ -1,10 +1,11 @@
-$NetBSD: patch-configure,v 1.4 2017/09/15 00:36:17 taca Exp $
+$NetBSD: patch-configure,v 1.5 2018/01/16 14:53:27 jperkin Exp $
* Adding Interix support.
* Ignore doxygen.
* Pass LDFLAGS to LIBRUBY_DLDFLAGS via DLDFLAGS as Ruby 2.4 dose.
+* Handle SSP in pkgsrc.
---- configure.orig 2017-09-14 12:09:29.000000000 +0000
+--- configure.orig 2017-12-14 14:57:48.000000000 +0000
+++ configure
@@ -5678,7 +5678,7 @@ esac
else
@@ -24,7 +25,15 @@
case $RUBY_PATCHLEVEL in #(
-*) :
particular_werror_flags=yes ;; #(
-@@ -9319,6 +9321,10 @@ esac
+@@ -8024,6 +8026,7 @@ esac
+ stack_protector=no
+ ;; #(
+ *) :
++ stack_protector=no
+ ;;
+ esac
+ if test -z "${stack_protector+set}"; then
+@@ -9319,6 +9322,10 @@ esac
LIBS="-lm $LIBS"
ac_cv_func_round=no
;; #(
@@ -35,7 +44,7 @@
nacl) :
LIBS="-lm $LIBS"
-@@ -18065,6 +18071,8 @@ else
+@@ -18067,6 +18074,8 @@ else
# ifdef _MSC_VER
# include <malloc.h>
# define alloca _alloca
@@ -44,7 +53,7 @@
# else
# ifdef HAVE_ALLOCA_H
# include <alloca.h>
-@@ -22561,7 +22569,9 @@ esac ;; #(
+@@ -22563,7 +22572,9 @@ esac ;; #(
interix*) :
: ${LDSHARED='$(CC) -shared'}
XLDFLAGS="$XLDFLAGS -Wl,-E"
@@ -54,7 +63,7 @@
rb_cv_dlopen=yes ;; #(
freebsd*|dragonfly*) :
-@@ -23667,7 +23677,17 @@ esac
+@@ -23669,7 +23680,17 @@ esac
;; #(
linux* | gnu* | k*bsd*-gnu | atheos* | kopensolaris*-gnu | haiku*) :
@@ -73,7 +82,7 @@
LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR) lib$(RUBY_SO_NAME).so'
if test "$load_relative" = yes; then
libprefix="'\$\${ORIGIN}/../${libdir_basename}'"
-@@ -23678,7 +23698,7 @@ esac
+@@ -23680,7 +23701,7 @@ esac
freebsd*|dragonfly*) :
SOLIBS='$(LIBS)'
@@ -82,7 +91,7 @@
if test "$rb_cv_binary_elf" != "yes" ; then
LIBRUBY_SO="$LIBRUBY_SO.\$(TEENY)"
LIBRUBY_ALIASES=''
-@@ -23688,7 +23708,17 @@ esac
+@@ -23690,7 +23711,17 @@ esac
SOLIBS='$(LIBS)'
LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR).$(TEENY)'
@@ -101,7 +110,7 @@
if test "$rb_cv_binary_elf" = yes; then # ELF platforms
LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR) lib$(RUBY_SO_NAME).so'
else # a.out platforms
-@@ -23720,7 +23750,17 @@ esac
+@@ -23722,7 +23753,17 @@ esac
;; #(
aix*) :
@@ -120,7 +129,7 @@
LIBRUBYARG_SHARED='-L${libdir} -l${RUBY_SO_NAME}'
SOLIBS='-lm -lc'
;; #(
-@@ -23747,7 +23787,12 @@ esac
+@@ -23749,7 +23790,12 @@ esac
;; #(
interix*) :
@@ -134,7 +143,7 @@
;; #(
mingw*|cygwin*|mswin*) :
-@@ -23915,7 +23960,7 @@ if test "$enable_rpath" = yes; then
+@@ -23917,7 +23963,7 @@ if test "$enable_rpath" = yes; then
esac
rpathflag=`IFS="$PATH_SEPARATOR"
echo x "$rpathflag" |
@@ -143,7 +152,7 @@
`
LIBRUBY_RPATHFLAGS="$LIBRUBY_RPATHFLAGS${rpathflag}"
LIBRUBYARG_SHARED="$LIBRUBY_RPATHFLAGS $LIBRUBYARG_SHARED"
-@@ -24306,11 +24351,7 @@ if test "$install_doc" != no; then
+@@ -24308,11 +24354,7 @@ if test "$install_doc" != no; then
else
RDOCTARGET="nodoc"
fi
@@ -156,7 +165,7 @@
else
RDOCTARGET="nodoc"
CAPITARGET="nodoc"
-@@ -26329,17 +26370,7 @@ which seems to be undefined. Please mak
+@@ -26331,17 +26373,7 @@ which seems to be undefined. Please mak
"Makefile":F)
tmpmk=confmk$$.tmp
{
diff -r 3cc5c46ebfe0 -r ea385e3299a2 lang/ruby24-base/distinfo
--- a/lang/ruby24-base/distinfo Tue Jan 16 14:22:30 2018 +0000
+++ b/lang/ruby24-base/distinfo Tue Jan 16 14:53:27 2018 +0000
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.5 2017/12/15 03:23:29 taca Exp $
+$NetBSD: distinfo,v 1.6 2018/01/16 14:53:28 jperkin Exp $
SHA1 (ruby-2.4.3.tar.bz2) = 3ca96536320b915762d57fe1ee540df6810bf631
RMD160 (ruby-2.4.3.tar.bz2) = f02b5ca6b577351c8852a99eecaa4d4a3dda026f
SHA512 (ruby-2.4.3.tar.bz2) = fb4339e30c04d03b1422b6c32ede45902e072cd26325b36f3fc05c341d42eea6431d88718242dcc9ce24d9cad26f3d26772f2e806bd7d93f40be50268c318409
Size (ruby-2.4.3.tar.bz2) = 12615068 bytes
Home |
Main Index |
Thread Index |
Old Index