Attachment #236429 for bug #266227

View | Details | Raw Unified | Return to bug 266227 | Differences between

and this patch




# Ruby 2.7
#
RUBY_DISTVERSION=	2.7.6
RUBY_PORTREVISION=	3
RUBY_PORTEPOCH=		1

.      elif ${RUBY_VER} == 3.0

# Ruby 3.0
#
RUBY_DISTVERSION=	3.0.4
RUBY_PORTREVISION=	3
RUBY_PORTEPOCH=		1
.      elif ${RUBY_VER} == 3.1
#
# Ruby 3.1
#
RUBY_DISTVERSION=	3.1.2
RUBY_PORTREVISION=	2
RUBY_PORTEPOCH=		1

.      elif ${RUBY_VER} == 3.2

# Ruby 3.2
#
RUBY_DISTVERSION=	3.2.0-preview1
RUBY_PORTREVISION=	3
RUBY_PORTEPOCH=		1

# When adding a version, please keep the comment in




--- util.c.orig	2022-04-12 11:25:48 UTC
+++ util.c
@@ -210,6 +210,7 @@ typedef int (cmpfunc_t)(const void*, const void*, void
 
 typedef int (cmpfunc_t)(const void*, const void*, void*);
 
+#if !defined HAVE_GNU_QSORT_R
 #if defined HAVE_QSORT_S && defined RUBY_MSVCRT_VERSION
 /* In contrast to its name, Visual Studio qsort_s is incompatible with
  * C11 in the order of the comparison function's arguments, and same
@@ -255,7 +256,7 @@ ruby_qsort(void* base, const size_t nel, const size_t 
     qsort_s(base, nel, size, cmp, d);
 }
 # define HAVE_GNU_QSORT_R 1
-#elif !defined HAVE_GNU_QSORT_R
+#else
 /* mm.c */
 
 #define mmtype long
@@ -521,7 +522,8 @@ ruby_qsort(void* base, const size_t nel, const size_t 
     else goto nxt;                         /* need not to sort both sides */
   }
 }
-#endif /* HAVE_GNU_QSORT_R */
+#endif
+#endif /* !HAVE_GNU_QSORT_R */
 
 char *
 ruby_strdup(const char *str)




--- util.c.orig	2022-04-12 11:48:55 UTC
+++ util.c
@@ -214,6 +214,7 @@ typedef int (cmpfunc_t)(const void*, const void*, void
 
 typedef int (cmpfunc_t)(const void*, const void*, void*);
 
+#if !defined HAVE_GNU_QSORT_R
 #if defined HAVE_QSORT_S && defined RUBY_MSVCRT_VERSION
 /* In contrast to its name, Visual Studio qsort_s is incompatible with
  * C11 in the order of the comparison function's arguments, and same
@@ -259,7 +260,7 @@ ruby_qsort(void* base, const size_t nel, const size_t 
     qsort_s(base, nel, size, cmp, d);
 }
 # define HAVE_GNU_QSORT_R 1
-#elif !defined HAVE_GNU_QSORT_R
+#else
 /* mm.c */
 
 #define mmtype long
@@ -525,7 +526,8 @@ ruby_qsort(void* base, const size_t nel, const size_t 
     else goto nxt;                         /* need not to sort both sides */
   }
 }
-#endif /* HAVE_GNU_QSORT_R */
+#endif
+#endif /* !HAVE_GNU_QSORT_R */
 
 char *
 ruby_strdup(const char *str)




--- util.c.orig	2022-04-12 11:11:15 UTC
+++ util.c
@@ -218,6 +218,7 @@ typedef int (cmpfunc_t)(const void*, const void*, void
 
 typedef int (cmpfunc_t)(const void*, const void*, void*);
 
+#if !defined HAVE_GNU_QSORT_R
 #if defined HAVE_QSORT_S && defined RUBY_MSVCRT_VERSION
 /* In contrast to its name, Visual Studio qsort_s is incompatible with
  * C11 in the order of the comparison function's arguments, and same
@@ -263,7 +264,7 @@ ruby_qsort(void* base, const size_t nel, const size_t 
     qsort_s(base, nel, size, cmp, d);
 }
 # define HAVE_GNU_QSORT_R 1
-#elif !defined HAVE_GNU_QSORT_R
+#else
 /* mm.c */
 
 #define mmtype long
@@ -530,7 +531,8 @@ ruby_qsort(void* base, const size_t nel, const size_t 
     else goto nxt;                         /* need not to sort both sides */
   }
 }
-#endif /* HAVE_GNU_QSORT_R */
+#endif
+#endif /* !HAVE_GNU_QSORT_R */
 
 char *
 ruby_strdup(const char *str)




