Menu
▾
▴
[Octave-cvsupdate] octave-forge/admin/MacOSX/solvedeps-2.9.12 octave-2.9.12.diff, 1.1, 1.2 solvedeps.sh, 1.3, 1.4
|
From: Thomas T. <tr...@us...> - 2007-06-30 14:48:38
|
Update of /cvsroot/octave/octave-forge/admin/MacOSX/solvedeps-2.9.12 In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv28267/solvedeps-2.9.12 Modified Files: octave-2.9.12.diff solvedeps.sh Log Message: Some minor changes. Index: octave-2.9.12.diff =================================================================== RCS file: /cvsroot/octave/octave-forge/admin/MacOSX/solvedeps-2.9.12/octave-2.9.12.diff,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- octave-2.9.12.diff 27 Jun 2007 16:12:43 -0000 1.1 +++ octave-2.9.12.diff 30 Jun 2007 14:48:38 -0000 1.2 @@ -44,34 +44,96 @@ *) UGLY_DEFS=`echo $DEFS | sed 's,\\",\\\\\\\\\\\\\\\\\\",g'` ;; -diff -u -u ./octave-2.9.12/mkoctfile.in ./octave-2.9.12/mkoctfile.in ---- ./octave-2.9.12/mkoctfile.in 2007-02-16 12:14:44.000000000 +0100 -+++ ./octave-2.9.12/mkoctfile.in 2007-06-01 22:17:41.000000000 +0200 -@@ -12,18 +12,21 @@ + diff -u -u octave-2.9.12/mkoctfile.in _octave-2.9.12/mkoctfile.in +--- octave-2.9.12/mkoctfile.in 2007-06-30 16:24:29.000000000 +0200 ++++ _octave-2.9.12/mkoctfile.in 2007-06-30 16:20:45.000000000 +0200 +@@ -12,35 +12,30 @@ OCTAVE_VERSION=%OCTAVE_CONF_VERSION% OCTAVE_PREFIX=%OCTAVE_CONF_PREFIX% --DEFAULT_OCTINCLUDEDIR=%OCTAVE_CONF_OCTINCLUDEDIR% -+DEFAULT_BINDIR=%OCTAVE_BINDIR% - DEFAULT_INCLUDEDIR=%OCTAVE_CONF_INCLUDEDIR% -+DEFAULT_OCTINCLUDEDIR=%OCTAVE_CONF_OCTINCLUDEDIR% +-DEFAULT_BINDIR=%OCTAVE_BINDIR% +-DEFAULT_INCLUDEDIR=%OCTAVE_CONF_INCLUDEDIR% + DEFAULT_OCTINCLUDEDIR=%OCTAVE_CONF_OCTINCLUDEDIR% ++DEFAULT_INCLUDEDIR=%OCTAVE_CONF_INCLUDEDIR% DEFAULT_OCTLIBDIR=%OCTAVE_CONF_OCTLIBDIR% if [ -n "$OCTAVE_HOME" ]; then -- DEFAULT_OCTINCLUDEDIR="`echo $DEFAULT_OCTINCLUDEDIR | $SED "s,^$OCTAVE_PREFIX,$OCTAVE_HOME,"`" -+ DEFAULT_BINDIR="`echo $DEFAULT_BINDIR | $SED "s,^$OCTAVE_PREFIX,$OCTAVE_HOME,"`" - DEFAULT_INCLUDEDIR="`echo $DEFAULT_INCLUDEDIR | $SED "s,^$OCTAVE_PREFIX,$OCTAVE_HOME,"`" -+ DEFAULT_OCTINCLUDEDIR="`echo $DEFAULT_OCTINCLUDEDIR | $SED "s,^$OCTAVE_PREFIX,$OCTAVE_HOME,"`" +- DEFAULT_BINDIR="`echo $DEFAULT_BINDIR | $SED "s,^$OCTAVE_PREFIX,$OCTAVE_HOME,"`" +- DEFAULT_INCLUDEDIR="`echo $DEFAULT_INCLUDEDIR | $SED "s,^$OCTAVE_PREFIX,$OCTAVE_HOME,"`" + DEFAULT_OCTINCLUDEDIR="`echo $DEFAULT_OCTINCLUDEDIR | $SED "s,^$OCTAVE_PREFIX,$OCTAVE_HOME,"`" ++ DEFAULT_INCLUDEDIR="`echo $DEFAULT_INCLUDEDIR | $SED "s,^$OCTAVE_PREFIX,$OCTAVE_HOME,"`" DEFAULT_OCTLIBDIR="`echo $DEFAULT_OCTLIBDIR | $SED "s,^$OCTAVE_PREFIX,$OCTAVE_HOME,"`" fi --: ${OCTINCLUDEDIR=$DEFAULT_OCTINCLUDEDIR} -+: ${BINDIR=$DEFAULT_BINDIR} - : ${INCLUDEDIR=$DEFAULT_INCLUDEDIR} -+: ${OCTINCLUDEDIR=$DEFAULT_OCTINCLUDEDIR} +-: ${BINDIR=$DEFAULT_BINDIR} +-: ${INCLUDEDIR=$DEFAULT_INCLUDEDIR} + : ${OCTINCLUDEDIR=$DEFAULT_OCTINCLUDEDIR} ++: ${INCLUDEDIR=$DEFAULT_INCLUDEDIR} : ${OCTLIBDIR=$DEFAULT_OCTLIBDIR} - DEFAULT_INCFLAGS="-I$OCTINCLUDEDIR -I$OCTINCLUDEDIR/octave" +-DEFAULT_INCFLAGS="-I$OCTINCLUDEDIR -I$OCTINCLUDEDIR/octave" ++DEFAULT_INCFLAGS="-I'$OCTINCLUDEDIR' -I'$OCTINCLUDEDIR/octave'" + if [ "$INCLUDEDIR" != /usr/include ]; then +- DEFAULT_INCFLAGS="$DEFAULT_INCFLAGS -I$INCLUDEDIR" ++ DEFAULT_INCFLAGS="$DEFAULT_INCFLAGS -I'$INCLUDEDIR'" + fi + +-DEFAULT_LFLAGS="-L$OCTLIBDIR" ++DEFAULT_LFLAGS="-L'$OCTLIBDIR'" + + # Default values for these variables are filled in when Octave is + # compiled. + +-: ${EXEEXT=%OCTAVE_CONF_EXEEXT%} +- + : ${CPPFLAGS=%OCTAVE_CONF_CPPFLAGS%} + : ${INCFLAGS=$DEFAULT_INCFLAGS} + : ${F2C=%OCTAVE_CONF_F2C%} + diff -u -u octave-2.9.12/mkoctfile.in _octave-2.9.12/mkoctfile.in +--- octave-2.9.12/mkoctfile.in 2007-06-30 16:24:29.000000000 +0200 ++++ _octave-2.9.12/mkoctfile.in 2007-06-30 16:20:45.000000000 +0200 +@@ -12,35 +12,30 @@ + OCTAVE_VERSION=%OCTAVE_CONF_VERSION% + OCTAVE_PREFIX=%OCTAVE_CONF_PREFIX% + +-DEFAULT_BINDIR=%OCTAVE_BINDIR% +-DEFAULT_INCLUDEDIR=%OCTAVE_CONF_INCLUDEDIR% + DEFAULT_OCTINCLUDEDIR=%OCTAVE_CONF_OCTINCLUDEDIR% ++DEFAULT_INCLUDEDIR=%OCTAVE_CONF_INCLUDEDIR% + DEFAULT_OCTLIBDIR=%OCTAVE_CONF_OCTLIBDIR% + + if [ -n "$OCTAVE_HOME" ]; then +- DEFAULT_BINDIR="`echo $DEFAULT_BINDIR | $SED "s,^$OCTAVE_PREFIX,$OCTAVE_HOME,"`" +- DEFAULT_INCLUDEDIR="`echo $DEFAULT_INCLUDEDIR | $SED "s,^$OCTAVE_PREFIX,$OCTAVE_HOME,"`" + DEFAULT_OCTINCLUDEDIR="`echo $DEFAULT_OCTINCLUDEDIR | $SED "s,^$OCTAVE_PREFIX,$OCTAVE_HOME,"`" ++ DEFAULT_INCLUDEDIR="`echo $DEFAULT_INCLUDEDIR | $SED "s,^$OCTAVE_PREFIX,$OCTAVE_HOME,"`" + DEFAULT_OCTLIBDIR="`echo $DEFAULT_OCTLIBDIR | $SED "s,^$OCTAVE_PREFIX,$OCTAVE_HOME,"`" + fi + +-: ${BINDIR=$DEFAULT_BINDIR} +-: ${INCLUDEDIR=$DEFAULT_INCLUDEDIR} + : ${OCTINCLUDEDIR=$DEFAULT_OCTINCLUDEDIR} ++: ${INCLUDEDIR=$DEFAULT_INCLUDEDIR} + : ${OCTLIBDIR=$DEFAULT_OCTLIBDIR} + +-DEFAULT_INCFLAGS="-I$OCTINCLUDEDIR -I$OCTINCLUDEDIR/octave" ++DEFAULT_INCFLAGS="-I'$OCTINCLUDEDIR' -I'$OCTINCLUDEDIR/octave'" + if [ "$INCLUDEDIR" != /usr/include ]; then +- DEFAULT_INCFLAGS="$DEFAULT_INCFLAGS -I$INCLUDEDIR" ++ DEFAULT_INCFLAGS="$DEFAULT_INCFLAGS -I'$INCLUDEDIR'" + fi + +-DEFAULT_LFLAGS="-L$OCTLIBDIR" ++DEFAULT_LFLAGS="-L'$OCTLIBDIR'" + + # Default values for these variables are filled in when Octave is + # compiled. + +-: ${EXEEXT=%OCTAVE_CONF_EXEEXT%} +- + : ${CPPFLAGS=%OCTAVE_CONF_CPPFLAGS%} + : ${INCFLAGS=$DEFAULT_INCFLAGS} + : ${F2C=%OCTAVE_CONF_F2C%} @@ -36,6 +39,8 @@ # Default values for these variables are filled in when Octave is # compiled. Index: solvedeps.sh =================================================================== RCS file: /cvsroot/octave/octave-forge/admin/MacOSX/solvedeps-2.9.12/solvedeps.sh,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- solvedeps.sh 30 Jun 2007 13:35:28 -0000 1.3 +++ solvedeps.sh 30 Jun 2007 14:48:38 -0000 1.4 @@ -25,7 +25,7 @@ MSGFILE=/dev/stdout #/tmp/message.log # /dev/stdout # This is the name of the directory where all dependencies are -# installed. The string "-ppc" or "-ia32" is added to the end of the +# installed. The string "-ppc" or "-i386" is added to the end of the # given pathname, eg. /tmp/abc becomes /tmp/abc-pcc etc. INSTDIR=/tmp/dependencies @@ -379,8 +379,8 @@ LDFLAGS="${ARCH} -Wl,-headerpad_max_install_names,-syslibroot,/Developer/SDKs/MacOSX10.3.9.sdk -L${INSTDIR}/lib" ;; - --ia32) - INSTDIR=${INSTDIR}-ia32 + --i386) + INSTDIR=${INSTDIR}-i386 ARCH="" BUILDARCH="" MACOSX_DEPLOYMENT_TARGET=10.4 |