From cdeecd2c6b352bfd685d573dbe7e43c0d8c09ef9 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Sat, 23 May 2020 11:35:13 +0200 Subject: [PATCH] - bring back sanity to package paths - remove obsolete winpaths patch - rel 2 --- ghc-pkgdir.patch | 15 ++++++----- ghc-winpaths.patch | 64 ---------------------------------------------- ghc.spec | 4 +-- 3 files changed, 10 insertions(+), 73 deletions(-) delete mode 100644 ghc-winpaths.patch diff --git a/ghc-pkgdir.patch b/ghc-pkgdir.patch index eb836a9..6c91478 100644 --- a/ghc-pkgdir.patch +++ b/ghc-pkgdir.patch @@ -1,6 +1,6 @@ ---- ghc-6.12.3/libraries/Cabal/Cabal/Distribution/Simple/InstallDirs.hs~ 2010-06-09 20:10:19.000000000 +0200 -+++ ghc-6.12.3/libraries/Cabal/Cabal/Distribution/Simple/InstallDirs.hs 2010-08-26 21:28:52.969002660 +0200 -@@ -205,7 +205,7 @@ +--- ghc-8.10.1/libraries/Cabal/Cabal/Distribution/Simple/InstallDirs.hs.orig 2019-12-30 03:32:20.000000000 +0100 ++++ ghc-8.10.1/libraries/Cabal/Cabal/Distribution/Simple/InstallDirs.hs 2020-05-23 10:10:45.902028639 +0200 +@@ -161,7 +161,7 @@ -- users to be able to configure @--libdir=\/usr\/lib64@ for example but -- because by default we want to support installing multiple versions of -- packages and building the same package for multiple compilers we append the @@ -17,18 +17,21 @@ + _other -> "$compiler" "$pkgid", dynlibdir = "$libdir" case comp of UHC -> "$pkgid" - _other -> "$abi", +- _other -> "$abi", - libexecsubdir= "$abi" "$pkgid", ++ _other -> "$compiler" "$pkgid", + libexecsubdir= "$pkgid", flibdir = "$libdir", libexecdir = case buildOS of Windows -> "$prefix" "$libname" -@@ -217,7 +217,7 @@ +@@ -217,8 +217,8 @@ datadir = case buildOS of Windows -> "$prefix" _other -> "$prefix" "share", - datasubdir = "$abi" "$pkgid", +- docdir = "$datadir" "doc" "$abi" "$pkgid", + datasubdir = "$pkgid", - docdir = "$datadir" "doc" "$abi" "$pkgid", ++ docdir = "$datadir" "doc" "$pkgid", mandir = "$datadir" "man", htmldir = "$docdir" "html", + haddockdir = "$htmldir", diff --git a/ghc-winpaths.patch b/ghc-winpaths.patch deleted file mode 100644 index 8239af3..0000000 --- a/ghc-winpaths.patch +++ /dev/null @@ -1,64 +0,0 @@ -diff -ur ghc-7.2.1-winpaths/docs/users_guide/ghci.xml ghc-7.2.1/docs/users_guide/ghci.xml ---- ghc-7.2.1-winpaths/docs/users_guide/ghci.xml 2011-09-26 17:55:05.824214356 +0200 -+++ ghc-7.2.1/docs/users_guide/ghci.xml 2011-08-07 19:10:05.000000000 +0200 -@@ -126,7 +126,7 @@ - directory of the shell from which it was started. If you started - GHCi from the “Start” menu in Windows, then the - current directory is probably something like -- C:\Documents and Settings\user -+ C:\\Documents and Settings\\user - name. then we will - need to change to the right directory in GHCi: - -diff -ur ghc-7.2.1-winpaths/docs/users_guide/packages.xml ghc-7.2.1/docs/users_guide/packages.xml ---- ghc-7.2.1-winpaths/docs/users_guide/packages.xml 2011-09-26 17:56:23.484450567 +0200 -+++ ghc-7.2.1/docs/users_guide/packages.xml 2011-08-07 19:10:05.000000000 +0200 -@@ -396,7 +396,7 @@ - systems this will be - $HOME/.ghc/arch-os-version/package.conf.d, and on - Windows it will be something like -- C:\Documents And Settings\user\ghc\package.conf.d. -+ C:\\Documents And Settings\\user\\ghc\\package.conf.d. - The ghc-pkg tool knows where this file should be - located, and will create it if it doesn't exist (see ). - -diff -ur ghc-7.2.1-winpaths/docs/users_guide/using.xml ghc-7.2.1/docs/users_guide/using.xml ---- ghc-7.2.1-winpaths/docs/users_guide/using.xml 2011-09-26 17:58:56.791496986 +0200 -+++ ghc-7.2.1/docs/users_guide/using.xml 2011-08-07 19:10:05.000000000 +0200 -@@ -72,7 +72,7 @@ - by directory separators). For example, the - module Data.Person would be in the - file Data/Person.hs on Unix/Linux/Mac, -- or Data\Person.hs on Windows. -+ or Data\\Person.hs on Windows. - - - -diff -ur ghc-7.2.1-winpaths/docs/users_guide/win32-dlls.xml ghc-7.2.1/docs/users_guide/win32-dlls.xml ---- ghc-7.2.1-winpaths/docs/users_guide/win32-dlls.xml 2011-09-26 17:58:03.182366314 +0200 -+++ ghc-7.2.1/docs/users_guide/win32-dlls.xml 2011-08-07 19:10:05.000000000 +0200 -@@ -14,7 +14,7 @@ - Be aware of that ghc and ghci do - require filenames containing spaces to be escaped using quotes: - -- c:\ghc\bin\ghci "c:\\Program Files\\Haskell\\Project.hs" -+ c:\\ghc\\bin\\ghci "c:\\Program Files\\Haskell\\Project.hs" - - If the quotes are left off in the above command, ghci will - interpret the filename as two, "c:\\Program" and "Files\\Haskell\\Project.hs". -@@ -134,13 +134,13 @@ - unix-style API on top of the windows libraries, to facilitate ports of - unix software to windows. To this end, they introduce a unix-style - directory hierarchy under some root directory (typically --/ is C:\cygwin\). Moreover, -+/ is C:\\cygwin\\). Moreover, - everything built against the cygwin API (including the cygwin tools - and programs compiled with cygwin's ghc) will see / as the root of - their file system, happily pretending to work in a typical unix - environment, and finding things like /bin and /usr/include without - ever explicitly bothering with their actual location on the windows --system (probably C:\cygwin\bin and C:\cygwin\usr\include). -+system (probably C:\\cygwin\\bin and C:\\cygwin\\usr\\include). - - - diff --git a/ghc.spec b/ghc.spec index c5941d7..73d8f21 100644 --- a/ghc.spec +++ b/ghc.spec @@ -52,7 +52,7 @@ Summary: Glasgow Haskell Compilation system Summary(pl.UTF-8): System kompilacji Glasgow Haskell Name: ghc Version: 8.10.1 -Release: 1 +Release: 2 License: BSD-like w/o adv. clause Group: Development/Languages Source0: http://haskell.org/ghc/dist/%{version}/%{name}-%{version}-src.tar.xz @@ -65,7 +65,6 @@ Source5: http://ftp.ports.debian.org/debian-ports/pool-x32/main/g/ghc/ghc_8.8.3- # Source5-md5: b912b87c8d9450d140ae773083edecb0 Patch0: %{name}-pld.patch Patch1: %{name}-pkgdir.patch -Patch2: %{name}-winpaths.patch Patch3: build.patch Patch4: buildpath-abi-stability.patch Patch5: x32-use-native-x86_64-insn.patch @@ -294,7 +293,6 @@ cd .. %patch0 -p1 %patch1 -p1 -#%patch2 -p1 %patch3 -p1 %patch4 -p1 %patch5 -p1 -- 2.44.0