From nobody Tue Aug 30 12:46:44 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MH6WS74Vmz4b9rn; Tue, 30 Aug 2022 12:46:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MH6WS6g4Cz3k1k; Tue, 30 Aug 2022 12:46:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661863604; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=E1Q7/gZuwU8zCf1GCMGXFXRcdrhR+c3MGD/p3q1XOMM=; b=l7OY1LrjhdhGOFvFu3zxQXZg8ZHseS5O4i9WlQgp+SxYamtax7NYFftQoremyrAjwnIKBv 00qCgxWxb+YbM/EwqWNXNPNsfXLYexLOTYWYU/j6wABzKkuhn8GUgAKLCHeMDFSoQT8ziR FMZIiEDqagBKHFHgEPhOFk2MOCDErVkyBkzZgy/uCaQ3s/bFC6tKa3IOer1TTO5i6AsPrC ApyQRSi+pQBh3LlgzjzBclD6vme7BGC8UuuZsDEkytg8l6g3z78lHOK3eLhCXxopw+hOMb dQNvU8LZhUDljoHO51NBKAZpOfDnGAQVH9zad+5Bvge6TQ9b6WQFLhG/B2P2pQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4MH6WS5n71zmnX; Tue, 30 Aug 2022 12:46:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 27UCki0b076344; Tue, 30 Aug 2022 12:46:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27UCkiwo076343; Tue, 30 Aug 2022 12:46:44 GMT (envelope-from git) Date: Tue, 30 Aug 2022 12:46:44 GMT Message-Id: <202208301246.27UCkiwo076343@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Baptiste Daroussin Subject: git: c28714cbc837 - main - lang/ruby*: add a patch to keep amd64-freebsd* as arch List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c28714cbc837128b141f19fb6e52b770fd641b9b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661863604; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=E1Q7/gZuwU8zCf1GCMGXFXRcdrhR+c3MGD/p3q1XOMM=; b=m4g7qEmATGvpxD0tCMfE3ejrQ24amlIM6Uu+Y7b6eUr1ydOc3ZNI4lrzpbDnwiI5xrbwfp g7DkPSBEkjP/dIOpmwfL0GU+gegMY4GXcbmttqHhlMhq/25U2mi9T0h3Uz47wwtir5VlOG FbVK1RlisHiVT2cV9RTFkX73Ho+C38fKyTRRYxmuxcUSelTXP3TxbbA9V8zPzC4zOJzDA6 rludcDgH7eZPCeCrm+Msd1oOfn5M2YHleqqDlpM6AShDnZtcrpaZ19TbWqJfqOkkGQQlIq 6b29+zWFmviObxGhCBa2rXxdYCitcPBKy1JzO+BM8WbZUIdRls/sFTcfe+5pHA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1661863604; a=rsa-sha256; cv=none; b=B0HMvraBRmg/AwA3O4Mw9x9MfIa3gyxKme14tLGR/s2HvA2HbwS07P0QTmyl7H+RuOhNh8 4gDTR6O6tEfJbmLECDW8xq29B0a4i44opDi8CgnVOpcnsr3z6Q1cGodjFBuLzze6Id5koq 3sUejguA8nlr1xlEgHkWAh6MjsssqiWXN9iI7OUklIX5W5pPeO19gB7e9xdrQ6YIPSawva lwLo9k3BxuHK7XVNc7FAx8o3WlT+/niWjgZx70c3Cgo/53nzWRhYCaD5y0E9sbn5FCD4LP 47r2QqPO8lcAQDLY6ymQH3t+YrIWa3Oy6pNGOCuT4J3VOtm5ZhFOiBbVbsqtGA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/ports/commit/?id=c28714cbc837128b141f19fb6e52b770fd641b9b commit c28714cbc837128b141f19fb6e52b770fd641b9b Author: Baptiste Daroussin AuthorDate: 2022-08-30 12:37:48 +0000 Commit: Baptiste Daroussin CommitDate: 2022-08-30 12:46:40 +0000 lang/ruby*: add a patch to keep amd64-freebsd* as arch In preparation for the update of config.guess/config.sub, where amd64-portbld-freebsd14.0 is reported as x86_64-portbld-freebsd14.0, Add a patch to keep the arch specific directory on amd64 being named amd64 --- lang/ruby27/files/patch-configure.ac | 14 +++++++++++--- lang/ruby30/files/patch-configure.ac | 10 +++++++++- lang/ruby31/files/patch-configure.ac | 8 ++++++++ lang/ruby32/files/patch-configure.ac | 8 ++++++++ 4 files changed, 36 insertions(+), 4 deletions(-) diff --git a/lang/ruby27/files/patch-configure.ac b/lang/ruby27/files/patch-configure.ac index 170a9f3a9fe8..2ad70b2c403a 100644 --- a/lang/ruby27/files/patch-configure.ac +++ b/lang/ruby27/files/patch-configure.ac @@ -1,6 +1,6 @@ ---- configure.ac.orig 2018-12-28 12:03:09 UTC +--- configure.ac.orig 2022-04-12 11:25:48 UTC +++ configure.ac -@@ -2678,7 +2678,7 @@ AS_IF([test "$with_dln_a_out" != yes], [ +@@ -2714,7 +2714,7 @@ AS_IF([test "$with_dln_a_out" != yes], [ : ${LDSHARED='$(CC) -shared'} AS_IF([test "$rb_cv_binary_elf" = yes], [ LDFLAGS="$LDFLAGS -rdynamic" @@ -9,7 +9,7 @@ ], [ test "$GCC" = yes && test "$rb_cv_prog_gnu_ld" = yes || LDSHARED='$(LD) -Bshareable' ]) -@@ -3163,6 +3163,7 @@ AS_CASE("$enable_shared", [yes], [ +@@ -3200,6 +3200,7 @@ AS_CASE("$enable_shared", [yes], [ [freebsd*|dragonfly*], [ LIBRUBY_SO='lib$(RUBY_SO_NAME).$(SOEXT).$(MAJOR)$(MINOR)' LIBRUBY_SONAME='$(LIBRUBY_SO)' @@ -17,3 +17,11 @@ AS_IF([test "$rb_cv_binary_elf" != "yes" ], [ LIBRUBY_SO="$LIBRUBY_SO.\$(TEENY)" LIBRUBY_ALIASES='' +@@ -3833,6 +3834,7 @@ AS_IF([test "${universal_binary-no}" = yes ], [ + AC_DEFINE_UNQUOTED(RUBY_PLATFORM, "universal." RUBY_PLATFORM_CPU "-" RUBY_PLATFORM_OS) + ], [ + arch="${target_cpu}-${target_os}" ++ AS_CASE(["$target_cpu-$target_os"], [x86_64-freebsd*],[arch=amd64-${target_os}]) + AC_DEFINE_UNQUOTED(RUBY_PLATFORM, "$arch") + ]) + diff --git a/lang/ruby30/files/patch-configure.ac b/lang/ruby30/files/patch-configure.ac index 3571a89e5cec..44a6172a23f4 100644 --- a/lang/ruby30/files/patch-configure.ac +++ b/lang/ruby30/files/patch-configure.ac @@ -1,5 +1,5 @@ --- configure.ac.orig 2022-04-12 11:48:55 UTC -+++ configure.ac 2022-04-23 ++++ configure.ac @@ -1231,7 +1231,7 @@ AC_CHECK_HEADERS(utime.h) AC_CHECK_HEADERS(time.h) AC_CHECK_HEADERS(ucontext.h) @@ -26,3 +26,11 @@ AS_IF([test "$rb_cv_binary_elf" != "yes" ], [ LIBRUBY_SO="$LIBRUBY_SO.\$(TEENY)" LIBRUBY_ALIASES='' +@@ -3960,6 +3961,7 @@ AS_IF([test "${universal_binary-no}" = yes ], [ + AC_DEFINE_UNQUOTED(RUBY_PLATFORM, "universal." RUBY_PLATFORM_CPU "-" RUBY_PLATFORM_OS) + ], [ + arch="${target_cpu}-${target_os}" ++ AS_CASE(["$target_cpu-$target_os"], [x86_64-freebsd*],[arch=amd64-${target_os}]) + AC_DEFINE_UNQUOTED(RUBY_PLATFORM, "$arch") + ]) + diff --git a/lang/ruby31/files/patch-configure.ac b/lang/ruby31/files/patch-configure.ac index 620b24f62202..ecaacc2baef2 100644 --- a/lang/ruby31/files/patch-configure.ac +++ b/lang/ruby31/files/patch-configure.ac @@ -26,3 +26,11 @@ AS_IF([test "$rb_cv_binary_elf" != "yes" ], [ LIBRUBY_SO="$LIBRUBY_SO.\$(TEENY)" LIBRUBY_ALIASES='' +@@ -4103,6 +4104,7 @@ AS_IF([test "${universal_binary-no}" = yes ], [ + arch="${target_cpu}-mingw-ucrt" + ], [ + arch="${target_cpu}-${target_os}" ++ AS_CASE(["$target_cpu-$target_os"], [x86_64-freebsd*],[arch=amd64-${target_os}]) + ]) + AC_DEFINE_UNQUOTED(RUBY_PLATFORM, "$arch") + ]) diff --git a/lang/ruby32/files/patch-configure.ac b/lang/ruby32/files/patch-configure.ac index 7740d9d0a1c3..af75b46cc98d 100644 --- a/lang/ruby32/files/patch-configure.ac +++ b/lang/ruby32/files/patch-configure.ac @@ -26,3 +26,11 @@ AS_IF([test "$rb_cv_binary_elf" != "yes" ], [ LIBRUBY_SO="$LIBRUBY_SO.\$(TEENY)" LIBRUBY_ALIASES='' +@@ -4150,6 +4151,7 @@ AS_IF([test "${universal_binary-no}" = yes ], [ + arch="${target_cpu}-mingw-ucrt" + ], [ + arch="${target_cpu}-${target_os}" ++ AS_CASE(["$target_cpu-$target_os"], [x86_64-freebsd*],[arch=amd64-${target_os}]) + ]) + AC_DEFINE_UNQUOTED(RUBY_PLATFORM, "$arch") + ])