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

Update to {tcl,tk}-8.6.3.

Browse Source 
Update to libffi-3.2.


git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@14900 af4574ff-66df-0310-9fd7-8a98e5e911e0
This commit is contained in:
Bruce Dubbs 2014-11-14 05:01:05 +00:00
parent c28445f33e
commit 4efac57c98
6 changed files with 42 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
general.ent
View File

@ -1,12 +1,12 @@
<!-- $LastChangedBy$ $Date$ -->
<!ENTITY day "12"> <!-- Always 2 digits -->
<!ENTITY day "13"> <!-- Always 2 digits -->
<!ENTITY month "11"> <!-- Always 2 digits -->
<!ENTITY year "2014">
<!ENTITY copyrightdate "2001-&year;">
<!ENTITY copyholder "The BLFS Development Team">
<!ENTITY version "&year;-&month;-&day;">
<!ENTITY releasedate "November 12th, &year;">
<!ENTITY releasedate "November 13th, &year;">
<!ENTITY pubdate "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
<!ENTITY blfs-version "svn"> <!-- svn|[release #] -->
<!ENTITY lfs-version "development"> <!-- x.y|development] -->

14
general/genlib/libffi.xml
View File

@ -6,10 +6,10 @@
<!ENTITY libffi-download-http " ">
<!ENTITY libffi-download-ftp "ftp://sourceware.org/pub/libffi/libffi-&libffi-version;.tar.gz">
<!ENTITY libffi-md5sum "f5898b29bbfd70502831a212d9249d10">
<!ENTITY libffi-size "916 KB">
<!ENTITY libffi-buildsize "6.5 MB (additional 1.7 MB for the tests)">
<!ENTITY libffi-time "less than 0.1 SBU (additional 0.6 SBU for the tests)">
<!ENTITY libffi-md5sum "41e0216cc2be4029fad3128988295f0f">
<!ENTITY libffi-size "920 KB">
<!ENTITY libffi-buildsize "6.1 MB (additional 1.7 MB for the tests)">
<!ENTITY libffi-time "less than 0.1 SBU (additional 0.4 SBU for the tests)">
]>
<sect1 id="libffi" xreflabel="libffi-&libffi-version;">
@ -92,11 +92,13 @@
commands:
</para>
<screen><userinput>sed -e '/^includesdir/ s:$(libdir)/@PACKAGE_NAME@-@PACKAGE_VERSION@/include:$(includedir):' \
<screen><userinput>sed -e '/^includesdir/ s/$(libdir).*$/$(includedir)/' \
-i include/Makefile.in &amp;&amp;
sed -e '/^includedir/ s:${libdir}/@PACKAGE_NAME@-@PACKAGE_VERSION@/include:@includedir@:' \
sed -e '/^includedir/ s/=.*$/=@includedir@/' \
-e 's/^Cflags: -I${includedir}/Cflags:/' \
-i libffi.pc.in &amp;&amp;
./configure --prefix=/usr --disable-static &amp;&amp;
make</userinput></screen>

29
general/prog/tcl.xml
View File

