linux-from-scratch/glfs
1
0
Fork 0
mirror of https://github.com/Zeckmathederg/glfs.git synced 2025-02-03 23:07:23 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add instructions to graphviz and cmake that avoid installing files in /usr/lib64.

Browse Source 
Update to poppler-0.50.0
Update to libqmi-1.16.2



git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@18084 af4574ff-66df-0310-9fd7-8a98e5e911e0
This commit is contained in:
Bruce Dubbs 2016-12-19 21:36:08 +00:00
parent c6ea0bdb02
commit 87ff6f301c
8 changed files with 48 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
general/genlib/libqmi.xml
View File

@ -6,9 +6,9 @@
<!ENTITY libqmi-download-http "http://www.freedesktop.org/software/libqmi/libqmi-&libqmi-version;.tar.xz">
<!ENTITY libqmi-download-ftp " ">
<!ENTITY libqmi-md5sum "4970c110f160b33637a3515004c637b2">
<!ENTITY libqmi-md5sum "052318439128e428b1a41e75a605d91f">
<!ENTITY libqmi-size "720 KB">
<!ENTITY libqmi-buildsize "73 MB (with tests)">
<!ENTITY libqmi-buildsize "48 MB (with tests)">
<!ENTITY libqmi-time "0.4 SBU (with tests)">
]>

8
general/genutils/graphviz.xml
View File

@ -145,6 +145,9 @@
</para>
<screen><userinput>patch -Np1 -i ../graphviz-&graphviz-version;-consolidated_fixes-1.patch &amp;&amp;
sed -i '/LIBPOSTFIX="64"/s/64//' configure.ac &amp;&amp;
autoreconf &amp;&amp;
./configure --prefix=/usr --disable-php &amp;&amp;
make</userinput></screen>
@ -176,6 +179,11 @@ make</userinput></screen>
<sect2 role="commands">
<title>Command Explanations</title>
<para>
<command>sed ... configure.ac</command>: This command is needed to
avoid installing files in /usr/lib64.
</para>
<para>
<parameter>--disable-php</parameter>: This version of graphviz
does not support php version 7.

13
general/graphlib/poppler.xml
View File

@ -6,7 +6,7 @@
<!ENTITY poppler-download-http "http://poppler.freedesktop.org/poppler-&poppler-version;.tar.xz">
<!ENTITY poppler-download-ftp " ">
<!ENTITY poppler-md5sum "9e057ed8eee1f9979fa75d8f044783b8">
<!ENTITY poppler-md5sum "1a4c0cd873bddd8f266b85ab8d799962">
<!ENTITY poppler-size "1.6 MB">
<!ENTITY poppler-buildsize "49 MB (with Qt5 library)">
<!ENTITY poppler-time "1.3 SBU (with Qt5 library)">
@ -169,7 +169,11 @@
commands:
</para>
<screen><userinput>./configure --prefix=/usr \
<!-- Note: the sed is needed even if the /usr/lib64 symlink is not present -->
<screen><userinput>sed -i "/was moved/s/^/#/" ltmain.sh &amp;&amp;
./configure --prefix=/usr \
--sysconfdir=/etc \
--disable-static \
--enable-build-type=release \
@ -225,6 +229,11 @@ cd poppler-data-&poppler-data-version;</userinput></screen>
<sect2 role="commands">
<title>Command Explanations</title>
<para>
<command>sed ... ltmain.sh</command>: This command removes a lot
of irritating invalid warnings.
</para>
<para>
<parameter>--enable-build-type=release</parameter>: This switch is used
to apply a higher level of compiler optimizations. Other options are:

9
general/prog/cmake.xml
View File

@ -111,7 +111,8 @@
commands:
</para>
<screen><userinput>sed -i '/CMAKE_USE_LIBUV 1/s/1/0/' CMakeLists.txt &amp;&amp;
<screen><userinput>sed -i '/CMAKE_USE_LIBUV 1/s/1/0/' CMakeLists.txt &amp;&amp;
sed -i '/"lib64"/s/64//' Modules/GNUInstallDirs.cmake &amp;&amp;
./bootstrap --prefix=/usr \
--system-libs \
@ -154,6 +155,12 @@ make</userinput></screen>
disables the attempt to use the external libuv library.
</para>
<para>
<command>sed ... Modules/GNUInstallDirs.cmake</command>:
This command disables applications using cmake from attempting to
install files in /usr/lib64/.
</para>
<para>
<parameter>--system-libs</parameter>: This switch forces the build system
to link against <application>Zlib</application>,

