Commit e8d09325 authored by Derk-Jan Hartman's avatar Derk-Jan Hartman

* Get a NASM cvs snapshot from the VLC download servers, because their server...

* Get a NASM cvs snapshot from the VLC download servers, because their server regurly times out, which is annoying.
parent 95d21d3b
...@@ -1814,10 +1814,16 @@ DISTCLEAN_PKG += clinkcc-$(CLINKCC_VERSION).tar.gz ...@@ -1814,10 +1814,16 @@ DISTCLEAN_PKG += clinkcc-$(CLINKCC_VERSION).tar.gz
# NASM assembler # NASM assembler
# *************************************************************************** # ***************************************************************************
nasm: nasm-$(NASM_VERSION).tar.bz2:
echo $(NASM_CVSROOT) A > ./nasm.cvs $(WGET) $(NASM_URL)
CVS_PASSFILE=./nasm.cvs cvs -z3 -d $(NASM_CVSROOT) co nasm
(cd $@ && autoconf && autoheader) nasm: nasm-$(NASM_VERSION).tar.bz2
$(EXTRACT_BZ2)
#nasm:
# echo $(NASM_CVSROOT) A > ./nasm.cvs
# CVS_PASSFILE=./nasm.cvs cvs -z3 -d $(NASM_CVSROOT) co nasm
# (cd $@ && autoconf && autoheader)
.nasm: nasm .nasm: nasm
(cd $< && $(HOSTCC) ./configure --prefix=$(PREFIX) && make && make install) (cd $< && $(HOSTCC) ./configure --prefix=$(PREFIX) && make && make install)
...@@ -1825,6 +1831,7 @@ nasm: ...@@ -1825,6 +1831,7 @@ nasm:
CLEAN_FILE += .nasm CLEAN_FILE += .nasm
CLEAN_PKG += nasm nasm.cvs CLEAN_PKG += nasm nasm.cvs
DISTCLEAN_PKG += nasm-$(NASM_VERSION).tar.bz2
# *************************************************************************** # ***************************************************************************
# Copy aclocal files # Copy aclocal files
......
...@@ -161,3 +161,5 @@ CLINKCC_URL=$(SF)/clinkcc/clinkcc$(CLINKCC_VERSION).tar.gz ...@@ -161,3 +161,5 @@ CLINKCC_URL=$(SF)/clinkcc/clinkcc$(CLINKCC_VERSION).tar.gz
EXPAT_VERSION=1.95.8 EXPAT_VERSION=1.95.8
EXPAT_URL=$(SF)/expat/expat-$(EXPAT_VERSION).tar.gz EXPAT_URL=$(SF)/expat/expat-$(EXPAT_VERSION).tar.gz
NASM_CVSROOT=:pserver:anonymous@cvs.sourceforge.net:/cvsroot/nasm NASM_CVSROOT=:pserver:anonymous@cvs.sourceforge.net:/cvsroot/nasm
NASM_VERSION=0.98.40-20060130
NASM_URL=$(VIDEOLAN)/testing/contrig/nasm-0.98.40-20060130.tar.bz2
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment