Commits

Rodrigo Bistolfi committed 461aad3

wxPython: exit on failure

  • Participants
  • Parent commits 7f4700f

Comments (0)

Files changed (1)

File var/vabs/wxPython/src/wxPython.SlackBuild

 LDFLAG_OPTIONS=${LDFLAG_OPTIONS:-""}
 ADDRB=${ADDRB:-""} #Add deps that need to be added to the slack-required file here
 EXRB=${EXRB:-""} #Add deps that need to be excluded from the slack-required file here
-MAKEDEPENDS=${MAKEDEPENDS:-"glew"} #Add deps needed TO BUILD this package here.
+MAKEDEPENDS=${MAKEDEPENDS:-"glew wxWidgets wxGTK"} #Add deps needed TO BUILD this package here.
 #----------------------------------------------------------------------------
 
 # DO NOT EXECUTE if NORUN is set to 1
   --build=$CONFIGURE_TRIPLET \
   $CONFIG_OPTIONS || exit 1
 
-make
+make || exit 1
 
 #Additional stuff from contrib
-make -C contrib/src/gizmos
-make -C contrib/src/ogl
-make -C contrib/src/stc
+make -C contrib/src/gizmos || exit 1
+make -C contrib/src/ogl || exit 1
+make -C contrib/src/stc || exit 1
 
-make install DESTDIR=$PKG
-make -C contrib/src/gizmos install DESTDIR=$PKG
-make -C contrib/src/ogl install DESTDIR=$PKG
-make -C contrib/src/stc install DESTDIR=$PKG
+make install DESTDIR=$PKG || exit 1
+make -C contrib/src/gizmos install DESTDIR=$PKG || exit 1
+make -C contrib/src/ogl install DESTDIR=$PKG || exit 1
+make -C contrib/src/stc install DESTDIR=$PKG || exit 1
 
 cd wxPython
   python setup.py \
     build_ext --include-dirs=$TMP/$PRGNAM-src-$VERSION/lib/wx/include/gtk2-unicode-release-2.8 \
               --library-dirs=$TMP/$PRGNAM-src-$VERSION/lib \
               --rpath=/usr/lib$LIBDIRSUFFIX \
-    build
+    build || exit 1
 
   python setup.py \
     WXPORT=gtk2 \
     build_ext --include-dirs=$TMP/$PRGNAM-src-$VERSION/lib/wx/include/gtk2-unicode-release-2.8 \
               --library-dirs=$TMP/$PRGNAM-src-$VERSION/lib \
               --rpath=/usr/lib$LIBDIRSUFFIX \
-    install --root=$PKG
+    install --root=$PKG || exit 1
+
 cd -
 
 # install wxPython includes