commit 3e6180e98430359ded36ebc4a0341e1bd6608ef8 · pyrox.dev/nixpkgs

+14

pkgs/development/libraries/boost/fix-clang-target.patch

···

       1
       1
       +
       --- a/tools/build/src/tools/clang.jam	2024-07-25 10:38:16.278401900 -0700

     

       2
       2
       +
       +++ b/tools/build/src/tools/clang.jam	2024-07-25 10:38:52.659750666 -0700

     

       3
       3
       +
       @@ -90,11 +90,6 @@

     

       4
       4
       +
                        case x86-64 : arch = x86_64 ;

     

       5
       5
       +
                        case x86-32 : arch = i386 ;

     

       6
       6
       +
                    }

     

       7
       7
       +
       -

     

       8
       8
       +
       -            toolset.flags $(toolset)

     

       9
       9
       +
       -                OPTIONS $(condition)/<target-os>$(target-os)/<architecture>$(_architecture_)/<address-model>$(_address-model_)

     

       10
       10
       +
       -                : "--target=$(arch)-$(vendor-sys)"

     

       11
       11
       +
       -                : unchecked ;

     

       12
       12
       +
                }

     

       13
       13
       +
            }

     

       14
       14
       +
        }

+2 -1

pkgs/development/libraries/boost/generic.nix

···

       150
       150
        
             stripLen = 1;

     

       151
       151
        
             extraPrefix = "libs/python/";

     

       152
       152
        
           })

     

       153
       153
       -
         ];

     

       153
       153
       +
         ]

     

       154
       154
       +
         ++ lib.optional (lib.versionAtLeast version "1.81" && stdenv.cc.isClang) ./fix-clang-target.patch;

     

       154
       155
        
       

     

       155
       156
        
         meta = with lib; {

     

       156
       157
        
           homepage = "http://boost.org/";