lol

rPackages: fix broken packages

+77 -80
+51 -50
pkgs/development/r-modules/default.nix
··· 199 200 packagesWithRDepends = { 201 # sort -t '=' -k 2 202 }; 203 204 packagesWithNativeBuildInputs = { 205 # sort -t '=' -k 2 206 RAppArmor = [ pkgs.apparmor ]; 207 SOD = [ pkgs.cudatoolkit ]; # requres CL/cl.h 208 curl = [ pkgs.curl pkgs.openldap ]; 209 Rssa = [ pkgs.fftw ]; ··· 219 RCA = [ pkgs.gmp ]; 220 gmp = [ pkgs.gmp ]; 221 rcdd = [ pkgs.gmp ]; 222 igraph = [ pkgs.gmp ]; 223 glpkAPI = [ pkgs.gmp pkgs.glpk ]; 224 sdcTable = [ pkgs.gmp pkgs.glpk ]; 225 Rmpfr = [ pkgs.gmp pkgs.mpfr ]; 226 - BNSP = [ pkgs.gsl ]; 227 BayesSAE = [ pkgs.gsl ]; 228 BayesVarSel = [ pkgs.gsl ]; 229 HiCseg = [ pkgs.gsl ]; ··· 244 topicmodels = [ pkgs.gsl ]; 245 RcppGSL = [ pkgs.gsl ]; 246 bnpmr = [ pkgs.gsl ]; 247 geoCount = [ pkgs.gsl ]; 248 gsl = [ pkgs.gsl ]; 249 mvabund = [ pkgs.gsl ]; 250 diversitree = [ pkgs.gsl pkgs.fftw ]; 251 VBmix = [ pkgs.gsl pkgs.fftw pkgs.qt4 ]; 252 RGtk2 = [ pkgs.gtk2 ]; 253 cairoDevice = [ pkgs.gtk2 ]; ··· 260 jpeg = [ pkgs.libjpeg ]; 261 EMCluster = [ pkgs.liblapack ]; 262 png = [ pkgs.libpng ]; 263 rtiff = [ pkgs.libtiff ]; 264 tiff = [ pkgs.libtiff ]; 265 Cairo = [ pkgs.libtiff pkgs.libjpeg pkgs.cairo ]; ··· 294 BayesXsrc = [ pkgs.readline pkgs.ncurses ]; 295 udunits2 = [ pkgs.udunits pkgs.expat ]; 296 tkrplot = [ pkgs.xlibs.libX11 ]; 297 - rzmq = [ pkgs.zeromq2 ]; 298 PopGenome = [ pkgs.zlib ]; 299 RJaCGH = [ pkgs.zlib ]; 300 RcppCNPy = [ pkgs.zlib ]; ··· 302 rmatio = [ pkgs.zlib ]; 303 RVowpalWabbit = [ pkgs.zlib pkgs.boost ]; 304 seqminer = [ pkgs.zlib pkgs.bzip2 ]; 305 - rphast = [ pkgs.zlib pkgs.bzip2 pkgs.gzip pkgs.readline ]; 306 - rtfbs = [ pkgs.zlib pkgs.bzip2 pkgs.gzip pkgs.readline ]; 307 Rhpc = [ pkgs.zlib pkgs.bzip2 pkgs.icu pkgs.lzma pkgs.openmpi pkgs.pcre ]; 308 SAVE = [ pkgs.zlib pkgs.bzip2 pkgs.icu pkgs.lzma pkgs.pcre ]; 309 RcppOctave = [ pkgs.zlib pkgs.bzip2 pkgs.icu pkgs.lzma pkgs.pcre pkgs.octave ]; ··· 317 318 packagesWithBuildInputs = { 319 # sort -t '=' -k 2 320 qtpaint = [ pkgs.cmake ]; 321 qtbase = [ pkgs.cmake pkgs.perl ]; 322 gmatrix = [ pkgs.cudatoolkit ]; ··· 341 Cairo = [ pkgs.pkgconfig ]; 342 Rsymphony = [ pkgs.pkgconfig pkgs.doxygen pkgs.graphviz pkgs.subversion ]; 343 qtutils = [ pkgs.qt4 ]; 344 tcltk2 = [ pkgs.tcl pkgs.tk ]; 345 - tikzDevice = [ pkgs.texLive ]; 346 rPython = [ pkgs.which ]; 347 CARramps = [ pkgs.which pkgs.cudatoolkit ]; 348 gputools = [ pkgs.which pkgs.cudatoolkit ]; 349 rpud = [ pkgs.which pkgs.cudatoolkit ]; 350 adimpro = [ pkgs.which pkgs.xorg.xdpyinfo ]; ··· 374 "DeducerPlugInScaling" 375 "DeducerSpatial" 376 "DeducerSurvival" 377 "DeducerText" 378 "Demerelate" 379 "DescTools" ··· 623 "gmatrix" # requires CUDA runtime 624 "npRmpi" # tries to run MPI processes 625 "sprint" # tries to run MPI processes 626 ]; 627 628 # Packages which cannot be installed due to lack of dependencies or other reasons. ··· 631 "retistruct" # depends on broken RImageJROI 632 "CARrampsOcl" # depends on OpenCL 633 "rpanel" # I could not make Tcl to recognize BWidget. HELP WANTED! 634 - "alm" # jsonlite.so: undefined symbol: XXX 635 - "archivist" # jsonlite.so: undefined symbol: XXX 636 - "bold" # jsonlite.so: undefined symbol: XXX 637 - "enigma" # jsonlite.so: undefined symbol: XXX 638 - "exCon" # jsonlite.so: undefined symbol: XXX 639 - "gender" # jsonlite.so: undefined symbol: XXX 640 - "jSonarR" # jsonlite.so: undefined symbol: XXX 641 - "leafletR" # jsonlite.so: undefined symbol: XXX 642 - "opencpu" # jsonlite.so: undefined symbol: XXX 643 - "pdfetch" # jsonlite.so: undefined symbol: XXX 644 - "polidata" # jsonlite.so: undefined symbol: XXX 645 - "pollstR" # jsonlite.so: undefined symbol: XXX 646 - "rbison" # jsonlite.so: undefined symbol: XXX 647 - "RGA" # jsonlite.so: undefined symbol: XXX 648 - "rHealthDataGov" # jsonlite.so: undefined symbol: XXX 649 - "rinat" # jsonlite.so: undefined symbol: XXX 650 - "rjstat" # jsonlite.so: undefined symbol: XXX 651 - "rmongodb" # jsonlite.so: undefined symbol: XXX 652 - "rnoaa" # jsonlite.so: undefined symbol: XXX 653 - "RSiteCatalyst" # jsonlite.so: undefined symbol: XXX 654 - "rsunlight" # jsonlite.so: undefined symbol: XXX 655 - "rWBclimate" # jsonlite.so: undefined symbol: XXX 656 - "SGP" # jsonlite.so: undefined symbol: XXX 657 - "slackr" # jsonlite.so: undefined symbol: XXX 658 - "SocialMediaMineR" # jsonlite.so: undefined symbol: XXX 659 - "webutils" # jsonlite.so: undefined symbol: XXX 660 - "WikipediR" # jsonlite.so: undefined symbol: XXX 661 "demi" # requires affy, affxparser, and oligo 662 "KANT" # requires affy, and Biobase 663 "pathClass" # requires affy, and Biobase 664 "msarc" # requires AnnotationDbi 665 "ACNE" # requires aroma_affymetrix 666 "aroma_affymetrix" # requires aroma_core 667 "calmate" # requires aroma_core 668 "NSA" # requires aroma_core ··· 689 "RAPIDR" # requires Biostrings, Rsamtools, and GenomicRanges 690 "FunctionalNetworks" # requires breastCancerVDX, and Biobase 691 "rJPSGCS" # requires chopsticks 692 - "OpenCL" # requires CL/opencl.h 693 "clpAPI" # requires clp 694 "pcaL1" # requires clp 695 "bmrm" # requires clpAPI ··· 701 "ParDNAcopy" # requires DNAcopy 702 "PSCBS" # requires DNAcopy 703 "dcGOR" # requires dnet 704 - "bcool" # requires doMPI 705 "gitter" # requires EBImage 706 "Rcell" # requires EBImage 707 "RockFab" # requires EBImage 708 "babel" # requires edgeR ··· 712 "QuasiSeq" # requires edgeR 713 "SimSeq" # requires edgeR 714 "BcDiag" # requires fabia 715 "superbiclust" # requires fabia 716 "curvHDR" # requires flowCore 717 "RbioRXN" # requires fmcsR, and KEGGREST ··· 745 "gridDebug" # requires gridGraphviz 746 "RAM" # requires Heatplus 747 "RcppRedis" # requires Hiredis 748 - "HTSDiff" # requires HTSCluster 749 "interval" # requires Icens 750 "FAMT" # requires impute 751 "moduleColor" # requires impute 752 "PMA" # requires impute 753 "samr" # requires impute ··· 771 "plmDE" # requires limma 772 "SQDA" # requires limma 773 "PerfMeas" # requires limma, graph, and RBGL 774 "rLindo" # requires LINDO API 775 "magma" # requires MAGMA 776 "HiPLARM" # requires MAGMA or PLASMA ··· 779 "bigGP" # requires MPI running. HELP WANTED! 780 "doMPI" # requires MPI running. HELP WANTED! 781 "metaMix" # requires MPI running. HELP WANTED! 782 - "pbdMPI" # requires MPI running. HELP WANTED! 783 "pmclust" # requires MPI running. HELP WANTED! 784 "MSeasyTkGUI" # requires MSeasyTkGUI 785 "hddplot" # requires multtest ··· 899 "taxize" # requres bold 900 "cudaBayesreg" # requres Rmath 901 "rsprng" # requres sprng 902 "evobiR" # requres taxiz 903 "bdvis" # requres taxize 904 "RNeXML" # requres taxize ··· 909 "rainfreq" # SDMTools.so: undefined symbol: X 910 "MigClim" # SDMTools.So: Undefined Symbol: X 911 "PatternClass" # SDMTools.So: Undefined Symbol: X 912 - "qtbase" # the smokegen binary cannot find libQtCore.so.4 etc. at runtime 913 "jvmr" # tries to download files during its build 914 "h2o" # tries to download some h2o.jar during its build 915 ]; ··· 919 preConfigure = "export CURL_INCLUDES=${pkgs.curl}/include/curl"; 920 }); 921 922 RcppArmadillo = old.RcppArmadillo.overrideDerivation (attrs: { 923 patchPhase = "patchShebangs configure"; 924 }); ··· 983 }); 984 985 RMySQL = old.RMySQL.overrideDerivation (attrs: { 986 - configureFlags = [ 987 - "--with-mysql-dir=${pkgs.mysql}" 988 - ]; 989 }); 990 991 slfm = old.slfm.overrideDerivation (attrs: { ··· 1046 }); 1047 1048 openssl = old.openssl.overrideDerivation (attrs: { 1049 - patches = [ ./patches/openssl.patch ]; 1050 - OPENSSL_HOME = "${pkgs.openssl}"; 1051 }); 1052 1053 Rserve = old.Rserve.overrideDerivation (attrs: { ··· 1063 "--with-nlopt-libs='-L${pkgs.nlopt}/lib -lnlopt_cxx -lm'" 1064 ]; 1065 }); 1066 - 1067 - # Depends on broken ecespa package. 1068 - selectspm = old.selectspm.override { hydraPlatforms = stdenv.lib.platforms.none; }; 1069 - 1070 - # Depends on broken qtbase package. 1071 - qtutils = old.qtutils.override { hydraPlatforms = stdenv.lib.platforms.none; }; 1072 - qtpaint = old.qtpaint.override { hydraPlatforms = stdenv.lib.platforms.none; }; 1073 - bamboo = old.bamboo.override { hydraPlatforms = stdenv.lib.platforms.none; }; 1074 1075 }; 1076 in
··· 199 200 packagesWithRDepends = { 201 # sort -t '=' -k 2 202 + FactoMineR = [ self.car ]; 203 }; 204 205 packagesWithNativeBuildInputs = { 206 # sort -t '=' -k 2 207 + graphscan = [ pkgs.gsl ]; 208 RAppArmor = [ pkgs.apparmor ]; 209 + BNSP = [ pkgs.gsl ]; 210 SOD = [ pkgs.cudatoolkit ]; # requres CL/cl.h 211 curl = [ pkgs.curl pkgs.openldap ]; 212 Rssa = [ pkgs.fftw ]; ··· 222 RCA = [ pkgs.gmp ]; 223 gmp = [ pkgs.gmp ]; 224 rcdd = [ pkgs.gmp ]; 225 + Rlibeemd = [ pkgs.gsl ]; 226 igraph = [ pkgs.gmp ]; 227 glpkAPI = [ pkgs.gmp pkgs.glpk ]; 228 sdcTable = [ pkgs.gmp pkgs.glpk ]; 229 Rmpfr = [ pkgs.gmp pkgs.mpfr ]; 230 + Formula = [ pkgs.gmp ]; 231 BayesSAE = [ pkgs.gsl ]; 232 BayesVarSel = [ pkgs.gsl ]; 233 HiCseg = [ pkgs.gsl ]; ··· 248 topicmodels = [ pkgs.gsl ]; 249 RcppGSL = [ pkgs.gsl ]; 250 bnpmr = [ pkgs.gsl ]; 251 + V8 = [ pkgs.v8 ]; 252 geoCount = [ pkgs.gsl ]; 253 + devEMF = [ pkgs.xlibs.libXft ]; 254 gsl = [ pkgs.gsl ]; 255 mvabund = [ pkgs.gsl ]; 256 diversitree = [ pkgs.gsl pkgs.fftw ]; 257 + TKF = [ pkgs.gsl ]; 258 VBmix = [ pkgs.gsl pkgs.fftw pkgs.qt4 ]; 259 RGtk2 = [ pkgs.gtk2 ]; 260 cairoDevice = [ pkgs.gtk2 ]; ··· 267 jpeg = [ pkgs.libjpeg ]; 268 EMCluster = [ pkgs.liblapack ]; 269 png = [ pkgs.libpng ]; 270 + pbdMPI = [ pkgs.openmpi ]; 271 + bigGP = [ pkgs.openmpi ]; 272 rtiff = [ pkgs.libtiff ]; 273 tiff = [ pkgs.libtiff ]; 274 Cairo = [ pkgs.libtiff pkgs.libjpeg pkgs.cairo ]; ··· 303 BayesXsrc = [ pkgs.readline pkgs.ncurses ]; 304 udunits2 = [ pkgs.udunits pkgs.expat ]; 305 tkrplot = [ pkgs.xlibs.libX11 ]; 306 + rzmq = [ pkgs.zeromq3 ]; 307 PopGenome = [ pkgs.zlib ]; 308 RJaCGH = [ pkgs.zlib ]; 309 RcppCNPy = [ pkgs.zlib ]; ··· 311 rmatio = [ pkgs.zlib ]; 312 RVowpalWabbit = [ pkgs.zlib pkgs.boost ]; 313 seqminer = [ pkgs.zlib pkgs.bzip2 ]; 314 + seqinr = [ pkgs.zlib ]; 315 + rphast = [ pkgs.pcre pkgs.zlib pkgs.bzip2 pkgs.gzip pkgs.readline ]; 316 + rtfbs = [ pkgs.zlib pkgs.pcre pkgs.bzip2 pkgs.gzip pkgs.readline ]; 317 Rhpc = [ pkgs.zlib pkgs.bzip2 pkgs.icu pkgs.lzma pkgs.openmpi pkgs.pcre ]; 318 SAVE = [ pkgs.zlib pkgs.bzip2 pkgs.icu pkgs.lzma pkgs.pcre ]; 319 RcppOctave = [ pkgs.zlib pkgs.bzip2 pkgs.icu pkgs.lzma pkgs.pcre pkgs.octave ]; ··· 327 328 packagesWithBuildInputs = { 329 # sort -t '=' -k 2 330 + svKomodo = [ pkgs.which ]; 331 + nat = [ pkgs.which ]; 332 + nat_nblast = [ pkgs.which ]; 333 + nat_templatebrains = [ pkgs.which ]; 334 + RMark = [ pkgs.which ]; 335 + RPushbullet = [ pkgs.which ]; 336 qtpaint = [ pkgs.cmake ]; 337 qtbase = [ pkgs.cmake pkgs.perl ]; 338 gmatrix = [ pkgs.cudatoolkit ]; ··· 357 Cairo = [ pkgs.pkgconfig ]; 358 Rsymphony = [ pkgs.pkgconfig pkgs.doxygen pkgs.graphviz pkgs.subversion ]; 359 qtutils = [ pkgs.qt4 ]; 360 + ecoretriever = [ pkgs.which ]; 361 tcltk2 = [ pkgs.tcl pkgs.tk ]; 362 + tikzDevice = [ pkgs.which pkgs.texLive ]; 363 rPython = [ pkgs.which ]; 364 CARramps = [ pkgs.which pkgs.cudatoolkit ]; 365 + gridGraphics = [ pkgs.which ]; 366 gputools = [ pkgs.which pkgs.cudatoolkit ]; 367 rpud = [ pkgs.which pkgs.cudatoolkit ]; 368 adimpro = [ pkgs.which pkgs.xorg.xdpyinfo ]; ··· 392 "DeducerPlugInScaling" 393 "DeducerSpatial" 394 "DeducerSurvival" 395 + "HomoPolymer" 396 + "MetSizeR" 397 "DeducerText" 398 "Demerelate" 399 "DescTools" ··· 643 "gmatrix" # requires CUDA runtime 644 "npRmpi" # tries to run MPI processes 645 "sprint" # tries to run MPI processes 646 + "pbdMPI" # tries to run MPI processes 647 ]; 648 649 # Packages which cannot be installed due to lack of dependencies or other reasons. ··· 652 "retistruct" # depends on broken RImageJROI 653 "CARrampsOcl" # depends on OpenCL 654 "rpanel" # I could not make Tcl to recognize BWidget. HELP WANTED! 655 "demi" # requires affy, affxparser, and oligo 656 "KANT" # requires affy, and Biobase 657 "pathClass" # requires affy, and Biobase 658 "msarc" # requires AnnotationDbi 659 "ACNE" # requires aroma_affymetrix 660 + "Statomica" # requires Biobase, multtest 661 "aroma_affymetrix" # requires aroma_core 662 "calmate" # requires aroma_core 663 "NSA" # requires aroma_core ··· 684 "RAPIDR" # requires Biostrings, Rsamtools, and GenomicRanges 685 "FunctionalNetworks" # requires breastCancerVDX, and Biobase 686 "rJPSGCS" # requires chopsticks 687 + "OpenCL" # FIXME: requires CL/opencl.h 688 + "Rsymphony" # FIXME: requires SYMPHONY 689 + "V8" # compilation error 690 + "js" # requires broken V8 691 + "minimist" # requires broken V8 692 "clpAPI" # requires clp 693 "pcaL1" # requires clp 694 "bmrm" # requires clpAPI ··· 700 "ParDNAcopy" # requires DNAcopy 701 "PSCBS" # requires DNAcopy 702 "dcGOR" # requires dnet 703 "gitter" # requires EBImage 704 + "speaq" # requires MassSpecWavelet 705 "Rcell" # requires EBImage 706 "RockFab" # requires EBImage 707 "babel" # requires edgeR ··· 711 "QuasiSeq" # requires edgeR 712 "SimSeq" # requires edgeR 713 "BcDiag" # requires fabia 714 + "BACA" # requires RDAVIDWebService 715 "superbiclust" # requires fabia 716 "curvHDR" # requires flowCore 717 "RbioRXN" # requires fmcsR, and KEGGREST ··· 745 "gridDebug" # requires gridGraphviz 746 "RAM" # requires Heatplus 747 "RcppRedis" # requires Hiredis 748 "interval" # requires Icens 749 "FAMT" # requires impute 750 + "fdrDiscreteNull" # requires edgeR 751 "moduleColor" # requires impute 752 "PMA" # requires impute 753 "samr" # requires impute ··· 771 "plmDE" # requires limma 772 "SQDA" # requires limma 773 "PerfMeas" # requires limma, graph, and RBGL 774 + "ppiPre" # requires AnnotationDbi, GOSemSim, GO.db 775 "rLindo" # requires LINDO API 776 "magma" # requires MAGMA 777 "HiPLARM" # requires MAGMA or PLASMA ··· 780 "bigGP" # requires MPI running. HELP WANTED! 781 "doMPI" # requires MPI running. HELP WANTED! 782 "metaMix" # requires MPI running. HELP WANTED! 783 "pmclust" # requires MPI running. HELP WANTED! 784 "MSeasyTkGUI" # requires MSeasyTkGUI 785 "hddplot" # requires multtest ··· 899 "taxize" # requres bold 900 "cudaBayesreg" # requres Rmath 901 "rsprng" # requres sprng 902 + "rDEA" # no such file or directory 903 + "jomo" # linking errors 904 + "mixture" # mixture.so: undefined symbol: dtrmm_ 905 "evobiR" # requres taxiz 906 "bdvis" # requres taxize 907 "RNeXML" # requres taxize ··· 912 "rainfreq" # SDMTools.so: undefined symbol: X 913 "MigClim" # SDMTools.So: Undefined Symbol: X 914 "PatternClass" # SDMTools.So: Undefined Symbol: X 915 "jvmr" # tries to download files during its build 916 "h2o" # tries to download some h2o.jar during its build 917 ]; ··· 921 preConfigure = "export CURL_INCLUDES=${pkgs.curl}/include/curl"; 922 }); 923 924 + iFes = old.iFes.overrideDerivation (attrs: { 925 + patches = [ ./patches/iFes.patch ]; 926 + CUDA_HOME = "${pkgs.cudatoolkit}"; 927 + }); 928 + 929 RcppArmadillo = old.RcppArmadillo.overrideDerivation (attrs: { 930 patchPhase = "patchShebangs configure"; 931 }); ··· 990 }); 991 992 RMySQL = old.RMySQL.overrideDerivation (attrs: { 993 + patches = [ ./patches/RMySQL.patch ]; 994 + MYSQL_DIR="${pkgs.mysql}"; 995 + }); 996 + 997 + devEMF = old.devEMF.overrideDerivation (attrs: { 998 + NIX_CFLAGS_LINK = "-L${pkgs.xlibs.libXft}/lib -lXft"; 999 }); 1000 1001 slfm = old.slfm.overrideDerivation (attrs: { ··· 1056 }); 1057 1058 openssl = old.openssl.overrideDerivation (attrs: { 1059 + OPENSSL_INCLUDES = "${pkgs.openssl}/include"; 1060 }); 1061 1062 Rserve = old.Rserve.overrideDerivation (attrs: { ··· 1072 "--with-nlopt-libs='-L${pkgs.nlopt}/lib -lnlopt_cxx -lm'" 1073 ]; 1074 }); 1075 1076 }; 1077 in
+13
pkgs/development/r-modules/patches/RMySQL.patch
···
··· 1 + diff -ru3 RMySQL_orig/configure RMySQL/configure 2 + --- RMySQL_orig/configure 2015-02-19 22:49:15.812455730 +0300 3 + +++ RMySQL/configure 2015-02-19 22:49:42.066407256 +0300 4 + @@ -1,7 +1,7 @@ 5 + # If $MYSQL_DIR is specified, use that 6 + if [ "$MYSQL_DIR" ]; then 7 + - echo "PKG_CPPFLAGS= -I$MYSQL_DIR/include" > src/Makevars 8 + - echo "PKG_LIBS= -L$MYSQL_DIR/lib -lmysqlclient -lz" >> src/Makevars 9 + + echo "PKG_CPPFLAGS= -I$MYSQL_DIR/include/mysql" > src/Makevars 10 + + echo "PKG_LIBS= -L$MYSQL_DIR/lib/mysql -lmysqlclient -lz" >> src/Makevars 11 + exit 0 12 + fi 13 +
+13
pkgs/development/r-modules/patches/iFes.patch
···
··· 1 + diff -u3 -r iFes_orig/src/config.mk iFes/src/config.mk 2 + --- iFes_orig/src/config.mk 2014-12-09 14:19:58.000000000 +0300 3 + +++ iFes/src/config.mk 2015-02-19 22:47:24.426804174 +0300 4 + @@ -12,7 +12,7 @@ 5 + endif 6 + 7 + # set CUDA_INC to CUDA header dir on your system 8 + -CUDA_INC := $(CUDA_HOME)/include 9 + +CUDA_INC := $(CUDA_HOME)/usr_include 10 + 11 + ARCH := $(shell uname -m) 12 + 13 +
-30
pkgs/development/r-modules/patches/openssl.patch
··· 1 - diff -ru -x '*~' openssl_orig/configure openssl/configure 2 - --- openssl_orig/configure 2014-11-08 02:32:33.000000000 +0900 3 - +++ openssl/configure 2014-11-29 20:57:19.919495325 +0900 4 - @@ -4,14 +4,15 @@ 5 - # if present, hence this script is not really required. On CRAN, we use 6 - # the $OPENSSL_INCLUDES variable; elsewhere we assume to the standard 7 - # linux location: /usr/include/openssl. 8 - -if [ -z "$OPENSSL_INCLUDES" ]; then 9 - - OPENSSL_INCLUDES="/usr/include" 10 - -else 11 - - echo "PKG_CPPFLAGS= -I$OPENSSL_INCLUDES" >> src/Makevars 12 - -fi 13 - +# if [ -z "$OPENSSL_INCLUDES" ]; then 14 - +# OPENSSL_INCLUDES="/usr/include" 15 - +# else 16 - +# echo "PKG_CPPFLAGS= -I$OPENSSL_INCLUDES" >> src/Makevars 17 - +# fi 18 - 19 - -# Verify that openssl RNG is present 20 - -if [ ! -e $OPENSSL_INCLUDES/openssl/rand.h ]; then 21 - - echo "File $OPENSSL_INCLUDES/rand.h not found. Make sure libssl-dev (deb) or openssl-devel (rpm) is installed." 22 - - exit 1 23 - -fi 24 - +# # Verify that openssl RNG is present 25 - +# if [ ! -e $OPENSSL_INCLUDES/openssl/rand.h ]; then 26 - +# echo "File $OPENSSL_INCLUDES/rand.h not found. Make sure libssl-dev (deb) or openssl-devel (rpm) is installed." 27 - +# exit 1 28 - +# fi 29 - +echo "PKG_LIBS= -L"${OPENSSL_HOME}/lib" -lssl -lcrypto" > src/Makevars 30 - \ No newline at end of file
···