commit 25edc476fd9fe1bd8bedf571d218ba4f27fb5a27 · pyrox.dev/nixpkgs

+49 -13

pkgs/development/libraries/glibc/common.nix

···

       1
       1
        
       /* Build configuration used to build glibc, Info files, and locale

     

       2
       2
        
          information.  */

     

       3
       3
        
       

     

       4
       4
       -
       cross:

     

       4
       4
       +
       { stdenv, lib, fetchurl

     

       5
       5
       +
       , gd ? null, libpng ? null

     

       6
       6
       +
       , buildPlatform, hostPlatform

     

       7
       7
       +
       , buildPackages

     

       8
       8
       +
       }:

     

       5
       9
        
       

     

       6
       6
       -
       { name, fetchurl, lib, stdenv, installLocales ? false

     

       7
       7
       -
       , linuxHeaders ? null

     

       8
       8
       -
       , profilingLibraries ? false, meta

     

       9
       9
       -
       , withGd ? false, gd ? null, libpng ? null

     

       10
       10
       -
       , preConfigure ? ""

     

       11
       11
       -
       , buildPackages ? {}

     

       10
       10
       +
       { name

     

       11
       11
       +
       , withLinuxHeaders ? false

     

       12
       12
       +
       , profilingLibraries ? false

     

       13
       13
       +
       , installLocales ? false

     

       14
       14
       +
       , withGd ? false

     

       15
       15
       +
       , meta

     

       12
       16
        
       , ...

     

       13
       17
        
       } @ args:

     

       14
       18
        
       

     

       15
       19
        
       let

     

       20
       20
       +
         inherit (buildPackages) linuxHeaders;

     

       16
       21
        
         version = "2.25";

     

       17
       22
        
         sha256 = "067bd9bb3390e79aa45911537d13c3721f1d9d3769931a30c2681bfee66f23a0";

     

       23
       23
       +
         cross = if buildPlatform != hostPlatform then hostPlatform else null;

     

       18
       24
        
       in

     

       19
       25
        
       

     

       20
       20
       -
       assert cross != null -> buildPackages.stdenv ? cc;

     

       26
       26
       +
       assert withLinuxHeaders -> linuxHeaders != null;

     

       27
       27
       +
       assert withGd -> gd != null && libpng != null;

     

       21
       28
        
       

     

       22
       29
        
       stdenv.mkDerivation ({

     

       23
       23
       -
         inherit linuxHeaders installLocales;

     

       30
       30
       +
         inherit  installLocales;

     

       31
       31
       +
         linuxHeaders = if withLinuxHeaders then linuxHeaders else null;

     

       24
       32
        
       

     

       25
       33
        
         # The host/target system.

     

       26
       34
        
         crossConfig = if cross != null then cross.config else null;

     
···

       87
       95
        
             "--enable-obsolete-rpc"

     

       88
       96
        
             "--sysconfdir=/etc"

     

       89
       97
        
             "--enable-stackguard-randomization"

     

       90
       90
       -
             (if linuxHeaders != null

     

       98
       98
       +
             (if withLinuxHeaders

     

       91
       99
        
              then "--with-headers=${linuxHeaders}/include"

     

       92
       100
        
              else "--without-headers")

     

       93
       101
        
             (if profilingLibraries

     

       94
       102
        
              then "--enable-profile"

     

       95
       103
        
              else "--disable-profile")

     

       96
       96
       -
           ] ++ lib.optionals (cross == null && linuxHeaders != null) [

     

       104
       104
       +
           ] ++ lib.optionals (cross == null && withLinuxHeaders) [

     

       97
       105
        
             "--enable-kernel=2.6.32"

     

       98
       106
        
           ] ++ lib.optionals (cross != null) [

     

       99
       107
        
             (if cross.withTLS then "--with-tls" else "--without-tls")

     
···

       125
       133
        
         BASH_SHELL = "/bin/sh";

     

       126
       134
        
       }

     

       127
       135
        
       

     

       128
       128
       -
       // (removeAttrs args [ "lib" "buildPackages" "fetchurl" "withGd" "gd" "libpng" ]) //

     

       136
       136
       +
       // (removeAttrs args [ "withLinuxHeaders" "withGd" ]) //

     

       129
       137
        
       

     

       130
       138
        
       {

     

       131
       139
        
         name = name + "-${version}" +

     
···

       154
       162
        
             ''makeFlags="$makeFlags BUILD_LDFLAGS=-Wl,-rpath,${stdenv.cc.libc}/lib"''

     

       155
       163
        
           }

     

       156
       164
        
       

     

       157
       157
       -
           ${preConfigure}

     

       165
       165
       +
       

     

       166
       166
       +
         '' + lib.optionalString (cross != null) ''

     

       167
       167
       +
           sed -i s/-lgcc_eh//g "../$sourceRoot/Makeconfig"

     

       168
       168
       +
       

     

       169
       169
       +
           cat > config.cache << "EOF"

     

       170
       170
       +
           libc_cv_forced_unwind=yes

     

       171
       171
       +
           libc_cv_c_cleanup=yes

     

       172
       172
       +
           libc_cv_gnu89_inline=yes

     

       173
       173
       +
           # Only due to a problem in gcc configure scripts:

     

       174
       174
       +
           libc_cv_sparc64_tls=${if cross.withTLS then "yes" else "no"}

     

       175
       175
       +
           EOF

     

       176
       176
       +
       

     

       177
       177
       +
           export BUILD_CC=gcc

     

       178
       178
       +
           export CC="$crossConfig-gcc"

     

       179
       179
       +
           export AR="$crossConfig-ar"

     

       180
       180
       +
           export RANLIB="$crossConfig-ranlib"

     

       158
       181
        
         '';

     

       159
       182
        
       

     

       160
       183
        
         preBuild = lib.optionalString withGd "unset NIX_DONT_SET_RPATH";

     
···

       177
       200
        
           maintainers = [ lib.maintainers.eelco ];

     

       178
       201
        
           platforms = lib.platforms.linux;

     

       179
       202
        
         } // meta;

     

       203
       203
       +
       }

     

       204
       204
       +
       

     

       205
       205
       +
       // lib.optionalAttrs (cross != null) {

     

       206
       206
       +
         preInstall = null; # clobber the native hook

     

       207
       207
       +
       

     

       208
       208
       +
         dontStrip = true;

     

       209
       209
       +
       

     

       210
       210
       +
         separateDebugInfo = false; # this is currently broken for crossDrv

     

       211
       211
       +
       

     

       212
       212
       +
         # To avoid a dependency on the build system 'bash'.

     

       213
       213
       +
         preFixup = ''

     

       214
       214
       +
           rm $bin/bin/{ldd,tzselect,catchsegv,xtrace}

     

       215
       215
       +
         '';

     

       180
       216
        
       })