4
general/prog/perl-modules.xml
View File

@ -1258,13 +1258,13 @@ XSLoader is a core perl module, but the version in perl-5.24.0 is not new enough
<!-- Log::Log4perl -->
<bridgehead renderas="sect3" id="perl-log-log4perl"
xreflabel="Log::Log4perl-&Log-Log4perl-version;">
Log-Log4perl-&Log-Log4perl-version;</bridgehead>
Log::Log4perl-&Log-Log4perl-version;</bridgehead>
<indexterm zone="perl-modules perl-log-log4perl">
<primary sortas="a-Log-Log4perl">Log::Log4perl</primary>
</indexterm>
<para>Log-Log4perl provides a Log4j implementation for
<para>Log::Log4perl provides a Log4j implementation for
<application>perl</application>. This module uses the
standard <xref linkend="perl-standard-install"/>.</para>

12
introduction/welcome/changelog.xml
View File

@ -45,6 +45,18 @@
<listitem>
<para>December 19th, 2016</para>
<itemizedlist>
<listitem>
<para>[bdubbs] - Add instructions to graphviz and cmake that
avoid installing files in /usr/lib64. </para>
</listitem>
<listitem>
<para>[bdubbs] - Update to poppler-0.50.0. Fixes
<ulink url="&blfs-ticket-root;8646">#8646</ulink>.</para>
</listitem>
<listitem>
<para>[bdubbs] - Update to libqmi-1.16.2. Fixes
<ulink url="&blfs-ticket-root;8514">#8514</ulink>.</para>
</listitem>
<listitem revision="systemd">
<para>[renodr] - Update to colord-1.3.4. Fixes
<ulink url="&blfs-ticket-root;8557">#8557</ulink>.</para>

4
packages.ent
View File

@ -136,7 +136,7 @@
<!ENTITY libmbim-version "1.14.0">
<!ENTITY libnfsidmap-version "0.26">
<!ENTITY libpaper-version "1.1.24+nmu5">
<!ENTITY libqmi-version "1.16.0">
<!ENTITY libqmi-version "1.16.2">
<!ENTITY libsigc-version "2.10.0">
<!ENTITY libsigsegv-version "2.10">
<!ENTITY libstatgrab-version "0.91">
@ -198,7 +198,7 @@
<!ENTITY openjpeg-version "1.5.2">
<!ENTITY openjpeg2-version "2.1.2">
<!ENTITY pixman-version "0.34.0"> <!-- Even minors only -->
<!ENTITY poppler-version "0.49.0">
<!ENTITY poppler-version "0.50.0">
<!ENTITY qpdf-version "6.0.0">
<!-- Chapter 11 -->

6
x/installing/xorg7.xml
View File

@ -155,7 +155,7 @@ pathappend $XORG_PREFIX/lib LIBRARY_PATH
pathappend $XORG_PREFIX/include C_INCLUDE_PATH
pathappend $XORG_PREFIX/include CPLUS_INCLUDE_PATH
ACLOCAL='aclocal -I $XORG_PREFIX/share/aclocal'
ACLOCAL="aclocal -I $XORG_PREFIX/share/aclocal"
export PATH PKG_CONFIG_PATH ACLOCAL LIBRARY_PATH C_INCLUDE_PATH CPLUS_INCLUDE_PATH
EOF</userinput></screen>
@ -188,7 +188,7 @@ EOF</userinput></screen>
$XORG_PREFIX. Allow cmake to find Xorg with:</para>
<screen role="root"><userinput>ln -sf $XORG_PREFIX /usr/X11R6</userinput></screen>
<!--
<para>Finally, if building on x86_64, you will need to create the
<filename class="directory">$XORG_PREFIX/lib</filename> directory and the
<filename>$XORG_PREFIX/lib64</filename> symlink. Again, as the
@ -198,7 +198,7 @@ EOF</userinput></screen>
<screen role="root"><userinput>install -v -m755 -d $XORG_PREFIX &amp;&amp;
install -v -m755 -d $XORG_PREFIX/lib &amp;&amp;
ln -sf lib $XORG_PREFIX/lib64</userinput></screen>
-->
</sect2>
</sect1>