@ -6,10 +6,10 @@
<!ENTITY tcl-download-http "&sourceforge-repo;/tcl/tcl&tcl-version;-src.tar.gz">
<!ENTITY tcl-download-ftp " ">
<!ENTITY tcl-md5sum "8103eaf6d71acb716a64224492f09d5f">
<!ENTITY tcl-md5sum "db382feca91754b7f93da16dc4cdad1f">
<!ENTITY tcl-size "8.5 MB">
<!ENTITY tcl-buildsize "79 MB (includes documentation installation)">
<!ENTITY tcl-time "0.9 SBU (adittional 1.5 SBU for the tests)">
<!ENTITY tcl-buildsize "73 MB (includes documentation installation)(add 10MB for tests)">
<!ENTITY tcl-time "0.9 SBU (adittional 2.2 SBU for the tests)">
<!ENTITY tcl-doc-download "&sourceforge-repo;/tcl/tcl&tcl-version;-html.tar.gz">
<!ENTITY tcl-doc-md5sum "75019542fa735eb0c26e385b1a41296c">
@ -132,24 +132,21 @@ cd unix &amp;&amp;
--mandir=/usr/share/man \
$([ $(uname -m) = x86_64 ] &amp;&amp; echo --enable-64bit) &amp;&amp;
make &amp;&amp;
<!--
sed -e "s@^\(TCL_SRC_DIR='\).*@\1/usr/include'@" \
-e "/TCL_B/s@='\(-L\)\?.*unix@='\1/usr/lib@" \
-i tclConfig.sh</userinput></screen>-->
sed -e "s#$SRCDIR/unix#/usr/lib#" \
-e "s#$SRCDIR#/usr/include#" \
-i tclConfig.sh &amp;&amp;
sed -e "s#$SRCDIR/unix/pkgs/tdbc1.0.1#/usr/lib/tdbc1.0.0#" \
-e "s#$SRCDIR/pkgs/tdbc1.0.1/generic#/usr/include#" \
-e "s#$SRCDIR/pkgs/tdbc1.0.1/library#/usr/lib/tcl8.6#" \
-e "s#$SRCDIR/pkgs/tdbc1.0.1#/usr/include#" \
-i pkgs/tdbc1.0.1/tdbcConfig.sh &amp;&amp;
sed -e "s#$SRCDIR/unix/pkgs/tdbc1.0.2#/usr/lib/tdbc1.0.2#" \
-e "s#$SRCDIR/pkgs/tdbc1.0.2/generic#/usr/include#" \
-e "s#$SRCDIR/pkgs/tdbc1.0.2/library#/usr/lib/tcl8.6#" \
-e "s#$SRCDIR/pkgs/tdbc1.0.2#/usr/include#" \
-i pkgs/tdbc1.0.2/tdbcConfig.sh &amp;&amp;
sed -e "s#$SRCDIR/unix/pkgs/itcl4.0.1#/usr/lib/itcl4.0.0#" \
-e "s#$SRCDIR/pkgs/itcl4.0.1/generic#/usr/include#" \
-e "s#$SRCDIR/pkgs/itcl4.0.1#/usr/include#" \
-i pkgs/itcl4.0.1/itclConfig.sh &amp;&amp;
sed -e "s#$SRCDIR/unix/pkgs/itcl4.0.2#/usr/lib/itcl4.0.2#" \
-e "s#$SRCDIR/pkgs/itcl4.0.2/generic#/usr/include#" \
-e "s#$SRCDIR/pkgs/itcl4.0.2#/usr/include#" \
-i pkgs/itcl4.0.2/itclConfig.sh &amp;&amp;
unset SRCDIR</userinput></screen>

4
general/prog/tk.xml
View File

@ -6,9 +6,9 @@
<!ENTITY tk-download-http "&sourceforge-repo;/tcl/tk&tk-version;-src.tar.gz">
<!ENTITY tk-download-ftp " ">
<!ENTITY tk-md5sum "a719038d2df12ffd41dda4a255da5e09">
<!ENTITY tk-md5sum "85ca4dbf4dcc19777fd456f6ee5d0221">
<!ENTITY tk-size "4.1 MB">
<!ENTITY tk-buildsize "24 MB">
<!ENTITY tk-buildsize "25 MB">
<!ENTITY tk-time "0.3 SBU">
<!-- Ensure this is updated when Tk moves from the 8.6.x branch -->

14
introduction/welcome/changelog.xml
View File

@ -44,6 +44,20 @@
-->
<listitem>
<para>November 13th, 2014</para>
<itemizedlist>
<listitem>
<para>[bdubbs] - Update to {tcl,tk}-8.6.3. Fixes
<ulink url="&blfs-ticket-root;5812">#5812</ulink>.</para>
</listitem>
<listitem>
<para>[bdubbs] - Update to libffi-3.2. Fixes
<ulink url="&blfs-ticket-root;5810">#5810</ulink>.</para>
</listitem>
</itemizedlist>
</listitem>
<listitem>
<para>November 12th, 2014</para>
<itemizedlist>

6
packages.ent
View File

@ -111,7 +111,7 @@
<!ENTITY libdrm-version "2.4.58">
<!ENTITY libepoxy-version "1.2">
<!ENTITY libesmtp-version "1.0.6">
<!ENTITY libffi-version "3.1">
<!ENTITY libffi-version "3.2">
<!ENTITY libgcrypt-version "1.6.2">
<!ENTITY libgee-version "0.6.8">
<!ENTITY libglade-version "2.6.4">
@ -274,8 +274,8 @@
<!ENTITY slang-version "2.2.4">
<!ENTITY subversion-version "1.8.10">
<!ENTITY swig-version "3.0.2">
<!ENTITY tcl-version "8.6.2">
<!ENTITY tk-version "8.6.2">
<!ENTITY tcl-version "8.6.3">
<!ENTITY tk-version "8.6.3">
<!ENTITY vala-major-version "0.26"> <!-- even minors only -->
<!ENTITY vala-version "&vala-major-version;.1">
<!ENTITY valgrind-version "3.10.0">