From b88be39d0b65bd00ff760a86b03d28c6d1419d14 Mon Sep 17 00:00:00 2001 From: Bruce Dubbs Date: Mon, 31 Oct 2011 19:38:44 +0000 Subject: [PATCH] Update to cmake-2.8.6. Update to curl-7.22.0. Updated to libarchive-2.8.5. Reset all python references to python2. git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@8928 af4574ff-66df-0310-9fd7-8a98e5e911e0 --- basicnet/netlibs/curl.xml | 10 ++-- basicnet/netutils/avahi.xml | 2 +- general.ent | 14 ++--- general/genlib/dbus-bindings.xml | 2 +- general/genlib/expat.xml | 2 +- general/genlib/libgsf.xml | 2 +- general/prog/python-modules.xml | 12 ++--- general/prog/python.xml | 86 +++++++++++++++--------------- general/prog/python2.xml | 18 +++---- general/sysutils/cmake.xml | 34 ++++++------ general/sysutils/libarchive.xml | 12 +++-- gnome/add/alacarte.xml | 2 +- gnome/add/at-spi.xml | 2 +- gnome/add/deskbar-applet.xml | 2 +- gnome/add/gnome-games.xml | 2 +- gnome/add/hamster-applet.xml | 2 +- gnome/add/orca.xml | 2 +- gnome/core/gnome-menus.xml | 4 +- gnome/core/libgweather.xml | 2 +- gnome/core/pre-install-config.xml | 2 +- introduction/welcome/changelog.xml | 15 ++++++ server/databases/mysql.xml | 27 +++++----- 22 files changed, 135 insertions(+), 121 deletions(-) diff --git a/basicnet/netlibs/curl.xml b/basicnet/netlibs/curl.xml index f80604cf3e..ca35960fac 100644 --- a/basicnet/netlibs/curl.xml +++ b/basicnet/netlibs/curl.xml @@ -7,10 +7,10 @@ - - - - + + + + ]> @@ -38,7 +38,7 @@ This ability to both download and upload files can be incorporated into other programs to support functions like streaming media. - &lfs65_checked; + &lfs70_checked; Package Information diff --git a/basicnet/netutils/avahi.xml b/basicnet/netutils/avahi.xml index cb47ab369a..aca48987b0 100644 --- a/basicnet/netutils/avahi.xml +++ b/basicnet/netutils/avahi.xml @@ -191,7 +191,7 @@ make libavahi-core.{so,a}, libavahi-glib.{so,a}, libavahi-gobject.{so,a}, and libavahi-ui.{so,a} /etc/avahi/services,/usr/{include/avahi-{client,common,core,glib, - gobject,ui},lib/{avahi,python&python-majorver;/site-packages/{avahi,avahi_discover}}, + gobject,ui},lib/{avahi,python&python2-majorver;/site-packages/{avahi,avahi_discover}}, share/avahi/{interfaces,introspection}} diff --git a/general.ent b/general.ent index ec8201d6d9..c7e4328210 100644 --- a/general.ent +++ b/general.ent @@ -3,13 +3,13 @@ $LastChangedBy$ $Date$ --> - + - + @@ -299,8 +299,8 @@ $Date$ - - + + @@ -330,8 +330,8 @@ $Date$ - - + + @@ -421,7 +421,7 @@ $Date$ - + diff --git a/general/genlib/dbus-bindings.xml b/general/genlib/dbus-bindings.xml index 2831dbd610..d1a4adf2bd 100644 --- a/general/genlib/dbus-bindings.xml +++ b/general/genlib/dbus-bindings.xml @@ -324,7 +324,7 @@ install -v -m644 api/* \ None Python D-Bus modules - /usr/lib/python&python-majorver;/site-packages/dbus and + /usr/lib/python&python2-majorver;/site-packages/dbus and /usr/share/doc/dbus-python-&dbus-python-version; diff --git a/general/genlib/expat.xml b/general/genlib/expat.xml index 06cbc521a8..ede93bd586 100644 --- a/general/genlib/expat.xml +++ b/general/genlib/expat.xml @@ -32,7 +32,7 @@ The Expat package contains a stream oriented C library for parsing XML. - &lfs67_checked; + &lfs70_checked; Package Information diff --git a/general/genlib/libgsf.xml b/general/genlib/libgsf.xml index 8d73f2440f..e92b3c8589 100644 --- a/general/genlib/libgsf.xml +++ b/general/genlib/libgsf.xml @@ -138,7 +138,7 @@ make gsf, gsf-office-thumbnailer (optional), and gsf-vba-dump libgsf-1.{so,a} and optionally, libgsf-gnome-1.{so,a} /usr/include/libgsf-1 and /usr/share/gtk-doc/html/gsf and - optionally, /usr/lib/python&python-majorver;/site-packages/gsf + optionally, /usr/lib/python&python2-majorver;/site-packages/gsf diff --git a/general/prog/python-modules.xml b/general/prog/python-modules.xml index 2152046e80..fc50e6ff2c 100644 --- a/general/prog/python-modules.xml +++ b/general/prog/python-modules.xml @@ -213,7 +213,7 @@ cd .. xmlproc_parse and xmlproc_val PyXML Python library modules - /usr/lib/python&python-majorver;/site-packages/_xmlplus and + /usr/lib/python&python2-majorver;/site-packages/_xmlplus and /usr/share/doc/PyXML-&pyxml-version; @@ -327,7 +327,7 @@ make None Pycairo Python library module /usr/include/pycairo and - /usr/lib/python&python-majorver;/site-packages/cairo + /usr/lib/python&python2-majorver;/site-packages/cairo @@ -428,7 +428,7 @@ make libpyglib-2.0-python.so, _gio.so, unix.so, _glib.so, and _gobject.so /usr/{include/pygtk-2.0, - lib/python&python-majorver;/site-packages/gtk-2.0/{gio,glib,gobject}, + lib/python&python2-majorver;/site-packages/gtk-2.0/{gio,glib,gobject}, share/{gtk-doc/html/pygobject,pygobject/{2.0/{codegen,defs}, xsl}}} @@ -553,7 +553,7 @@ make atk.so, _gtk.so, glade.so, gtkunixprint.so, pango.so, and pangocairo.so /usr/{include/pygtk-2.0/pygtk,lib/{pygtk/2.0/demos/images, - python&python-majorver;/site-packages/gtk-2.0/gtk}, + python&python2-majorver;/site-packages/gtk-2.0/gtk}, share/{gtk-doc/html/pygtk/{cursors,icons,images},pygtk/2.0/defs}} @@ -894,7 +894,7 @@ make _gnome.so, ui.so, gnomecanvas.so, _gnomevfs.so, and gnomevfsbonobo.so /usr/{include/gnome-python-2.0, - lib/python&python-majorver;/site-packages/gtk-2.0/{bonobo,gnomevfs}, + lib/python&python2-majorver;/site-packages/gtk-2.0/{bonobo,gnomevfs}, share/{gtk-doc/html/pygnomevfs,pygtk/2.0/argtypes}} @@ -1042,7 +1042,7 @@ make braseroburn.so, braseromedia.so, evince.so, ebook.so, ecal.so, gnomeapplet.so, _gnomedesktop.so, gnomekeyring.so, _print.so, ui.so, gtop.so, mediaprofiles.so, rsvg.so, plparser.so, and wnck.so - /usr/{lib/python&python-majorver;/site-packages/gtk-2.0/{evolution, + /usr/{lib/python&python2-majorver;/site-packages/gtk-2.0/{evolution, gnomedesktop,gnomeprint,totem},share/gtk-doc/html/pygnomeprintui} None diff --git a/general/prog/python.xml b/general/prog/python.xml index a09a56a95d..9cff94a534 100644 --- a/general/prog/python.xml +++ b/general/prog/python.xml @@ -4,29 +4,29 @@ %general-entities; - - - - - - - - - + + + + + + + + + ]> - - + + $LastChangedBy$ $Date$ - Python-&python-version; + Python-&python3-version; - - Python + + Python @@ -45,22 +45,22 @@ Package Information - Download (HTTP): + Download (HTTP): - Download (FTP): + Download (FTP): - Download MD5 sum: &python-md5sum; + Download MD5 sum: &python3-md5sum; - Download size: &python-size; + Download size: &python3-size; - Estimated disk space required: &python-buildsize; + Estimated disk space required: &python3-buildsize; - Estimated build time: &python-time; + Estimated build time: &python3-time; @@ -75,13 +75,13 @@ Optional HTML Documentation - Download (HTTP): + Download (HTTP): - Download MD5 sum: &pythonhtmldoc-md5sum; + Download MD5 sum: &python3htmldoc-md5sum; - Download size: &pythonhtmldoc-size; + Download size: &python3htmldoc-size; @@ -141,12 +141,12 @@ make commands as the root user: -install -v -m755 -d /usr/share/doc/Python-&python-version;/html && +install -v -m755 -d /usr/share/doc/Python-&python3-version;/html && tar --strip-components=1 \ --no-same-owner \ --no-same-permissions \ - -C /usr/share/doc/Python-&python-version;/html \ - -xvf ../python-&python-majorver;-docs-html.tar.bz2 + -C /usr/share/doc/Python-&python3-version;/html \ + -xvf ../python-&python3-majorver;-docs-html.tar.bz2 @@ -166,7 +166,7 @@ tar --strip-components=1 \ documentation, you must add the following environment variable to individual user's or the system's profile: - export PYTHONDOCS=/usr/share/doc/Python-&python-version;/html + export PYTHONDOCS=/usr/share/doc/Python-&python3-version;/html @@ -179,14 +179,14 @@ tar --strip-components=1 \ Installed Directories - 2to3, pydoc, python, python-config, python&python-majorver;, - python&python-majorver;-config, smtpd.py, and optionally if + 2to3, pydoc, python3, python3-config, python&python3-majorver;, + python&python3-majorver;-config, smtpd.py, and optionally if Tk is installed, idle - libpython&python-majorver;.so and numerous modules installed in - /usr/lib/python&python-majorver;/lib-dynload - /usr/include/python&python-majorver;, - /usr/lib/python&python-majorver;, and - /usr/share/doc/python-&python-version; + libpython&python3-majorver;.so and numerous modules installed in + /usr/lib/python&python3-majorver;/lib-dynload + /usr/include/python&python3-majorver;, + /usr/lib/python&python3-majorver;, and + /usr/share/doc/python-&python3-version; @@ -200,7 +200,7 @@ tar --strip-components=1 \ is a wrapper script that opens a Python aware GUI editor. - + idle @@ -211,30 +211,30 @@ tar --strip-components=1 \ is the Python documentation tool. - + pydoc - + python is an interpreted, interactive, object-oriented programming language. - - python + + python3 - python&python-majorver; + python&python3-majorver; is a version-specific name for the python program. - - python&python-majorver; + + python&python3-majorver; @@ -244,7 +244,7 @@ tar --strip-components=1 \ is an SMTP proxy implemented in Python. - + smtpd.py diff --git a/general/prog/python2.xml b/general/prog/python2.xml index a22ece870e..176bbae1d9 100644 --- a/general/prog/python2.xml +++ b/general/prog/python2.xml @@ -15,7 +15,7 @@ ]> - + @@ -25,7 +25,7 @@ Python-&python2-version; - + Python @@ -195,7 +195,7 @@ tar --strip-components=1 \ is a wrapper script that opens a Python aware GUI editor. - + idle @@ -206,7 +206,7 @@ tar --strip-components=1 \ is the Python documentation tool. - + pydoc @@ -217,8 +217,8 @@ tar --strip-components=1 \ is an interpreted, interactive, object-oriented programming language. - - python + + python @@ -228,8 +228,8 @@ tar --strip-components=1 \ is a version-specific name for the python program. - - python&python-majorver; + + python&python2-majorver; @@ -239,7 +239,7 @@ tar --strip-components=1 \ is an SMTP proxy implemented in Python. - + smtpd.py diff --git a/general/sysutils/cmake.xml b/general/sysutils/cmake.xml index 3bae00282f..06513c4b1d 100644 --- a/general/sysutils/cmake.xml +++ b/general/sysutils/cmake.xml @@ -6,10 +6,10 @@ - + - - + + ]> @@ -57,23 +57,18 @@ - - CMake Dependencies Required - , - , and - + , + , and + + + + Options + + (for testing) User Notes: @@ -87,12 +82,15 @@ Install CMake by running the following commands: -./bootstrap --prefix=/usr \ - --system-libs \ +./bootstrap --prefix=/usr \ + --system-libs \ --mandir=/share/man \ --docdir=/share/doc/cmake-&cmake-version; && make + To test the results, issue: make test. + The SVN test may fail. + Now, as the root user: make install diff --git a/general/sysutils/libarchive.xml b/general/sysutils/libarchive.xml index afecc6ee03..f9625d1c88 100644 --- a/general/sysutils/libarchive.xml +++ b/general/sysutils/libarchive.xml @@ -6,10 +6,10 @@ - - - - + + + + ]> @@ -32,7 +32,7 @@ The libarchive library provides a single interface for reading/writing various compression formats. - &lfs67_checked; + &lfs70_checked; Package Information @@ -87,6 +87,8 @@ ./configure --prefix=/usr && make + To test the results, issue: make check. + Now, as the root user: make install diff --git a/gnome/add/alacarte.xml b/gnome/add/alacarte.xml index dccf3fb617..bdade6d412 100644 --- a/gnome/add/alacarte.xml +++ b/gnome/add/alacarte.xml @@ -103,7 +103,7 @@ make alacarte Python modules. - $GNOME_PREFIX/{lib/python&python-majorver;/site-packages/Alacarte, + $GNOME_PREFIX/{lib/python&python2-majorver;/site-packages/Alacarte, share/{alacarte,icons/hicolor/256x256/apps,locale/bem/LC_MESSAGES}} diff --git a/gnome/add/at-spi.xml b/gnome/add/at-spi.xml index 84165ba21d..356a66f1f4 100644 --- a/gnome/add/at-spi.xml +++ b/gnome/add/at-spi.xml @@ -133,7 +133,7 @@ make at-spi-registryd libatk-bridge.so, libcspi.so, libloginhelper.so, libspi.so, Accessibility_LoginHelper_module.so, and Accessibility_module.so - /usr/lib/python&python-majorver;/site-packages/pyatspi, + /usr/lib/python&python2-majorver;/site-packages/pyatspi, $GNOME_PREFIX/{include/at-spi-1.0/{cspi,libspi, login-helper},lib/at-spi,share/{doc/at-spi-1.30.1/reference/html, gtk-doc/html/at-spi-cspi,idl/at-spi-1.0}} diff --git a/gnome/add/deskbar-applet.xml b/gnome/add/deskbar-applet.xml index c2e7073dfd..3f5e6d8da5 100644 --- a/gnome/add/deskbar-applet.xml +++ b/gnome/add/deskbar-applet.xml @@ -127,7 +127,7 @@ make deskbar-applet Python modules - /usr/lib/python&python-majorver;/site-packages/deskbar/{core/{_userdirs, + /usr/lib/python&python2-majorver;/site-packages/deskbar/{core/{_userdirs, keybinder,updater},handlers/{actions,evolution},interfaces,osutils, ui/{cuemiac,iconentry,preferences}}, $GNOME_PREFIX/{lib/deskbar-applet/modules-2.20-compatible, diff --git a/gnome/add/gnome-games.xml b/gnome/add/gnome-games.xml index 0d238c6c07..d658dd7f76 100644 --- a/gnome/add/gnome-games.xml +++ b/gnome/add/gnome-games.xml @@ -188,7 +188,7 @@ make gnome-sudoku, gnomine, gnotravex, gnotski, gtali, iagno, lightsoff, mahjongg, quadrapassel, sol, swell-foop, and ar-cards-renderer libgames-support-gi.{so,a} - /usr/lib/python&python-majorver;/site-packages/{glchess/{chess/fics, + /usr/lib/python&python2-majorver;/site-packages/{glchess/{chess/fics, ggz,gtkui,scene/{cairo,opengl},ui},gnome_sudoku/gtk_goodies}, $GNOME_PREFIX/{lib/gnome-games,share/{glchess/textures, gnome-games-common/cards,gnome-games/{aisleriot/games,glines/pixmaps, diff --git a/gnome/add/hamster-applet.xml b/gnome/add/hamster-applet.xml index 4ccc06f444..d172b6c5fa 100644 --- a/gnome/add/hamster-applet.xml +++ b/gnome/add/hamster-applet.xml @@ -108,7 +108,7 @@ make gnome-time-tracker and hamster-standalone _keybinder.so - /usr/lib/python&python-majorver;/site-packages/hamster/{keybinder, + /usr/lib/python&python2-majorver;/site-packages/hamster/{keybinder, widgets}, $GNOME_PREFIX/{lib/hamster-applet, share/{gnome/help/hamster-applet/*,hamster-applet/art}} diff --git a/gnome/add/orca.xml b/gnome/add/orca.xml index 15c21ec5d4..7ebed38877 100644 --- a/gnome/add/orca.xml +++ b/gnome/add/orca.xml @@ -136,7 +136,7 @@ make orca None - /usr/lib/python&python-majorver;/site-packages/orca/scripts/{apps/{Banshee, + /usr/lib/python&python2-majorver;/site-packages/orca/scripts/{apps/{Banshee, Thunderbird,evolution,gcalctool,gedit,gnome-window-properties, packagemanager,pidgin,planner,rhythmbox,soffice,yelp},toolkits/{Gecko, J2SE-access-bridge}}, diff --git a/gnome/core/gnome-menus.xml b/gnome/core/gnome-menus.xml index 8b6d17759b..22b62726d0 100644 --- a/gnome/core/gnome-menus.xml +++ b/gnome/core/gnome-menus.xml @@ -152,7 +152,7 @@ make profile, or in individual user's profiles as shown below: echo "export PYTHONPATH=\$PYTHONPATH:$(pkg-config \ ---variable=prefix ORBit-2.0)/lib/python&python-majorver;/site-packages/GMenuSimpleEditor" \ +--variable=prefix ORBit-2.0)/lib/python&python2-majorver;/site-packages/GMenuSimpleEditor" \ >> /etc/profile.d/gnome.sh @@ -174,7 +174,7 @@ make libgnome-menu.{so,a} and gmenu.{so,a} &gnome-etc-dir;/xdg/menus, $GNOME_PREFIX/{include/gnome-menus, - lib/python&python-majorver;/site-packages/GMenuSimpleEditor, + lib/python&python2-majorver;/site-packages/GMenuSimpleEditor, share/{desktop-directories,gnome-menus/{examples,ui}}} diff --git a/gnome/core/libgweather.xml b/gnome/core/libgweather.xml index 1b11b562b0..4ba736617e 100644 --- a/gnome/core/libgweather.xml +++ b/gnome/core/libgweather.xml @@ -130,7 +130,7 @@ make None libgweather.{so,a} $GNOME_PREFIX/{include/libgweather, - lib/python&python-majorver;/site-packages/gweather/I_KNOW_THIS_IS_UNSTABLE, + lib/python&python2-majorver;/site-packages/gweather/I_KNOW_THIS_IS_UNSTABLE, share/{gtk-doc/html/libgweather,libgweather}} diff --git a/gnome/core/pre-install-config.xml b/gnome/core/pre-install-config.xml index bfd7081c65..4896c52288 100644 --- a/gnome/core/pre-install-config.xml +++ b/gnome/core/pre-install-config.xml @@ -53,7 +53,7 @@ ln -v -s gnome-&gnome-version;&gnome-minor-version; /opt/gnome +export PYTHONPATH=$PYTHONPATH:/opt/gnome-&gnome-version;&gnome-minor-version;/lib/python&python2-majorver;/site-packages Add to your /etc/ld.so.conf: diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml index 1066339659..f636a60efc 100644 --- a/introduction/welcome/changelog.xml +++ b/introduction/welcome/changelog.xml @@ -41,6 +41,21 @@ --> + + October 31st, 2011 + + + [bdubbs] - Updated to cmake-2.8.6. + + + [bdubbs] - Updated to curl-7.22.0. + + + [bdubbs] - Updated to libarchive-2.8.5. + + + + October 30th, 2011 diff --git a/server/databases/mysql.xml b/server/databases/mysql.xml index ee5ed501a4..a325f19842 100644 --- a/server/databases/mysql.xml +++ b/server/databases/mysql.xml @@ -41,7 +41,7 @@ existing BLFS instructions. Note that versions other than the one shown in the download URLs have not been tested in a BLFS environment. - &lfssvn_checked;20101029&lfssvn_checked2; + &lfs70_checked; Package Information @@ -104,8 +104,7 @@ and group is strongly encouraged: groupadd -g 40 mysql && -useradd -c "MySQL Server" -d /dev/null -g mysql -s /bin/false \ - -u 40 mysql +useradd -c "MySQL Server" -d /dev/null -g mysql -s /bin/false -u 40 mysql There are a great many options available to ./configure. Check the output of the @@ -117,20 +116,20 @@ useradd -c "MySQL Server" -d /dev/null -g mysql -s /bin/false \ patch -Np1 -i ../mysql-&mysql-version;-makefile-1.patch && CFLAGS="-O3" \ -CXX=gcc \ +CXX=gcc \ CXXFLAGS="-O3 -felide-constructors -fno-exceptions -fno-rtti" \ -./configure --prefix=/usr \ - --sysconfdir=/etc \ - --libexecdir=/usr/sbin \ - --localstatedir=/srv/mysql \ - --enable-thread-safe-client \ - --enable-assembler \ - --enable-local-infile \ +./configure --prefix=/usr \ + --sysconfdir=/etc \ + --libexecdir=/usr/sbin \ + --localstatedir=/srv/mysql \ + --enable-thread-safe-client \ + --enable-assembler \ + --enable-local-infile \ --with-unix-socket-path=/var/run/mysql/mysql.sock \ - --without-debug \ - --without-readline \ + --without-debug \ + --without-readline \ --with-plugins=innobase,myisam \ - --with-extra-charsets=all \ + --with-extra-charsets=all \ --with-ssl=/usr && make