commit dd3f3bdcc28282e6d235ff16d7173ee9ea81d7b0 · pyrox.dev/nixpkgs

+2 -14

pkgs/development/compilers/gcc/4.8/default.nix

···

       13
       13
        
       , perl ? null # optional, for texi2pod (then pod2man); required for Java

     

       14
       14
        
       , gmp, mpfr, mpc, gettext, which

     

       15
       15
        
       , libelf                      # optional, for link-time optimizations (LTO)

     

       16
       16
       -
       , ppl ? null, cloog ? null, isl ? null # optional, for the Graphite optimization framework.

     

       16
       16
       +
       , cloog ? null, isl ? null # optional, for the Graphite optimization framework.

     

       17
       17
        
       , zlib ? null, boehmgc ? null

     

       18
       18
        
       , zip ? null, unzip ? null, pkgconfig ? null, gtk ? null, libart_lgpl ? null

     

       19
       19
        
       , libX11 ? null, libXt ? null, libSM ? null, libICE ? null, libXtst ? null

     
···

       276
       276
        
           ++ (optional javaAwtGtk pkgconfig);

     

       277
       277
        
       

     

       278
       278
        
         buildInputs = [ gmp mpfr mpc libelf ]

     

       279
       279
       -
           ++ (optional (ppl != null) ppl)

     

       280
       279
        
           ++ (optional (cloog != null) cloog)

     

       281
       280
        
           ++ (optional (isl != null) isl)

     

       282
       281
        
           ++ (optional (zlib != null) zlib)

     
···

       293
       292
        
       

     

       294
       293
        
         NIX_LDFLAGS = stdenv.lib.optionalString  stdenv.isSunOS "-lm -ldl";

     

       295
       294
        
       

     

       296
       296
       -
         preConfigure = ''

     

       297
       297
       -
           configureFlagsArray=(

     

       298
       298
       -
             ${stdenv.lib.optionalString (ppl != null && ppl ? dontDisableStatic && ppl.dontDisableStatic)

     

       299
       299
       -
               "'--with-host-libstdcxx=-lstdc++ -lgcc_s'"}

     

       300
       300
       -
             ${stdenv.lib.optionalString (ppl != null && stdenv.isSunOS)

     

       301
       301
       -
               "\"--with-host-libstdcxx=-Wl,-rpath,\$prefix/lib/amd64 -lstdc++\"

     

       302
       302
       -
                \"--with-boot-ldflags=-L../prev-x86_64-pc-solaris2.11/libstdc++-v3/src/.libs\""}

     

       303
       303
       -
           );

     

       304
       304
       -
         '' + stdenv.lib.optionalString (stdenv.isSunOS && stdenv.is64bit) ''

     

       295
       295
       +
         preConfigure = stdenv.lib.optionalString (stdenv.isSunOS && stdenv.is64bit) ''

     

       305
       296
        
           export NIX_LDFLAGS=`echo $NIX_LDFLAGS | sed -e s~$prefix/lib~$prefix/lib/amd64~g`

     

       306
       297
        
           export LDFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $LDFLAGS_FOR_TARGET"

     

       307
       298
        
           export CXXFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CXXFLAGS_FOR_TARGET"

     
