commit 4657535e2ed314d82202b3a7def8b2d51af8e807 · pyrox.dev/nixpkgs

+18 -3

pkgs/development/compilers/ghc/ghc-8.10-9.2-rts-package-db-libnuma-dirs.patch

···

       1
       1
       -
       From adef13bb81cdb49a8da8a22db261e48d8c4bbb5d Mon Sep 17 00:00:00 2001

     

       1
       1
       +
       From 3d17e6fa39fb18d4300fbf2a0c4b9ddb4adf746b Mon Sep 17 00:00:00 2001

     

       2
       2
        
       From: sterni <sternenseemann@systemli.org>

     

       3
       3
        
       Date: Thu, 17 Jul 2025 21:21:29 +0200

     

       4
       4
        
       Subject: [PATCH] rts: record libnuma include and lib dirs in package conf

     
···

       16
       16
        
       enforce its specific directories by adding them to rts.conf in the

     

       17
       17
        
       package db. This commit implements this retroactively for the make build

     

       18
       18
        
       system, modeled after how make does the same sort of thing for Libdw.

     

       19
       19
       +
       The Libdw logic also affects the bindist configure file in

     

       20
       20
       +
       distrib/configure.ac which isn't replicate since we don't need it.

     

       19
       21
        
       ---

     

       20
       22
        
        mk/config.mk.in     | 4 ++++

     

       21
       23
        
        rts/ghc.mk          | 8 ++++++++

     

       22
       24
        
        rts/package.conf.in | 5 +++--

     

       23
       23
       -
        3 files changed, 15 insertions(+), 2 deletions(-)

     

       25
       25
       +
        rts/rts.cabal.in    | 1 +

     

       26
       26
       +
        4 files changed, 16 insertions(+), 2 deletions(-)

     

       24
       27
        
       

     

       25
       28
        
       diff --git a/mk/config.mk.in b/mk/config.mk.in

     

       26
       29
        
       index 35f6e2d087..d2b1329eb5 100644

     
···

       80
       83
        
        #endif

     

       81
       84
        
        

     

       82
       85
        
        includes:               Stg.h

     

       86
       86
       +
       diff --git a/rts/rts.cabal.in b/rts/rts.cabal.in

     

       87
       87
       +
       index 0a06414d95..f71fb079ec 100644

     

       88
       88
       +
       --- a/rts/rts.cabal.in

     

       89
       89
       +
       +++ b/rts/rts.cabal.in

     

       90
       90
       +
       @@ -150,6 +150,7 @@ library

     

       91
       91
       +
            include-dirs: build ../includes includes

     

       92
       92
       +
                          includes/dist-derivedconstants/header @FFIIncludeDir@

     

       93
       93
       +
                          @LibdwIncludeDir@

     

       94
       94
       +
       +                  @LibNumaIncludeDir@

     

       95
       95
       +
            includes: Stg.h

     

       96
       96
       +
            install-includes: Cmm.h HsFFI.h MachDeps.h Rts.h RtsAPI.h Stg.h

     

       97
       97
       +
                              ghcautoconf.h ghcconfig.h ghcplatform.h ghcversion.h

     

       83
       98
        
       -- 

     

       84
       84
       -
       2.49.0

     

       99
       99
       +
       2.50.0

     

       85
       100

+18 -3

pkgs/development/compilers/ghc/ghc-9.4-rts-package-db-libnuma-dirs.patch

···

       1
       1
       -
       From f9625ba94522bec93b4c5d46ee5fd97f537a7dfa Mon Sep 17 00:00:00 2001

     

       1
       1
       +
       From a0b547f41939304adfc0c430314c342dd69306ae Mon Sep 17 00:00:00 2001

     

       2
       2
        
       From: sterni <sternenseemann@systemli.org>

     

       3
       3
        
       Date: Thu, 17 Jul 2025 21:21:29 +0200

     

       4
       4
        
       Subject: [PATCH] rts: record libnuma include and lib dirs in package conf

     
···

       16
       16
        
       enforce its specific directories by adding them to rts.conf in the

     

       17
       17
        
       package db. This commit implements this retroactively for the make build

     

       18
       18
        
       system, modeled after how make does the same sort of thing for Libdw.

     

       19
       19
       +
       The Libdw logic also affects the bindist configure file in

     

       20
       20
       +
       distrib/configure.ac which isn't replicate since we don't need it.

     

       19
       21
        
       ---

     

       20
       22
        
        mk/config.mk.in     | 4 ++++

     

       21
       23
        
        rts/ghc.mk          | 8 ++++++++

     

       22
       24
        
        rts/package.conf.in | 5 +++--

     

       23
       23
       -
        3 files changed, 15 insertions(+), 2 deletions(-)

     

       25
       25
       +
        rts/rts.cabal.in    | 1 +

     

       26
       26
       +
        4 files changed, 16 insertions(+), 2 deletions(-)

     

       24
       27
        
       

     

       25
       28
        
       diff --git a/mk/config.mk.in b/mk/config.mk.in

     

       26
       29
        
       index 2ff2bea9b6..d95f927dbd 100644

     
···

       80
       83
        
        #endif

     

       81
       84
        
        

     

       82
       85
        
        includes:               Rts.h

     

       86
       86
       +
       diff --git a/rts/rts.cabal.in b/rts/rts.cabal.in

     

       87
       87
       +
       index a8882268ac..debf2ba0a0 100644

     

       88
       88
       +
       --- a/rts/rts.cabal.in

     

       89
       89
       +
       +++ b/rts/rts.cabal.in

     

       90
       90
       +
       @@ -154,6 +154,7 @@ library

     

       91
       91
       +
            include-dirs: include

     

       92
       92
       +
                          @FFIIncludeDir@

     

       93
       93
       +
                          @LibdwIncludeDir@

     

       94
       94
       +
       +                  @LibNumaIncludeDir@

     

       95
       95
       +
            includes: Rts.h

     

       96
       96
       +
            install-includes: Cmm.h HsFFI.h MachDeps.h Rts.h RtsAPI.h Stg.h

     

       97
       97
       +
                              ghcautoconf.h ghcconfig.h ghcplatform.h ghcversion.h

     

       83
       98
        
       -- 

     

       84
       84
       -
       2.49.0

     

       99
       99
       +
       2.50.0

     

       85
       100