From: Hugo Villeneuve <hugo@hugovil.com>
Date: Mon, 19 May 2014 23:55:02 +0000 (-0400)
Subject: Install nasm before libjpeg-turbo
X-Git-Url: http://gitweb.hugovil.com/?a=commitdiff_plain;h=95d299f4c4d4095283cdc80fdefdc1512bb7e3b1;p=hvlinux.git

Install nasm before libjpeg-turbo
---

diff --git a/config/dependencies b/config/dependencies
index 375ff52..5a9e1d2 100644
--- a/config/dependencies
+++ b/config/dependencies
@@ -181,3 +181,5 @@ ${MERCURIAL}: ${PYTHON}
 ${STELLARIUM}: ${QT}
 
 ${GPTFDISK}: ${ICU}
+
+${LIBJPEG}: ${NASM}
diff --git a/stage3/hv-install-1 b/stage3/hv-install-1
index 4b19c44..48c5838 100755
--- a/stage3/hv-install-1
+++ b/stage3/hv-install-1
@@ -123,6 +123,8 @@ ipkg -m noac ${DOCBOOK_XSL}
 ipkg -m noac ${XMLTOMAN}
 ipkg ${XMLTO}
 
+ipkg -m acnb ${NASM}
+
 # Graphic libraries
 ipkg ${LIBPNG}
 ipkg ${TIFF}
@@ -179,8 +181,6 @@ ipkg ${YASM}
 if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; then
     if [ "x${SOUND_CARD}" = "xyes" ]; then
         # Utilitaires
-        ipkg -m acnb ${NASM}
-
         ipkg ${ALSA_LIB}
         ipkg -m acnb ${ALSA_UTILS}