Allow install of binutils and import texinfo
- Enable installing binutils from the base system. - Import texinfo which is required for the binutils tools to be compiled. - Also adapted the fetch rules to correctly generate the gitignore files for gcc, and allow the case of multiple modules in the same directory, as found in gnu/dist. Warning: This patch has an entry in docs/UPDATING Change-Id: Ib781734e8fd7f9c6265fa65d62ba2cf3fccbc5ba
This commit is contained in:
14
gnu/dist/Makefile
vendored
Normal file
14
gnu/dist/Makefile
vendored
Normal file
@@ -0,0 +1,14 @@
|
||||
# LSC FIXME: Hackish way to trigger the fetch phase from here
|
||||
# in the same way as from tools.
|
||||
|
||||
.include <bsd.own.mk>
|
||||
|
||||
MODULE= texinfo
|
||||
|
||||
.include "${.CURDIR}/../../tools/Makefile.gnuhost"
|
||||
|
||||
# Force the mapping to standard targets even when not building tools
|
||||
.if ${USETOOLS} != "yes"
|
||||
realall: .build_done
|
||||
realinstall: .install_done
|
||||
.endif
|
||||
32
gnu/dist/fetch.sh
vendored
32
gnu/dist/fetch.sh
vendored
@@ -4,7 +4,7 @@
|
||||
echo $0
|
||||
cd `dirname $0`
|
||||
|
||||
# Configure fetch method
|
||||
# Configure fetch method - GMAKE
|
||||
URL="http://www.minix3.org/distfiles-minix/make-3.80.tar.bz2"
|
||||
BACKUP_URL="ftp://ftp.gnu.org/gnu/make/make-3.80.tar.bz2"
|
||||
FETCH=wget
|
||||
@@ -24,6 +24,34 @@ then
|
||||
fi
|
||||
|
||||
tar -xjf make-3.80.tar.bz2 && \
|
||||
mv make-3.80 gmake
|
||||
mv make-3.80 gmake && \
|
||||
echo "make*" >> .gitignore
|
||||
echo "gmake*" >> .gitignore
|
||||
fi
|
||||
|
||||
# Configure fetch method - TEXINFO
|
||||
URL="http://www.minix3.org/distfiles-minix/texinfo-4.8.tar.bz2"
|
||||
BACKUP_URL="ftp://ftp.gnu.org/gnu/texinfo/texinfo-4.8.tar.bz2"
|
||||
FETCH=wget
|
||||
which curl >/dev/null
|
||||
if [ $? -eq 0 ]; then
|
||||
FETCH="curl -O -f"
|
||||
fi
|
||||
|
||||
# Fetch sources if not available
|
||||
if [ ! -d texinfo ];
|
||||
then
|
||||
if [ ! -f texinfo-4.8.tar.bz2 ]; then
|
||||
$FETCH $URL
|
||||
if [ $? -ne 0 ]; then
|
||||
$FETCH $BACKUP_URL
|
||||
fi
|
||||
fi
|
||||
|
||||
tar -xjf texinfo-4.8.tar.bz2 && \
|
||||
cd texinfo-4.8 && \
|
||||
cat ../../usr.bin/texinfo/patches/* | patch -p1 && \
|
||||
cd - && \
|
||||
mv texinfo-4.8 texinfo
|
||||
fi
|
||||
|
||||
|
||||
Reference in New Issue
Block a user