+6 -46

pkgs/development/libraries/glibc/default.nix

···

       1
       1
       -
       { lib, stdenv, fetchurl

     

       1
       1
       +
       { stdenv, callPackage

     

       2
       2
       +
       , withLinuxHeaders ? true

     

       2
       3
        
       , installLocales ? true

     

       3
       4
        
       , profilingLibraries ? false

     

       4
       4
       -
       , withGd ? false, gd ? null, libpng ? null

     

       5
       5
       -
       , buildPlatform, hostPlatform

     

       6
       6
       -
       , buildPackages

     

       5
       5
       +
       , withGd ? false

     

       7
       6
        
       }:

     

       8
       7
        
       

     

       9
       8
        
       assert stdenv.cc.isGNU;

     

       10
       9
        
       

     

       11
       11
       -
       let

     

       12
       12
       -
         build = import ./common.nix;

     

       13
       13
       -
         cross = if buildPlatform != hostPlatform then hostPlatform else null;

     

       14
       14
       -
         inherit (buildPackages) linuxHeaders;

     

       15
       15
       -
       in

     

       16
       16
       -
         build cross ({

     

       17
       17
       -
           name = "glibc" + lib.optionalString withGd "-gd";

     

       10
       10
       +
       callPackage ./common.nix { inherit stdenv; } {

     

       11
       11
       +
           name = "glibc" + stdenv.lib.optionalString withGd "-gd";

     

       18
       12
        
       

     

       19
       19
       -
           inherit lib stdenv buildPackages fetchurl linuxHeaders installLocales

     

       20
       20
       -
             profilingLibraries withGd gd libpng;

     

       13
       13
       +
           inherit withLinuxHeaders profilingLibraries installLocales withGd;

     

       21
       14
        
       

     

       22
       15
        
           NIX_NO_SELF_RPATH = true;

     

       23
       16
        
       

     
···

       106
       99
        
       

     

       107
       100
        
           meta.description = "The GNU C Library";

     

       108
       101
        
         }

     

       109
       109
       -
       

     

       110
       110
       -
         //

     

       111
       111
       -
       

     

       112
       112
       -
         (if cross != null

     

       113
       113
       -
          then {

     

       114
       114
       -
             preConfigure = ''

     

       115
       115
       -
               sed -i s/-lgcc_eh//g "../$sourceRoot/Makeconfig"

     

       116
       116
       -
       

     

       117
       117
       -
               cat > config.cache << "EOF"

     

       118
       118
       -
               libc_cv_forced_unwind=yes

     

       119
       119
       -
               libc_cv_c_cleanup=yes

     

       120
       120
       -
               libc_cv_gnu89_inline=yes

     

       121
       121
       -
               # Only due to a problem in gcc configure scripts:

     

       122
       122
       -
               libc_cv_sparc64_tls=${if cross.withTLS then "yes" else "no"}

     

       123
       123
       -
               EOF

     

       124
       124
       -
               export BUILD_CC=gcc

     

       125
       125
       -
               export CC="$crossConfig-gcc"

     

       126
       126
       -
               export AR="$crossConfig-ar"

     

       127
       127
       -
               export RANLIB="$crossConfig-ranlib"

     

       128
       128
       -
       

     

       129
       129
       -
               dontStrip=1

     

       130
       130
       -
             '';

     

       131
       131
       -
       

     

       132
       132
       -
             preInstall = null; # clobber the native hook

     

       133
       133
       -
       

     

       134
       134
       -
             separateDebugInfo = false; # this is currently broken for crossDrv

     

       135
       135
       -
       

     

       136
       136
       -
             # To avoid a dependency on the build system 'bash'.

     

       137
       137
       -
             preFixup = ''

     

       138
       138
       -
               rm $bin/bin/{ldd,tzselect,catchsegv,xtrace}

     

       139
       139
       -
             '';

     

       140
       140
       -
           }

     

       141
       141
       -
          else {}))

+2 -7

pkgs/development/libraries/glibc/info.nix

···

       1
       1
       -
       { lib, stdenv, fetchurl, texinfo, perl }:

     

       1
       1
       +
       { callPackage, texinfo, perl }:

     

       2
       2
        
       

     

       3
       3
       -
       let build = import ./common.nix; in

     

       4
       4
       -
       

     

       5
       5
       -
       /* null cross builder */

     

       6
       6
       -
       build null {

     

       3
       3
       +
       callPackage ./common.nix {} {

     

       7
       4
        
         name = "glibc-info";

     

       8
       8
       -
       

     

       9
       9
       -
         inherit fetchurl stdenv lib;

     

       10
       5
        
       

     

       11
       6
        
         outputs = [ "out" ];

     

       12
       7

+4 -5

pkgs/development/libraries/glibc/locales.nix

···

       6
       6
        
          http://sourceware.org/cgi-bin/cvsweb.cgi/libc/localedata/SUPPORTED?cvsroot=glibc

     

       7
       7
        
       */

     

       8
       8
        
       

     

       9
       9
       -
       { lib, stdenv, fetchurl, writeText, allLocales ? true, locales ? ["en_US.UTF-8/UTF-8"] }:

     

       9
       9
       +
       { stdenv, callPackage, writeText

     

       10
       10
       +
       , allLocales ? true, locales ? [ "en_US.UTF-8/UTF-8" ]

     

       11
       11
       +
       }:

     

       10
       12
        
       

     

       11
       11
       -
       let build = import ./common.nix; in

     

       12
       12
       -
       

     

       13
       13
       -
       build null {

     

       13
       13
       +
       callPackage ./common.nix { inherit stdenv; } {

     

       14
       14
        
         name = "glibc-locales";

     

       15
       15
        
       

     

       16
       16
       -
         inherit fetchurl stdenv lib;

     

       17
       16
        
         installLocales = true;

     

       18
       17
        
       

     

       19
       18
        
         builder = ./locales-builder.sh;

pkgs/top-level/release-cross.nix

···

       15
       15
        
         common = {

     

       16
       16
        
           buildPackages.binutils = nativePlatforms;

     

       17
       17
        
           gmp = nativePlatforms;

     

       18
       18
       +
           libcCross = nativePlatforms;

     

       18
       19
        
         };

     

       19
       20
        
       

     

       20
       21
        
         gnuCommon = lib.recursiveUpdate common {