For blfs-tool dependencies, replaced links by linx.
Lynx have better GPM support and no locale issues.
This commit is contained in:
parent
63a051ca22
commit
d09e32ad28
7 changed files with 32 additions and 26 deletions
|
@ -574,8 +574,8 @@ menu "--- BOOK Settings"
|
|||
#bool "DocBook XSL (required)"
|
||||
#default y
|
||||
|
||||
config DEP_LINKS
|
||||
bool "links (required)"
|
||||
config DEP_LYNX
|
||||
bool "lynx (required)"
|
||||
default y
|
||||
|
||||
config DEP_SUDO
|
||||
|
|
|
@ -1,15 +0,0 @@
|
|||
#!/bin/bash
|
||||
|
||||
# $Id$
|
||||
|
||||
set -e
|
||||
cd $PKGDIR
|
||||
|
||||
./configure --prefix=/usr
|
||||
make CFLAGS="-O2 -Wno-sign-compare -Wno-pointer-sign"
|
||||
make install
|
||||
install -v -d -m755 /usr/share/doc/links-2.1pre23
|
||||
install -v -m644 doc/links_cal/* KEYS BRAILLE_HOWTO \
|
||||
/usr/share/doc/links-2.1pre23
|
||||
|
||||
exit
|
19
common/blfs-tool-deps/908-lynx
Normal file
19
common/blfs-tool-deps/908-lynx
Normal file
|
@ -0,0 +1,19 @@
|
|||
#!/bin/bash
|
||||
|
||||
# $Id$
|
||||
|
||||
set -e
|
||||
cd $PKGDIR
|
||||
|
||||
./configure --prefix=/usr \
|
||||
--sysconfdir=/etc/lynx \
|
||||
--datadir=/usr/share/doc/lynx-2.8.6 \
|
||||
--with-zlib \
|
||||
--with-bzlib \
|
||||
--with-screen=ncursesw \
|
||||
--enable-locale-charset
|
||||
make
|
||||
make install-full
|
||||
chgrp -v -R root /usr/share/doc/lynx-2.8.6/lynx_doc
|
||||
|
||||
exit
|
|
@ -33,8 +33,8 @@ add_blfs_deps_urls() { # No easy way to extract it.
|
|||
# echo "${DBXSL_URL} ${BLFS_SERVER}docbook-xsl/${DBXSL_PKG} ${DBXSL_MD5}" >> urls.lst
|
||||
# fi
|
||||
|
||||
if [[ "${DEP_LINKS}" = "y" ]] ; then
|
||||
echo "${LINKS_URL} ${BLFS_SERVER}links/${LINKS_PKG} ${LINKS_MD5}" >> urls.lst
|
||||
if [[ "${DEP_LYNX}" = "y" ]] ; then
|
||||
echo "${LYNX_URL} ${BLFS_SERVER}lynx/${LYNX_PKG} ${LYNX_MD5}" >> urls.lst
|
||||
fi
|
||||
|
||||
if [[ "${DEP_SUDO}" = "y" ]] ; then
|
||||
|
@ -88,8 +88,8 @@ copy_blfs_deps_scripts() { # method avoid to place the test on all
|
|||
# mv blfs-tool-deps/906-docbook-xsl ${PROGNAME}-commands/blfs-tool-deps
|
||||
# fi
|
||||
|
||||
if [[ "${DEP_LINKS}" = "y" ]] ; then
|
||||
mv blfs-tool-deps/908-links ${PROGNAME}-commands/blfs-tool-deps
|
||||
if [[ "${DEP_LYNX}" = "y" ]] ; then
|
||||
mv blfs-tool-deps/908-lynx ${PROGNAME}-commands/blfs-tool-deps
|
||||
fi
|
||||
|
||||
if [[ "${DEP_SUDO}" = "y" ]] ; then
|
||||
|
@ -129,6 +129,7 @@ wrt_blfs_tool_targets() { #
|
|||
|
||||
# Find the package.
|
||||
case $name in
|
||||
lynx ) pkg_tarball=${LYNX_PKG} ;;
|
||||
tidy ) pkg_tarball=${TIDY_PKG} ;;
|
||||
unzip ) pkg_tarball=${UNZIP_PKG} ;;
|
||||
* ) pkg_tarball=$(get_package_tarball_name $name) ;;
|
||||
|
@ -175,6 +176,7 @@ wrt_blfs_tool_targets() { #
|
|||
# Touch the tracking file.
|
||||
case $name in
|
||||
docbook-xml ) pkg_ver=DocBook-4.5 ;;
|
||||
lynx ) pkg_ver=lynx-2.8.6 ;;
|
||||
tidy ) pkg_ver=html-tidy-cvs_20070326 ;;
|
||||
unzip ) pkg_ver=unzip-5.52 ;;
|
||||
* ) pkg_ver=$(echo $pkg_tarball | sed -e 's/.tar.*//;s/.tgz//;s/.zip//') ;;
|
||||
|
|
|
@ -201,7 +201,7 @@ $TIDY_PKG
|
|||
$UNZIP_PKG
|
||||
$DBXML_PKG
|
||||
$DBXSL_PKG
|
||||
$LINKS_PKG
|
||||
$LYNX_PKG
|
||||
$SUDO_PKG
|
||||
$WGET_PKG
|
||||
$SVN_PKG
|
||||
|
|
|
@ -57,7 +57,7 @@ inline_doc
|
|||
# Additional variables (add DEP_DBXSL when required again)
|
||||
local -r blfs_tool_PARAM_LIST="BLFS_BRANCH_ID BLFS_ROOT BLFS_XML TRACKING_DIR \
|
||||
DEP_LIBXML DEP_LIBXSLT DEP_TIDY DEP_UNZIP \
|
||||
DEP_DBXML DEP_LINKS DEP_SUDO DEP_WGET \
|
||||
DEP_DBXML DEP_LYNX DEP_SUDO DEP_WGET \
|
||||
DEP_SVN DEP_GPM"
|
||||
local -r custom_tool_PARAM_LIST="TRACKING_DIR"
|
||||
|
||||
|
|
6
jhalfs
6
jhalfs
|
@ -198,9 +198,9 @@ if [[ "${BLFS_TOOL}" = "y" ]] ; then
|
|||
# DBXSL_URL="http://prdownloads.sourceforge.net/docbook/${DBXSL_PKG}"
|
||||
# DBXSL_MD5="6ebd29a67f2dcc3f2220f475ee6f6552"
|
||||
# Links
|
||||
LINKS_PKG="links-2.1pre23.tar.bz2"
|
||||
LINKS_URL="http://links.twibright.com/download/${LINKS_PKG}"
|
||||
LINKS_MD5="4a1fb575c133eee821b9a1f8e9220b40"
|
||||
LYNX_PKG="lynx2.8.6.tar.bz2"
|
||||
LYNX_URL="http://lynx.isc.org/release/${LYNX_PKG}"
|
||||
LYNX_MD5="dc80497b7dda6a28fd80404684d27548"
|
||||
# sudo
|
||||
SUDO_PKG="sudo-1.6.8p12.tar.gz"
|
||||
SUDO_URL="http://anduin.linuxfromscratch.org/sources/BLFS/svn/s/${SUDO_PKG}"
|
||||
|
|
Reference in a new issue