Changeset f080ae0e for general


Ignore:
Timestamp:
05/14/2016 08:19:09 PM (8 years ago)
Author:
Douglas R. Reno <renodr@…>
Branches:
systemd-13485
Children:
1ef4048
Parents:
2e633b6
Message:

Merge to trunk r17352

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/branches/systemd@17354 af4574ff-66df-0310-9fd7-8a98e5e911e0

Location:
general
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • general/genlib/libinput.xml

    r2e633b6 rf080ae0e  
    55  %general-entities;
    66
    7   <!ENTITY libinput-version "1.2.4">
     7  <!ENTITY libinput-version "1.3.0">
    88
    99  <!ENTITY libinput-download-http "http://www.freedesktop.org/software/libinput/libinput-&libinput-version;.tar.xz">
    1010  <!ENTITY libinput-download-ftp  " ">
    11   <!ENTITY libinput-md5sum        "1cbaa34f04a336f2703906d564e0a37a">
    12   <!ENTITY libinput-size          "840 KB">
    13   <!ENTITY libinput-buildsize     "31 MB (with documentation)">
    14   <!ENTITY libinput-time          "0.3 SBU (with documentation)">
     11  <!ENTITY libinput-md5sum        "5f8bc2c746bfbc9454143f78e5b477a9">
     12  <!ENTITY libinput-size          "860 KB">
     13  <!ENTITY libinput-buildsize     "32 MB">
     14  <!ENTITY libinput-time          "0.3 SBU">
    1515]>
    1616
  • general/genlib/libksba.xml

    r2e633b6 rf080ae0e  
    77  <!ENTITY libksba-download-http " ">
    88  <!ENTITY libksba-download-ftp  "ftp://ftp.gnupg.org/gcrypt/libksba/libksba-&libksba-version;.tar.bz2">
    9   <!ENTITY libksba-md5sum        "a5dd3c57fca254935f5cf8db26e39065">
     9  <!ENTITY libksba-md5sum        "2bfc3d69053db7b6983b5627706033f4">
    1010  <!ENTITY libksba-size          "608 KB">
    11   <!ENTITY libksba-buildsize     "6.5 MB">
     11  <!ENTITY libksba-buildsize     "9.1 MB">
    1212  <!ENTITY libksba-time          "0.1 SBU">
    1313]>
  • general/genlib/talloc.xml

    r2e633b6 rf080ae0e  
    77  <!ENTITY talloc-download-http "https://www.samba.org/ftp/talloc/talloc-&talloc-version;.tar.gz">
    88  <!ENTITY talloc-download-ftp  " ">
    9   <!ENTITY talloc-md5sum        "707010c6ede5821fd34397f5d9ec6ab8">
     9  <!ENTITY talloc-md5sum        "d6763d65d03d627816ae1d50c74576fe">
    1010  <!ENTITY talloc-size          "428 KB">
    11   <!ENTITY talloc-buildsize     "7.1 MB (additional 0.2 MB for tests)">
    12   <!ENTITY talloc-time          "0.2 SBU (additional 0.2 SBU for tests)">
     11  <!ENTITY talloc-buildsize     "6.9 MB (add 0.2 MB for tests)">
     12  <!ENTITY talloc-time          "0.2 SBU (add 0.2 SBU for tests)">
    1313]>
    1414
     
    100100    <para>
    101101      To check the results, issue <command>make check</command>.
     102      The python tests fail due to missing files.
    102103    </para>
    103104
  • general/genutils/imagemagick.xml

    r2e633b6 rf080ae0e  
    55  %general-entities;
    66
    7   <!ENTITY imagemagick-patch-version "5">
     7  <!ENTITY imagemagick-patch-version "1">
    88
    99  <!ENTITY imagemagick-download-http "https://www.imagemagick.org/pub/download/releases/ImageMagick-&imagemagick-version;-&imagemagick-patch-version;.tar.xz">
    1010  <!ENTITY imagemagick-download-ftp "ftp://ftp.imagemagick.org/pub/ImageMagick/releases/ImageMagick-&imagemagick-version;-&imagemagick-patch-version;.tar.xz">
    11   <!ENTITY imagemagick-md5sum        "af1c85b8b8f817e919f9ca4408d86782">
    12   <!ENTITY imagemagick-size          "8.4 MB">
    13   <!ENTITY imagemagick-buildsize     "193 MB, with typical dependencies (222 MB with the test suite, reputedly 450 MB with all dependencies)">
    14   <!ENTITY imagemagick-time          "2.0 SBU - typical build (additional 1.6 SBU to run the test suite and 1.4 SBU to run the validation suite)">
     11  <!ENTITY imagemagick-md5sum        "24673d00fcc8aa00313eeca6aa20fd3c">
     12  <!ENTITY imagemagick-size          "7.9 MB">
     13  <!ENTITY imagemagick-buildsize     "200 MB, with typical dependencies (add 31 MB for the test suite)">
     14  <!ENTITY imagemagick-time          "2.9 SBU - typical build (add 1.8 SBU for the test suite and 1.5 SBU for the validation suite)">
    1515]>
    1616
     
    2222
    2323     Marked as 'typical' because nobody builds ALL the optional extras [ken]
     24
     25     [bdubbs] I do; at least the interal ones. I still only got 200 MB.
     26
    2427     Saved the "full" 450MB as a comment - feel free to update this iff you
    2528     do build all dependencies, it's probably a lot bigger now.
     29
     30     [bdubbs] - Just removed it. I don't think it adds anything.
    2631
    2732     Also, please look over the output from the configure command for any
     
    158163      <ulink url="ftp://ftp.imagemagick.org/pub/ImageMagick/delegates/">
    159164      FlashPIX (libfpx)</ulink>,
     165      <ulink url="https://github.com/FLIF-hub/FLIF/releases">FLIF</ulink>,
    160166      <ulink url="http://www.cl.cam.ac.uk/~mgk25/jbigkit/">JBIG-KIT</ulink>,
    161167      <ulink url="&gnome-download-http;/libgxps/">libgxps</ulink>,
     
    211217    </para>
    212218
    213 <screen><userinput>./configure --prefix=/usr     \
     219<screen><userinput>sed -i '/seems to be moved/ s/^/true #/' config/ltmain.sh &amp;&amp;
     220
     221./configure --prefix=/usr     \
    214222            --sysconfdir=/etc \
    215223            --enable-hdri     \
     
    246254
    247255    <para>
     256      <command>sed ...</command>: Removes a lot of invalid warnings.
     257    </para>
     258
     259    <para>
    248260      <parameter>--enable-hdri</parameter>: Enables building of a
    249261      high dynamic range version of ImageMagick.
     
    321333      <seglistitem>
    322334        <seg>
    323           animate, compare, composite, conjure, convert, display,
    324           identify, import, Magick-config, Magick++-config, MagickCore-config,
    325           MagickWand-config, mogrify, montage, stream, and Wand-config
     335          magick, Magick++-config, MagickCore-config, and MagickWand-config.
     336          (animate, compare, composite, conjure, convert, display,
     337          identify, import, magick-script, mogrify, montage, and stream
     338          are all symbolic links to magick)
    326339        </seg>
    327340        <seg>
    328           libMagickCore-6.Q16HDRI.so,
    329           libMagickWand-6.Q16HDRI.so and
    330           libMagick++-6.Q16HDRI.so
     341          libMagickCore-7.Q16HDRI.so,
     342          libMagickWand-7.Q16HDRI.so and
     343          libMagick++-7.Q16HDRI.so
    331344        </seg>
    332345        <seg>
    333           /etc/ImageMagick-6,
    334           /usr/include/ImageMagick-6,
     346          /etc/ImageMagick-7,
     347          /usr/include/ImageMagick-7,
    335348          /usr/lib/ImageMagick-&imagemagick-version;,
    336           /usr/lib/perl5/site_perl/&lfs-perl-version;/{,auto}/Image/Magick,
     349          /usr/lib/perl5/site_perl/&lfs-perl-version;/$(uname -m)-linux/{,auto}/Image/Magick,
    337350          /usr/share/doc/ImageMagick-&imagemagick-version;, and
    338           /usr/share/ImageMagick-6
     351          /usr/share/ImageMagick-7
    339352        </seg>
    340353      </seglistitem>
     
    427440
    428441    <varlistentry id="magick-config">
    429       <term><command>Magick{,++,Core,Wand}-config</command></term>
     442      <term><command>Magick{++,Core,Wand}-config</command></term>
    430443      <listitem>
    431444        <para>show information about the installed versions of the
     
    464477        <indexterm zone="imagemagick stream">
    465478          <primary sortas="b-stream">stream</primary>
    466         </indexterm>
    467       </listitem>
    468     </varlistentry>
    469 
    470     <varlistentry id="wand-config">
    471       <term><command>Wand-config</command></term>
    472       <listitem>
    473         <para>shows the options required to use the Wand library.</para>
    474         <indexterm zone="imagemagick wand-config">
    475           <primary sortas="b-Wand-config">Wand-config</primary>
    476479        </indexterm>
    477480      </listitem>
  • general/prog/java.xml

    r2e633b6 rf080ae0e  
    77  <!ENTITY anduin-download             "&sources-anduin-http;/OpenJDK/OpenJDK-&openjdk-version;">
    88  <!ENTITY openjdk-download-binary-x86 "&anduin-download;/OpenJDK-&openjdk-version;-i686-bin.tar.xz">
    9   <!ENTITY openjdk-bin-md5sum-x86      "41f3f4f87573e92ca4ab0350f0ff0d2f">
     9  <!ENTITY openjdk-bin-md5sum-x86      "ce3fc99377496a27d56ba0728bc7c776">
    1010  <!ENTITY openjdk-bin-size-x86        "57 MB">
    1111  <!ENTITY openjdk-bin-buildsize-x86   "166 MB">
    1212
    1313  <!ENTITY openjdk-download-binary-x64 "&anduin-download;/OpenJDK-&openjdk-version;-x86_64-bin.tar.xz">
    14   <!ENTITY openjdk-bin-md5sum-x64      "5a9b1b6d2e105eef2fbb1a965b17b3e9">
     14  <!ENTITY openjdk-bin-md5sum-x64      "6f81546ce8284d692e77ba95b0c88068">
    1515  <!ENTITY openjdk-bin-size-x64        "58 MB">
    1616  <!ENTITY openjdk-bin-buildsize-x64   "169 MB">
  • general/prog/openjdk.xml

    r2e633b6 rf080ae0e  
    55  %general-entities;
    66
    7   <!ENTITY ojdk-upd                  "77">
    8   <!ENTITY ojdk-bd                   "b03">
     7  <!ENTITY ojdk-upd                  "92">
     8  <!ENTITY ojdk-bd                   "b14">
    99  <!ENTITY ojdk-tarball              "jdk8u&ojdk-upd;-&ojdk-bd;.tar.bz2">
    1010  <!ENTITY ojdk-repo                 "http://hg.openjdk.java.net/jdk8u/jdk8u">
     
    1313  <!ENTITY anduin-download           "&sources-anduin-http;/OpenJDK/OpenJDK-&openjdk-version;">
    1414
    15   <!ENTITY ojdk-md5sum               "1954ffeb123a7f4552472ba9f9e38b0d">
    16   <!ENTITY ojdk-size                 "398 KB">
    17 
    18   <!ENTITY corba-md5sum              "eb7695323d3340214792114ad8e3bdce">
    19   <!ENTITY hotspot-md5sum            "434e3dd4272d39b255ba9269838647b9">
    20   <!ENTITY jaxp-md5sum               "fcc49430937eba2c64f8a53475edf99d">
    21   <!ENTITY jaxws-md5sum              "f05a009f2e0fdb710c3405723ed42199">
    22   <!ENTITY jdk-md5sum                "ffe70c01fc0fe513e329f170f4c922c1">
    23   <!ENTITY langtools-md5sum          "a7e0ff3378d02e075284db7fe4a8dfbf">
    24   <!ENTITY nashorn-md5sum            "1dee0e478002e80f87b235ae982edf6e">
     15  <!ENTITY ojdk-md5sum               "226f9051e34b70fbff031ec9d959773d">
     16  <!ENTITY ojdk-size                 "399 KB">
     17
     18  <!ENTITY corba-md5sum              "9619e84a600aaf81737f7ed71430d3aa">
     19  <!ENTITY hotspot-md5sum            "21e8fdc20ab17e7399752ef74c8e03e2">
     20  <!ENTITY jaxp-md5sum               "567189edafbe0aabaff2d75d86c05456">
     21  <!ENTITY jaxws-md5sum              "3e7db7d843ebbcd5eb2ba0a9e7e275d7">
     22  <!ENTITY jdk-md5sum                "b06f2e3504357820bb3dd29e19ccfc0d">
     23  <!ENTITY langtools-md5sum          "afbe0e3a8c0e9e2beac5567e1084f3ee">
     24  <!ENTITY nashorn-md5sum            "e3641526c2875b5d4d1414980769f6ea">
    2525  <!ENTITY total-download-size       "63 MB">
    2626
     
    3232  <!ENTITY icedtea-web-download      "http://icedtea.classpath.org/download/source/icedtea-web-&icedtea-web-version;.tar.gz">
    3333
    34   <!ENTITY ojdk-buildsize           "3.7 GB (additional 547 MB for tests)">
    35   <!ENTITY ojdk-time                "11 SBU (additional 108 SBU for tests)">
     34  <!ENTITY ojdk-buildsize           "3.7 GB (additional 546 MB for tests)">
     35  <!ENTITY ojdk-time                "12 SBU (additional 130 SBU for tests)">
    3636]>
    3737
     
    274274   --with-zlib=system         \
    275275   --with-giflib=system       &amp;&amp;
    276 make DEBUG_BINARIES=true all  &amp;&amp;
     276   --with-extra-cflags="-std=c++98 -Wno-error -fno-delete-null-pointer-checks -fno-lifetime-dse" \
     277   --with-extra-cxxflags="-std=c++98 -fno-delete-null-pointer-checks -fno-lifetime-dse" &amp;&amp;
     278make DEBUG_BINARIES=true SCTP_WERROR= all  &amp;&amp;
    277279find build/*/images/j2sdk-image -iname \*.diz -delete
    278280</userinput></screen>
     
    484486
    485487    <para>
     488      <parameter>--with-extra-cflags=... --with-extra-cxxflags=...</parameter>:
     489      Works around some defects in the code brought to light by the GCC 6
     490      compiler's more rigorous checking of the C/C++ constructs. Remove these
     491      switches if compiling with GCC 5.
     492    </para>
     493
     494    <para>
    486495      <option>--with-jobs=N</option>: Allows setting the number
    487496      of jobs for <command>make</command> equal to N. The default is the
     
    501510
    502511    <para>
    503       <command>make DEBUG_BINARIES=true all</command>: The build fails on
    504       32 bit machines if DEBUG_BINARIES is not set to true.
     512      <command>make DEBUG_BINARIES=true SCTP_WERROR=  all</command>: The build
     513      fails on 32 bit machines if DEBUG_BINARIES is not set to true. Unsetting
     514      SCTP_WERROR is part of the workarounds needed to use GCC 6. You may omit
     515      that part of the command if you are using GCC 5.
    505516    </para>
    506517
  • general/prog/perl-modules.xml

    r2e633b6 rf080ae0e  
    6262
    6363  <!ENTITY List-AllUtils-download-http "http://www.cpan.org/authors/id/D/DR/DROLSKY/List-AllUtils-&List-AllUtils-version;.tar.gz">
    64   <!ENTITY List-AllUtils-md5sum "3e2dfeeef80c4e1952443c6b7d48583c">
     64  <!ENTITY List-AllUtils-md5sum "a17e4239bd9bdfa272a104954678336a">
    6565
    6666  <!ENTITY List-MoreUtils-download-http "http://www.cpan.org/authors/id/R/RE/REHSACK/List-MoreUtils-&List-MoreUtils-version;.tar.gz">
  • general/sysutils/mc.xml

    r2e633b6 rf080ae0e  
    77  <!ENTITY mc-download-http "http://ftp.midnight-commander.org/mc-&mc-version;.tar.xz">
    88  <!ENTITY mc-download-ftp  "ftp://ftp.osuosl.org/pub/midnightcommander/mc-&mc-version;.tar.xz">
    9   <!ENTITY mc-md5sum        "5df626a64592ccc5891afd3923edcdbf">
     9  <!ENTITY mc-md5sum        "0b3965f3267a76d895ce8ab90df2402b">
    1010  <!ENTITY mc-size          "2.3 MB">
    11   <!ENTITY mc-buildsize     "169 MB (with tests)">
     11  <!ENTITY mc-buildsize     "198 MB (with tests)">
    1212  <!ENTITY mc-time          "1.1 SBU (with tests)">
    1313]>
Note: See TracChangeset for help on using the changeset viewer.