From nobody Sat Apr 23 03:12:39 2022 X-Original-To: dev-commits-ports-all@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 878A91996B9E; Sat, 23 Apr 2022 03:12:39 +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 4Klbtb3Nn1z4YhR; Sat, 23 Apr 2022 03:12:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650683559; 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=13FpdYaiNNYODXOyllEZw6cvLC8Qyw+r8vAFHuFosqw=; b=ENZG8NgDQDaiIRngQu4ISXwpm425aoWl1dukIA4McQaPty9DtVmPrFxK+OJu4sNxWzIuMh Zec5PRXx/2cd2Rt4G6MHUGZUqhDcrA600cCir42t6AFU2ZvFXl9WbyGyHxKgR90imvBmV6 SmIV/KwetOOKxQiFu7rA5N7ob7cTa168N0Y8aMaP9M7/0Wisz6W4zjESlhb5dICbR8dCn4 RZrvqTUU6dCZKLGyMND/1CFw0YffLq8uIVIni9nJ+EuuT6j4IlTyE1nOSPHZnMOBTplazG K3rMzc4D4ta2pGAvxutOAm9NLIqVrIAyQTaxWwuhDhOZ829rScSKp9xej5hc0w== 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 50C892007; Sat, 23 Apr 2022 03:12:39 +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 23N3Cdpm045695; Sat, 23 Apr 2022 03:12:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23N3CdRU045694; Sat, 23 Apr 2022 03:12:39 GMT (envelope-from git) Date: Sat, 23 Apr 2022 03:12:39 GMT Message-Id: <202204230312.23N3CdRU045694@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jung-uk Kim Subject: git: bd22c2827968 - main - lang/ruby3[0-2]: Fix build with certain CPUTYPE List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jkim X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bd22c2827968b0ef6ef36dd853b31259c6ba3125 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650683559; 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=13FpdYaiNNYODXOyllEZw6cvLC8Qyw+r8vAFHuFosqw=; b=O5XaLnpKjiDVNnjvf2Gdjwtvauh60ehmojl+qcwg4jrjMrIxPHcWk7X+zKwPguAhIvs91G o0JukGKP5bErju+EvWGHl1DU1PWdD2Pn+oZyL7h96x06WiWzndoR8YwS0dItP/JoZOlo4m xRllS1dSIo8JXqw1rEvY/U9ggC3zedr7XjWKtJyGyQpHhgWAJrhM9H4l0h6uJmRKMOdASB Ti7CJhpTQzoWFNkRTrpqAZHep//DJ/pBYwb8u7JkN1UOLd1hOI3Gb6pyo8kjIPHHC5ElCm DyM/yWLvlOE4FCVP0F0FvIbIVy1DBmjiszUSMWReoUtBF0+IggBvpT/cydqBcQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650683559; a=rsa-sha256; cv=none; b=gANm66zFwKayOUBpmLWG60svLR1/2Q3XmQkkKxzcGASTS5SiDmr3eXH5tBDlBEoTi+deMZ aO0tOOXdnpTHs11HHq7+nb4byqe32mhw5VmpFyo5Ezwi3GUcw2sMSk0T/VAPeAAeV/bX9s zgYIDCuu7hMSGkPd3aXg4dkG00wbc7xYwcr65iPFuSDreHzt+fUv0rRZNuvnBNey4qZyKv rExF4pBZrkbpBhfa+/NVUmjllAkaPhcits6Bf7petun7y6bqGB2dpC3wU2bleiOSga0h3X UxPQWYUF/8TNkZ1uRzB/D9A7JBE434bY4U6U5jcrBOWu03aAfqK0UkfMkLzl2A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jkim: URL: https://cgit.FreeBSD.org/ports/commit/?id=bd22c2827968b0ef6ef36dd853b31259c6ba3125 commit bd22c2827968b0ef6ef36dd853b31259c6ba3125 Author: Jung-uk Kim AuthorDate: 2022-04-23 03:04:46 +0000 Commit: Jung-uk Kim CommitDate: 2022-04-23 03:04:46 +0000 lang/ruby3[0-2]: Fix build with certain CPUTYPE When CPUTYPE is set and the CPU supports lzcnt instruction, it fails to build because x86intrin.h is not included. Fix the test to make it work on FreeBSD. PR: 260791 Approved by: ruby (maintainer timeout) --- lang/ruby30/files/patch-configure.ac | 17 +++++++++++++---- lang/ruby31/files/patch-configure.ac | 15 ++++++++++++--- lang/ruby32/files/patch-configure.ac | 15 ++++++++++++--- 3 files changed, 37 insertions(+), 10 deletions(-) diff --git a/lang/ruby30/files/patch-configure.ac b/lang/ruby30/files/patch-configure.ac index 170a9f3a9fe8..3571a89e5cec 100644 --- a/lang/ruby30/files/patch-configure.ac +++ b/lang/ruby30/files/patch-configure.ac @@ -1,6 +1,15 @@ ---- configure.ac.orig 2018-12-28 12:03:09 UTC -+++ configure.ac -@@ -2678,7 +2678,7 @@ AS_IF([test "$with_dln_a_out" != yes], [ +--- configure.ac.orig 2022-04-12 11:48:55 UTC ++++ configure.ac 2022-04-23 +@@ -1231,7 +1231,7 @@ AC_CHECK_HEADERS(utime.h) + AC_CHECK_HEADERS(time.h) + AC_CHECK_HEADERS(ucontext.h) + AC_CHECK_HEADERS(utime.h) +-AS_CASE("$target_cpu", [x64|x86_64|i[3-6]86*], [ ++AS_CASE("$target_cpu", [amd64|x64|x86_64|i[3-6]86*], [ + AC_CHECK_HEADERS(x86intrin.h) + ]) + +@@ -2825,7 +2825,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 +18,7 @@ ], [ test "$GCC" = yes && test "$rb_cv_prog_gnu_ld" = yes || LDSHARED='$(LD) -Bshareable' ]) -@@ -3163,6 +3163,7 @@ AS_CASE("$enable_shared", [yes], [ +@@ -3324,6 +3324,7 @@ AS_CASE("$enable_shared", [yes], [ [freebsd*|dragonfly*], [ LIBRUBY_SO='lib$(RUBY_SO_NAME).$(SOEXT).$(MAJOR)$(MINOR)' LIBRUBY_SONAME='$(LIBRUBY_SO)' diff --git a/lang/ruby31/files/patch-configure.ac b/lang/ruby31/files/patch-configure.ac index 170a9f3a9fe8..620b24f62202 100644 --- a/lang/ruby31/files/patch-configure.ac +++ b/lang/ruby31/files/patch-configure.ac @@ -1,6 +1,15 @@ ---- configure.ac.orig 2018-12-28 12:03:09 UTC +--- configure.ac.orig 2022-04-12 11:11:15 UTC +++ configure.ac -@@ -2678,7 +2678,7 @@ AS_IF([test "$with_dln_a_out" != yes], [ +@@ -1304,7 +1304,7 @@ AC_CHECK_HEADERS(utime.h) + AC_CHECK_HEADERS(time.h) + AC_CHECK_HEADERS(ucontext.h) + AC_CHECK_HEADERS(utime.h) +-AS_CASE("$target_cpu", [x64|x86_64|i[3-6]86*], [ ++AS_CASE("$target_cpu", [amd64|x64|x86_64|i[3-6]86*], [ + AC_CHECK_HEADERS(x86intrin.h) + ]) + RUBY_UNIVERSAL_CHECK_HEADER([x86_64, i386], x86intrin.h) +@@ -2982,7 +2982,7 @@ STATIC= : ${LDSHARED='$(CC) -shared'} AS_IF([test "$rb_cv_binary_elf" = yes], [ LDFLAGS="$LDFLAGS -rdynamic" @@ -9,7 +18,7 @@ ], [ test "$GCC" = yes && test "$rb_cv_prog_gnu_ld" = yes || LDSHARED='$(LD) -Bshareable' ]) -@@ -3163,6 +3163,7 @@ AS_CASE("$enable_shared", [yes], [ +@@ -3458,6 +3458,7 @@ AS_CASE("$enable_shared", [yes], [ [freebsd*|dragonfly*], [ LIBRUBY_SO='lib$(RUBY_SO_NAME).$(SOEXT).$(MAJOR)$(MINOR)' LIBRUBY_SONAME='$(LIBRUBY_SO)' diff --git a/lang/ruby32/files/patch-configure.ac b/lang/ruby32/files/patch-configure.ac index 170a9f3a9fe8..7740d9d0a1c3 100644 --- a/lang/ruby32/files/patch-configure.ac +++ b/lang/ruby32/files/patch-configure.ac @@ -1,6 +1,15 @@ ---- configure.ac.orig 2018-12-28 12:03:09 UTC +--- configure.ac.orig 2022-04-03 04:38:31 UTC +++ configure.ac -@@ -2678,7 +2678,7 @@ AS_IF([test "$with_dln_a_out" != yes], [ +@@ -1320,7 +1320,7 @@ AC_CHECK_HEADERS(utime.h) + AC_CHECK_HEADERS(time.h) + AC_CHECK_HEADERS(ucontext.h) + AC_CHECK_HEADERS(utime.h) +-AS_CASE("$target_cpu", [x64|x86_64|i[3-6]86*], [ ++AS_CASE("$target_cpu", [amd64|x64|x86_64|i[3-6]86*], [ + AC_CHECK_HEADERS(x86intrin.h) + ]) + RUBY_UNIVERSAL_CHECK_HEADER([x86_64, i386], x86intrin.h) +@@ -3027,7 +3027,7 @@ STATIC= : ${LDSHARED='$(CC) -shared'} AS_IF([test "$rb_cv_binary_elf" = yes], [ LDFLAGS="$LDFLAGS -rdynamic" @@ -9,7 +18,7 @@ ], [ test "$GCC" = yes && test "$rb_cv_prog_gnu_ld" = yes || LDSHARED='$(LD) -Bshareable' ]) -@@ -3163,6 +3163,7 @@ AS_CASE("$enable_shared", [yes], [ +@@ -3501,6 +3501,7 @@ AS_CASE("$enable_shared", [yes], [ [freebsd*|dragonfly*], [ LIBRUBY_SO='lib$(RUBY_SO_NAME).$(SOEXT).$(MAJOR)$(MINOR)' LIBRUBY_SONAME='$(LIBRUBY_SO)'