[Bf-committers] [Bf-blender-cvs] SVN commit: /data/svn/bf-blender [12874] trunk/blender/source: made guessconfig add use bash (not sh) and return a CPU as i386-32 or i386-64 (was just i386)

[Chris Want]

Campbell Barton wrote:
> Revision: 12874
>           http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=12874
> Author:   campbellbarton
> Date:     2007-12-13 23:36:10 +0100 (Thu, 13 Dec 2007)
> 
> Log Message:
> -----------
> made guessconfig add use bash (not sh) and return a CPU as i386-32 or i386-64 (was just i386)
> default python to 2.5

I think the standard names for the chips are i386 and x86_64.

Also, OS's like IRIX don't have bash installed by default, and
even when it is, it isn't in /bin, so should be kept as
/bin/sh.

Chris

> 
> Modified Paths:
> --------------
>     trunk/blender/source/nan_compile.mk
>     trunk/blender/source/nan_definitions.mk
>     trunk/blender/source/nan_link.mk
>     trunk/blender/source/tools/guess/guessconfig
> 
> Modified: trunk/blender/source/nan_compile.mk
> ===================================================================
> --- trunk/blender/source/nan_compile.mk	2007-12-13 21:10:00 UTC (rev 12873)
> +++ trunk/blender/source/nan_compile.mk	2007-12-13 22:36:10 UTC (rev 12874)
> @@ -184,7 +184,8 @@
>      REL_CFLAGS	+= -O1
>      REL_CCFLAGS += -O1
>      NAN_DEPEND = true
> -  ifeq ($(CPU),sparc)
> +  #ifeq ($(CPU),sparc)
> +   ifeq ($(CPU),$(findstring $(CPU), "sparc"))
>      OPENGL_HEADERS = /usr/openwin/share/include
>      CPPFLAGS += -DSUN_OGL_NO_VERTEX_MACROS
>      JAVA_HEADERS = /usr/java/include
> 
> Modified: trunk/blender/source/nan_definitions.mk
> ===================================================================
> --- trunk/blender/source/nan_definitions.mk	2007-12-13 21:10:00 UTC (rev 12873)
> +++ trunk/blender/source/nan_definitions.mk	2007-12-13 22:36:10 UTC (rev 12874)
> @@ -142,7 +142,9 @@
>  			endif
>          else
>            ifeq ($(OS), solaris)
> -              export NAN_OPENEXR ?= /usr/local
> +              # this only exists at the moment for i386-64 CPU Types at the moment
> +              export NAN_OPENEXR ?= $(LCGDIR)/openexr
> +
>                export NAN_OPENEXR_LIBS ?= $(NAN_OPENEXR)/lib/libIlmImf.a $(NAN_OPENEXR)/lib/libHalf.a $(NAN_OPENEXR)/lib/libIex.a $(NAN_OPENEXR)/lib/libIlmThread.a -lrt
>            else
>              export NAN_OPENEXR ?= /usr/local
> @@ -469,8 +471,8 @@
>  
>      export ID = $(shell /usr/ucb/whoami)
>      export HOST = $(shell hostname)
> -    export NAN_PYTHON ?= /usr/local
> -    export NAN_PYTHON_VERSION ?= 2.3
> +    export NAN_PYTHON ?= $(LCGDIR)/python
> +    export NAN_PYTHON_VERSION ?= 2.5
>      export NAN_PYTHON_BINARY ?= $(NAN_PYTHON)/bin/python$(NAN_PYTHON_VERSION)
>      export NAN_PYTHON_LIB ?= $(NAN_PYTHON)/lib/python$(NAN_PYTHON_VERSION)/config/libpython$(NAN_PYTHON_VERSION).a
>      export NAN_OPENAL ?= $(LCGDIR)/openal 
> 
> Modified: trunk/blender/source/nan_link.mk
> ===================================================================
> --- trunk/blender/source/nan_link.mk	2007-12-13 21:10:00 UTC (rev 12873)
> +++ trunk/blender/source/nan_link.mk	2007-12-13 22:36:10 UTC (rev 12874)
> @@ -117,9 +117,9 @@
>  endif
>  
>  ifeq ($(OS),solaris)
> -    ifeq ($(CPU), i386)
> -        LLIBS = -L/usr/X11/lib
> -    endif 
> +    ifeq (i386, $(findstring i386, $(CPU)))
> +        LLIBS = -L/usr/X11/lib -lrt
> +    endif
>      LLIBS += -lGLU -lGL -lXmu -lXext -lXi -lX11 -lc -lm -ldl -lsocket -lnsl
>      DYNLDFLAGS = -shared $(LDFLAGS)
>  endif
> 
> Modified: trunk/blender/source/tools/guess/guessconfig
> ===================================================================
> --- trunk/blender/source/tools/guess/guessconfig	2007-12-13 21:10:00 UTC (rev 12873)
> +++ trunk/blender/source/tools/guess/guessconfig	2007-12-13 22:36:10 UTC (rev 12874)
> @@ -1,4 +1,4 @@
> -#!/bin/sh
> +#!/bin/bash
>  #
>  # $Id$
>  #
> @@ -75,6 +75,12 @@
>      rm -f $dummy.c $dummy
>  fi
>  
> +# Patch Solaris
> +if [ "$OS" = "solaris" ]; then
> +    # will be 32 or 64, just adds the address space to the cpu
> +    CPU=$CPU-`isainfo -b`
> +fi
> +
>  # Patch Windows
>  if [ "$OS" = "cygwin" ]; then
>      OS="windows"
> 
> 
> _______________________________________________
> Bf-blender-cvs mailing list
> Bf-blender-cvs at blender.org
> http://lists.blender.org/mailman/listinfo/bf-blender-cvs
>