--- util.c.orig	2022-04-12 11:48:55 UTC
+++ util.c
@@ -214,6 +214,7 @@ typedef int (cmpfunc_t)(const void*, const void*, void
 
 typedef int (cmpfunc_t)(const void*, const void*, void*);
 
+#if !defined HAVE_GNU_QSORT_R
 #if defined HAVE_QSORT_S && defined RUBY_MSVCRT_VERSION
 /* In contrast to its name, Visual Studio qsort_s is incompatible with
  * C11 in the order of the comparison function's arguments, and same
@@ -259,7 +260,7 @@ ruby_qsort(void* base, const size_t nel, const size_t 
     qsort_s(base, nel, size, cmp, d);
 }
 # define HAVE_GNU_QSORT_R 1
-#elif !defined HAVE_GNU_QSORT_R
+#else
 /* mm.c */
 
 #define mmtype long
@@ -525,7 +526,8 @@ ruby_qsort(void* base, const size_t nel, const size_t 
     else goto nxt;                         /* need not to sort both sides */
   }
 }
-#endif /* HAVE_GNU_QSORT_R */
+#endif
+#endif /* !HAVE_GNU_QSORT_R */
 
 char *
 ruby_strdup(const char *str)

Return to bug 266227

Lines 133-139 RUBY?= ${LOCALBASE}/bin/ruby${RUBY_SUFFIX} Link Here

(-)b/Mk/bsd.ruby.mk (-4 / +4 lines)
133	# Ruby 2.7	133	# Ruby 2.7
134	#	134	#
135	RUBY_DISTVERSION= 2.7.6	135	RUBY_DISTVERSION= 2.7.6
136	RUBY_PORTREVISION= 2	136	RUBY_PORTREVISION= 3
137	RUBY_PORTEPOCH= 1	137	RUBY_PORTEPOCH= 1
138		138
139	. elif ${RUBY_VER} == 3.0	139	. elif ${RUBY_VER} == 3.0
Lines 141-154 RUBY_PORTEPOCH= 1 Link Here
141	# Ruby 3.0	141	# Ruby 3.0
142	#	142	#
143	RUBY_DISTVERSION= 3.0.4	143	RUBY_DISTVERSION= 3.0.4
144	RUBY_PORTREVISION= 2	144	RUBY_PORTREVISION= 3
145	RUBY_PORTEPOCH= 1	145	RUBY_PORTEPOCH= 1
146	. elif ${RUBY_VER} == 3.1	146	. elif ${RUBY_VER} == 3.1
147	#	147	#
148	# Ruby 3.1	148	# Ruby 3.1
149	#	149	#
150	RUBY_DISTVERSION= 3.1.2	150	RUBY_DISTVERSION= 3.1.2
151	RUBY_PORTREVISION= 1	151	RUBY_PORTREVISION= 2
152	RUBY_PORTEPOCH= 1	152	RUBY_PORTEPOCH= 1
153		153
154	. elif ${RUBY_VER} == 3.2	154	. elif ${RUBY_VER} == 3.2
Lines 156-162 RUBY_PORTEPOCH= 1 Link Here
156	# Ruby 3.2	156	# Ruby 3.2
157	#	157	#
158	RUBY_DISTVERSION= 3.2.0-preview1	158	RUBY_DISTVERSION= 3.2.0-preview1
159	RUBY_PORTREVISION= 2	159	RUBY_PORTREVISION= 3
160	RUBY_PORTEPOCH= 1	160	RUBY_PORTEPOCH= 1
161		161
162	# When adding a version, please keep the comment in	162	# When adding a version, please keep the comment in

Added Link Here

(-)b/lang/ruby27/files/patch-util.c (+29 lines)
1	--- util.c.orig 2022-04-12 11:25:48 UTC
2	+++ util.c
3	@@ -210,6 +210,7 @@ typedef int (cmpfunc_t)(const void, const void, void
4
5	typedef int (cmpfunc_t)(const void, const void, void*);
6
7	+#if !defined HAVE_GNU_QSORT_R
8	#if defined HAVE_QSORT_S && defined RUBY_MSVCRT_VERSION
9	/* In contrast to its name, Visual Studio qsort_s is incompatible with
10	* C11 in the order of the comparison function's arguments, and same
11	@@ -255,7 +256,7 @@ ruby_qsort(void* base, const size_t nel, const size_t
12	qsort_s(base, nel, size, cmp, d);
13	}
14	# define HAVE_GNU_QSORT_R 1
15	-#elif !defined HAVE_GNU_QSORT_R
16	+#else
17	/* mm.c */
18
19	#define mmtype long
20	@@ -521,7 +522,8 @@ ruby_qsort(void* base, const size_t nel, const size_t
21	else goto nxt; /* need not to sort both sides */
22	}
23	}
24	-#endif /* HAVE_GNU_QSORT_R */
25	+#endif
26	+#endif /* !HAVE_GNU_QSORT_R */
27
28	char *
29	ruby_strdup(const char *str)

