Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 1 Nov 2021 13:48:43 GMT
From:      Po-Chuan Hsieh <sunpoet@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 9c7833b38909 - main - lang/ruby27: Use proper variables, RUBY_SHLIBVER and RUBY_SUFFIX
Message-ID:  <202111011348.1A1Dmhr0053190@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by sunpoet:

URL: https://cgit.FreeBSD.org/ports/commit/?id=9c7833b3890910322c378d61a77aa95ac33f13f1

commit 9c7833b3890910322c378d61a77aa95ac33f13f1
Author:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2021-11-01 13:30:26 +0000
Commit:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
CommitDate: 2021-11-01 13:42:21 +0000

    lang/ruby27: Use proper variables, RUBY_SHLIBVER and RUBY_SUFFIX
---
 lang/ruby27/Makefile  | 2 +-
 lang/ruby27/pkg-plist | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lang/ruby27/Makefile b/lang/ruby27/Makefile
index 958018f91f76..9bb23502ef61 100644
--- a/lang/ruby27/Makefile
+++ b/lang/ruby27/Makefile
@@ -113,7 +113,7 @@ MAKE_JOBS_UNSAFE=	yes
 .if ${RUBY_VER} == ${RUBY_DEFAULT_VER}
 PLIST_SUB+=	IF_DEFAULT=""
 .else
-PKGNAMESUFFIX=	${RUBY_VER:C/\.//}
+PKGNAMESUFFIX=	${RUBY_SUFFIX}
 PLIST_SUB+=	IF_DEFAULT="@comment "
 .endif
 
diff --git a/lang/ruby27/pkg-plist b/lang/ruby27/pkg-plist
index 0c19c44cf329..e7f1bf54f25a 100644
--- a/lang/ruby27/pkg-plist
+++ b/lang/ruby27/pkg-plist
@@ -32,9 +32,9 @@ include/ruby-%%RUBY_VER%%/ruby/thread_native.h
 include/ruby-%%RUBY_VER%%/ruby/util.h
 include/ruby-%%RUBY_VER%%/ruby/version.h
 include/ruby-%%RUBY_VER%%/ruby/vm.h
-lib/lib%%RUBY_NAME%%-static.a
-lib/lib%%RUBY_NAME%%.so
-lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
+lib/libruby%%RUBY_SHLIBVER%%-static.a
+lib/libruby%%RUBY_SHLIBVER%%.so
+lib/libruby%%RUBY_SHLIBVER%%.so.%%RUBY_SHLIBVER%%
 %%RUBY_LIBDIR%%/English.rb
 %%RUBY_LIBDIR%%/abbrev.rb
 %%RUBY_ARCHLIBDIR%%/bigdecimal.so



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202111011348.1A1Dmhr0053190>