···

       329
       320
        
           ${if enableMultilib then "--disable-libquadmath" else "--disable-multilib"}

     

       330
       321
        
           ${if enableShared then "" else "--disable-shared"}

     

       331
       322
        
           ${if enablePlugin then "--enable-plugin" else "--disable-plugin"}

     

       332
       332
       -
           ${if ppl != null then "--with-ppl=${ppl} --disable-ppl-version-check" else ""}

     

       333
       323
        
           ${optionalString (isl != null) "--with-isl=${isl}"}

     

       334
       324
        
           ${optionalString (cloog != null) "--with-cloog=${cloog} --disable-cloog-version-check --enable-cloog-backend=isl"}

     

       335
       325
        
           ${if langJava then

     
···

       412
       402
        
           configureFlags = ''

     

       413
       403
        
             ${if enableMultilib then "" else "--disable-multilib"}

     

       414
       404
        
             ${if enableShared then "" else "--disable-shared"}

     

       415
       415
       -
             ${if ppl != null then "--with-ppl=${ppl.crossDrv}" else ""}

     

       416
       405
        
             ${if cloog != null then "--with-cloog=${cloog.crossDrv} --enable-cloog-backend=isl" else ""}

     

       417
       406
        
             ${if langJava then "--with-ecj-jar=${javaEcj.crossDrv}" else ""}

     

       418
       407
        
             ${if javaAwtGtk then "--enable-java-awt=gtk" else ""}

     
···

       521
       510
        
       

     

       522
       511
        
           maintainers = with stdenv.lib.maintainers; [ ludo viric shlevy simons ];

     

       523
       512
        
       

     

       524
       524
       -
           # Volunteers needed for the {Cyg,Dar}win ports of *PPL.

     

       525
       513
        
           # gnatboot is not available out of linux platforms, so we disable the darwin build

     

       526
       514
        
           # for the gnat (ada compiler).

     

       527
       515
        
           platforms =

+1 -12

pkgs/development/compilers/gcc/4.9/default.nix

···

       11
       11
        
       , perl ? null # optional, for texi2pod (then pod2man); required for Java

     

       12
       12
        
       , gmp, mpfr, mpc, gettext, which

     

       13
       13
        
       , libelf                      # optional, for link-time optimizations (LTO)

     

       14
       14
       -
       , ppl ? null, cloog ? null, isl ? null # optional, for the Graphite optimization framework.

     

       14
       14
       +
       , cloog ? null, isl ? null # optional, for the Graphite optimization framework.

     

       15
       15
        
       , zlib ? null, boehmgc ? null

     

       16
       16
        
       , zip ? null, unzip ? null, pkgconfig ? null, gtk ? null, libart_lgpl ? null

     

       17
       17
        
       , libX11 ? null, libXt ? null, libSM ? null, libICE ? null, libXtst ? null

     
···

       273
       273
        
           ++ (optional javaAwtGtk pkgconfig);

     

       274
       274
        
       

     

       275
       275
        
         buildInputs = [ gmp mpfr mpc libelf ]

     

       276
       276
       -
           ++ (optional (ppl != null) ppl)

     

       277
       276
        
           ++ (optional (cloog != null) cloog)

     

       278
       277
        
           ++ (optional (isl != null) isl)

     

       279
       278
        
           ++ (optional (zlib != null) zlib)

     
···

       291
       290
        
         NIX_LDFLAGS = stdenv.lib.optionalString  stdenv.isSunOS "-lm -ldl";

     

       292
       291
        
       

     

       293
       292
        
         preConfigure = ''

     

       294
       294
       -
           configureFlagsArray=(

     

       295
       295
       -
             ${stdenv.lib.optionalString (ppl != null && ppl ? dontDisableStatic && ppl.dontDisableStatic)

     

       296
       296
       -
               "'--with-host-libstdcxx=-lstdc++ -lgcc_s'"}

     

       297
       297
       -
             ${stdenv.lib.optionalString (ppl != null && stdenv.isSunOS)

     

       298
       298
       -
               "\"--with-host-libstdcxx=-Wl,-rpath,\$prefix/lib/amd64 -lstdc++\"

     

       299
       299
       -
                \"--with-boot-ldflags=-L../prev-x86_64-pc-solaris2.11/libstdc++-v3/src/.libs\""}

     

       300
       300
       -
           );

     

       301
       293
        
           ${stdenv.lib.optionalString (stdenv.isSunOS && stdenv.is64bit)

     

       302
       294
        
             ''

     

       303
       295
        
               export NIX_LDFLAGS=`echo $NIX_LDFLAGS | sed -e s~$prefix/lib~$prefix/lib/amd64~g`

     
···

       319
       311
        
           ${if enableMultilib then "--disable-libquadmath" else "--disable-multilib"}

     

       320
       312
        
           ${if enableShared then "" else "--disable-shared"}

     

       321
       313
        
           ${if enablePlugin then "--enable-plugin" else "--disable-plugin"}

     

       322
       322
       -
           ${if ppl != null then "--with-ppl=${ppl} --disable-ppl-version-check" else ""}

     

       323
       314
        
           ${optionalString (isl != null) "--with-isl=${isl}"}

     

       324
       315
        
           ${optionalString (cloog != null) "--with-cloog=${cloog} --disable-cloog-version-check --enable-cloog-backend=isl"}

     

       325
       316
        
           ${if langJava then

     
···

       400
       391
        
           configureFlags = ''

     

       401
       392
        
             ${if enableMultilib then "" else "--disable-multilib"}

     

       402
       393
        
             ${if enableShared then "" else "--disable-shared"}

     

       403
       403
       -
             ${if ppl != null then "--with-ppl=${ppl.crossDrv}" else ""}

     

       404
       394
        
             ${if cloog != null then "--with-cloog=${cloog.crossDrv} --enable-cloog-backend=isl" else ""}

     

       405
       395
        
             ${if langJava then "--with-ecj-jar=${javaEcj.crossDrv}" else ""}

     

       406
       396
        
             ${if javaAwtGtk then "--enable-java-awt=gtk" else ""}

     
···

       507
       497
        
       

     

       508
       498
        
           maintainers = with stdenv.lib.maintainers; [ ludo viric shlevy simons ];

     

       509
       499
        
       

     

       510
       510
       -
           # Volunteers needed for the {Cyg,Dar}win ports of *PPL.

     

       511
       500
        
           # gnatboot is not available out of linux platforms, so we disable the darwin build

     

       512
       501
        
           # for the gnat (ada compiler).

     

       513
       502
        
           platforms =