From nobody Tue Oct 11 20:32:28 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 4Mn6sT1JRdz4fMgF; Tue, 11 Oct 2022 20:32:29 +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 4Mn6sT0pCCz3S6L; Tue, 11 Oct 2022 20:32:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665520349; 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=nRGrODmST6M48eEkeqqNq7tzAeaClCv8RAP6msSYDBI=; b=NbEijzvglZHUGrPrhkY2zJXhWDWJLjxatJ1nCSg+Cmk0+gJD9cmcVuYQiEtj3kmR78NJU0 bYk150E/IQD5e1Cc9eYmVaPAwA9KPeirwJtwdtTErZA7LVjABuMIAmerP/LGCE+UH2qC70 EjvCIrE3rf0son/5ITA6SdQFW7mx6dh/cviyJbHiv9TdId2CUgvKRWGoxY91lkWPbW4b0h HHIOQEjuXFazjdLVyOZwOAUCGhKuI0ijf6iw7z25Th3iPNwJdeTaROfGnERB3cXh0vO258 r2eVjSI3Mdmj9Yf94BpVT5uRHol5Kk3hlLA8MF3b2XWtz5SXIiwr1+gPDJOicw== 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 4Mn6sS6gxFz14fk; Tue, 11 Oct 2022 20:32:28 +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 29BKWSMc098754; Tue, 11 Oct 2022 20:32:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29BKWSwZ098753; Tue, 11 Oct 2022 20:32:28 GMT (envelope-from git) Date: Tue, 11 Oct 2022 20:32:28 GMT Message-Id: <202210112032.29BKWSwZ098753@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Gleb Popov Subject: git: 8fb4cfcd3ba2 - main - lang/ghc810: Add upstream patch fixing a rare linking problem. 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: arrowd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8fb4cfcd3ba24b8ef7d702860ce02caf114c3799 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665520349; 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=nRGrODmST6M48eEkeqqNq7tzAeaClCv8RAP6msSYDBI=; b=NGMSr64n2jdSszUfzNuzl8s4wRJ8aDLyHRtpoZ/I4pcPpXnPLjqqkaUFmPY08lPlep+5r9 CC0AnzfNpGfOQRd724/8MiBKk+KRNgQCjCPebE1Lt3ptmT2Na2oaGBPW2xv888T1A3DTkC jD6J/S07wY634ga4fBC5b0ppMd0AZIMlZrXZVhG2wRUkc4s3gawzwImoVf4xDeDG6R2br+ D53o2nKq2rtUPgyGkPBqHJ2k7+7Ag/T3R3IOUzZ6vcTC5/dNOGBliIBvnexZ0uR5/q04r9 EHp91n5/Iex0F9+210RLdWJD5pXe0QBuPr2G1mSPMqyXccbYOcxIYOv6akKP7Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1665520349; a=rsa-sha256; cv=none; b=OWV8Fb7TzV7BL/DADGWQPr0YCjQS3+n8A3Ge/6WKiWyD/3lxr8StsV9z8ij6uKU9x7tajW y8w7aPwQ02bxEwQ3T811iQEpDmgcPg31FZ4fPwlyObNRsBOGminUn44XVuBcqnqHz9jGsy EIp8nt7ylWmtC8tnTkL1IVcCpa10UQlILnuGuJwh6VOdz7fhB1tXTDtY+kw0KI451ll/qQ hm5BCu1rZGEZHlFZq5GJdVsUgBU+dEuybLEJTufABbbiCukcSe+OKdMSzD9GlW0lsPDFAF lQqzdjNF+0nQBqeG9WjBZDCwnUTpLojQdfPcVfGvC9Y3xsvVd+/B7H4toAhUWg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=8fb4cfcd3ba24b8ef7d702860ce02caf114c3799 commit 8fb4cfcd3ba24b8ef7d702860ce02caf114c3799 Author: Gleb Popov AuthorDate: 2022-10-11 19:51:42 +0000 Commit: Gleb Popov CommitDate: 2022-10-11 20:32:08 +0000 lang/ghc810: Add upstream patch fixing a rare linking problem. lang/ghc does not require patching. --- lang/ghc810/Makefile | 1 + lang/ghc810/files/patch-linker-iconv.diff | 89 +++++++++++++++++++++++++++++++ 2 files changed, 90 insertions(+) diff --git a/lang/ghc810/Makefile b/lang/ghc810/Makefile index 0105166c8178..f6daff8f66f6 100644 --- a/lang/ghc810/Makefile +++ b/lang/ghc810/Makefile @@ -1,3 +1,4 @@ +PORTREVISION= 1 PKGNAMESUFFIX= 810 LIB_DEPENDS= ${GMP_LIB_DEPENDS} diff --git a/lang/ghc810/files/patch-linker-iconv.diff b/lang/ghc810/files/patch-linker-iconv.diff new file mode 100644 index 000000000000..a3f7a70fb528 --- /dev/null +++ b/lang/ghc810/files/patch-linker-iconv.diff @@ -0,0 +1,89 @@ +https://gitlab.haskell.org/ghc/ghc/-/commit/66d2e927842653fbc1cf2e6f997f443c78c2203b + +diff --git a/rts/Linker.c b/rts/Linker.c +index 1faff3b3716dd6de440071c89d0dafa471657962..12d5418d02a95893b14a619be10b5cd49a054f1a 100644 +--- rts/Linker.c ++++ rts/Linker.c +@@ -80,6 +80,33 @@ + #if defined(dragonfly_HOST_OS) + #include + #endif ++ ++/* ++ * Note [iconv and FreeBSD] ++ * ~~~~~~~~~~~~~~~~~~~~~~~~ ++ * ++ * On FreeBSD libc.so provides an implementation of the iconv_* family of ++ * functions. However, due to their implementation, these symbols cannot be ++ * resolved via dlsym(); rather, they can only be resolved using the ++ * explicitly-versioned dlvsym(). ++ * ++ * This is problematic for the RTS linker since we may be asked to load ++ * an object that depends upon iconv. To handle this we include a set of ++ * fallback cases for these functions, allowing us to resolve them to the ++ * symbols provided by the libc against which the RTS is linked. ++ * ++ * See #20354. ++ */ ++ ++#if defined(freebsd_HOST_OS) ++extern void iconvctl(); ++extern void iconv_open_into(); ++extern void iconv_open(); ++extern void iconv_close(); ++extern void iconv_canonicalize(); ++extern void iconv(); ++#endif ++ + /* + Note [runtime-linker-support] + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@@ -637,6 +664,10 @@ internal_dlsym(const char *symbol) { + } + RELEASE_LOCK(&dl_mutex); + ++ IF_DEBUG(linker, debugBelch("internal_dlsym: looking for symbol '%s' in special cases\n", symbol)); ++# define SPECIAL_SYMBOL(sym) \ ++ if (strcmp(symbol, #sym) == 0) return (void*)&sym; ++ + # if defined(HAVE_SYS_STAT_H) && defined(linux_HOST_OS) && defined(__GLIBC__) + // HACK: GLIBC implements these functions with a great deal of trickery where + // they are either inlined at compile time to their corresponding +@@ -646,18 +677,28 @@ internal_dlsym(const char *symbol) { + // We borrow the approach that the LLVM JIT uses to resolve these + // symbols. See http://llvm.org/PR274 and #7072 for more info. + +- IF_DEBUG(linker, debugBelch("internal_dlsym: looking for symbol '%s' in GLIBC special cases\n", symbol)); ++ SPECIAL_SYMBOL(stat); ++ SPECIAL_SYMBOL(fstat); ++ SPECIAL_SYMBOL(lstat); ++ SPECIAL_SYMBOL(stat64); ++ SPECIAL_SYMBOL(fstat64); ++ SPECIAL_SYMBOL(lstat64); ++ SPECIAL_SYMBOL(atexit); ++ SPECIAL_SYMBOL(mknod); ++# endif + +- if (strcmp(symbol, "stat") == 0) return (void*)&stat; +- if (strcmp(symbol, "fstat") == 0) return (void*)&fstat; +- if (strcmp(symbol, "lstat") == 0) return (void*)&lstat; +- if (strcmp(symbol, "stat64") == 0) return (void*)&stat64; +- if (strcmp(symbol, "fstat64") == 0) return (void*)&fstat64; +- if (strcmp(symbol, "lstat64") == 0) return (void*)&lstat64; +- if (strcmp(symbol, "atexit") == 0) return (void*)&atexit; +- if (strcmp(symbol, "mknod") == 0) return (void*)&mknod; ++ // See Note [iconv and FreeBSD] ++# if defined(freebsd_HOST_OS) ++ SPECIAL_SYMBOL(iconvctl); ++ SPECIAL_SYMBOL(iconv_open_into); ++ SPECIAL_SYMBOL(iconv_open); ++ SPECIAL_SYMBOL(iconv_close); ++ SPECIAL_SYMBOL(iconv_canonicalize); ++ SPECIAL_SYMBOL(iconv); + # endif + ++#undef SPECIAL_SYMBOL ++ + // we failed to find the symbol + return NULL; + }