Added Link Here

(-)b/lang/ruby30/files/patch-util.c (+29 lines)
1	--- util.c.orig 2022-04-12 11:48:55 UTC
2	+++ util.c
3	@@ -214,6 +214,7 @@ typedef int (cmpfunc_t)(const void, const void, void
4
5	typedef int (cmpfunc_t)(const void, const void, void*);
6
7	+#if !defined HAVE_GNU_QSORT_R
8	#if defined HAVE_QSORT_S && defined RUBY_MSVCRT_VERSION
9	/* In contrast to its name, Visual Studio qsort_s is incompatible with
10	* C11 in the order of the comparison function's arguments, and same
11	@@ -259,7 +260,7 @@ ruby_qsort(void* base, const size_t nel, const size_t
12	qsort_s(base, nel, size, cmp, d);
13	}
14	# define HAVE_GNU_QSORT_R 1
15	-#elif !defined HAVE_GNU_QSORT_R
16	+#else
17	/* mm.c */
18
19	#define mmtype long
20	@@ -525,7 +526,8 @@ ruby_qsort(void* base, const size_t nel, const size_t
21	else goto nxt; /* need not to sort both sides */
22	}
23	}
24	-#endif /* HAVE_GNU_QSORT_R */
25	+#endif
26	+#endif /* !HAVE_GNU_QSORT_R */
27
28	char *
29	ruby_strdup(const char *str)

Added Link Here

(-)b/lang/ruby31/files/patch-util.c (+29 lines)
1	--- util.c.orig 2022-04-12 11:11:15 UTC
2	+++ util.c
3	@@ -218,6 +218,7 @@ typedef int (cmpfunc_t)(const void, const void, void
4
5	typedef int (cmpfunc_t)(const void, const void, void*);
6
7	+#if !defined HAVE_GNU_QSORT_R
8	#if defined HAVE_QSORT_S && defined RUBY_MSVCRT_VERSION
9	/* In contrast to its name, Visual Studio qsort_s is incompatible with
10	* C11 in the order of the comparison function's arguments, and same
11	@@ -263,7 +264,7 @@ ruby_qsort(void* base, const size_t nel, const size_t
12	qsort_s(base, nel, size, cmp, d);
13	}
14	# define HAVE_GNU_QSORT_R 1
15	-#elif !defined HAVE_GNU_QSORT_R
16	+#else
17	/* mm.c */
18
19	#define mmtype long
20	@@ -530,7 +531,8 @@ ruby_qsort(void* base, const size_t nel, const size_t
21	else goto nxt; /* need not to sort both sides */
22	}
23	}
24	-#endif /* HAVE_GNU_QSORT_R */
25	+#endif
26	+#endif /* !HAVE_GNU_QSORT_R */
27
28	char *
29	ruby_strdup(const char *str)

Added Link Here

(-)b/lang/ruby32/files/patch-util.c (-1 / +29 lines)
0	-	1	--- util.c.orig 2022-04-12 11:48:55 UTC
		2	+++ util.c
		3	@@ -214,6 +214,7 @@ typedef int (cmpfunc_t)(const void, const void, void
		4
		5	typedef int (cmpfunc_t)(const void, const void, void*);
		6
		7	+#if !defined HAVE_GNU_QSORT_R
		8	#if defined HAVE_QSORT_S && defined RUBY_MSVCRT_VERSION
		9	/* In contrast to its name, Visual Studio qsort_s is incompatible with
		10	* C11 in the order of the comparison function's arguments, and same
		11	@@ -259,7 +260,7 @@ ruby_qsort(void* base, const size_t nel, const size_t
		12	qsort_s(base, nel, size, cmp, d);
		13	}
		14	# define HAVE_GNU_QSORT_R 1
		15	-#elif !defined HAVE_GNU_QSORT_R
		16	+#else
		17	/* mm.c */
		18
		19	#define mmtype long
		20	@@ -525,7 +526,8 @@ ruby_qsort(void* base, const size_t nel, const size_t
		21	else goto nxt; /* need not to sort both sides */
		22	}
		23	}
		24	-#endif /* HAVE_GNU_QSORT_R */
		25	+#endif
		26	+#endif /* !HAVE_GNU_QSORT_R */
		27
		28	char *
		29	ruby_strdup(const char *str)