[Git][ghc/ghc][wip/backports-9.10] 5 commits: Expand LLVM version matching regex for compability with bsd systems

[Ben Gamari (@bgamari)]

Ben Gamari pushed to branch wip/backports-9.10 at Glasgow Haskell Compiler / GHC


Commits:
291860da by Matthew Pickering at 2025-03-11T09:35:06-04:00
Expand LLVM version matching regex for compability with bsd systems

sed on BSD systems (such as darwin) does not support the + operation.

Therefore we take the simple minded approach of manually expanding
group+ to groupgroup*.

Fixes #24999

(cherry picked from commit 77ce65a5e9b14c29f8f47bfbe452b1d6296c45e8)

- - - - -
cac7c45d by Ben Gamari at 2025-03-11T09:35:06-04:00
ghc-internal: Update CHANGELOG to reflect current version

(cherry picked from commit 580fef7b1be1ea7247e9c7bc7ce0e3150b03fc36)

- - - - -
04cf8504 by Ben Gamari at 2025-03-11T09:35:06-04:00
ghc-internal: Update prologue.txt to reflect package description

(cherry picked from commit 391ecff5ced86e52089c5a5c46158a22755312a9)

- - - - -
7348dfc2 by Matthew Pickering at 2025-03-11T09:35:06-04:00
Remove accidentally committed test.hs

(cherry picked from commit e8724327d995a67d3eb066dfe4f9ee03e64dd6b5)

- - - - -
f2e63a12 by Matthew Pickering at 2025-03-11T09:35:06-04:00
libraries: Update os-string to 2.0.4

This updates the os-string submodule to 2.0.4 which removes the usage of
`TemplateHaskell` pragma.

(cherry picked from commit 37139b17f44cc489cc42cdac4e1b5b04b502d1b4)

- - - - -


5 changed files:

- libraries/ghc-internal/CHANGELOG.md
- libraries/ghc-internal/prologue.txt
- libraries/os-string
- m4/find_llvm_prog.m4
- − test.hs


Changes:

=====================================
libraries/ghc-internal/CHANGELOG.md
=====================================
@@ -1,5 +1,5 @@
 # Revision history for `ghc-internal`
 
-## 0.1.0.0 -- YYYY-mm-dd
+## 9.1001.0 -- 2024-05-01
 
-* First version. Released on an unsuspecting world.
+* Package created containing implementation moved from `base`.


=====================================
libraries/ghc-internal/prologue.txt
=====================================
@@ -1,3 +1,2 @@
-This package contains the @Prelude@ and its support libraries, and a large
-collection of useful libraries ranging from data structures to parsing
-combinators and debugging utilities.
+This package contains the implementation of GHC's standard libraries and is
+not intended for use by end-users.


=====================================
libraries/os-string
=====================================
@@ -1 +1 @@
-Subproject commit e1dd3bcfab56a6616c73ee9220de425d55545bc8
+Subproject commit 6d31aafde2f7b8c3050ffee7dd9f658225cfd1a4


=====================================
m4/find_llvm_prog.m4
=====================================
@@ -14,7 +14,7 @@ AC_DEFUN([FIND_LLVM_PROG],[
     PROG_VERSION_CANDIDATES=$(for llvmVersion in `seq $(($4-1)) -1 $3`; do echo "$2-$llvmVersion $2-$llvmVersion.0 $2$llvmVersion"; done)
     AC_CHECK_TOOLS([$1], [$PROG_VERSION_CANDIDATES $2], [])
     AS_IF([test x"$$1" != x],[
-        PROG_VERSION=`$$1 --version | sed -n -e 's/.*version \(\([[0-9]]\+\.\)\+[[0-9]]\+\).*/\1/gp'`
+        PROG_VERSION=`$$1 --version | sed -n -e 's/.*version \(\([[0-9]][[0-9]]*\.\)\([[0-9]][[0-9]]*\.\)*[[0-9]][[0-9]]*\).*/\1/gp'`
         AS_IF([test x"$PROG_VERSION" = x],
           [AC_MSG_RESULT(no)
            $1=""


=====================================
test.hs deleted
=====================================
@@ -1,14 +0,0 @@
-import Data.Char
-import Data.Foldable
--- | Just like 'GHC.ResponseFile.escapeArg', but it is not exposed from base.
-escapeArg :: String -> String
-escapeArg = reverse . foldl' escape []
-
-escape :: String -> Char -> String
-escape cs c
-  |    isSpace c
-    || '\\' == c
-    || '\'' == c
-    || '"'  == c = c:'\\':cs -- n.b., our caller must reverse the result
-  | otherwise    = c:cs
-



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/ade5ae4f12f81eb0841e6a1627eb03cc762b803b...f2e63a12313687e3aaeb052aa80ee8d7817052ec

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/ade5ae4f12f81eb0841e6a1627eb03cc762b803b...f2e63a12313687e3aaeb052aa80ee8d7817052ec
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20250312/e782c37e/attachment-0001.html>