Thread: [Stlport-cvs] STLport/build/Makefiles/gmake sysid.mak,STLPORT_5_0,1.1.2.4,1.1.2.5 targetdirs.mak,STL
Brought to you by:
complement
From: Petr O. <com...@us...> - 2005-09-11 06:27:46
|
Update of /cvsroot/stlport/STLport/build/Makefiles/gmake In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20375/build/Makefiles/gmake Modified Files: Tag: STLPORT_5_0 sysid.mak targetdirs.mak Log Message: hosting machine and target platform are different Index: sysid.mak =================================================================== RCS file: /cvsroot/stlport/STLport/build/Makefiles/gmake/sysid.mak,v retrieving revision 1.1.2.4 retrieving revision 1.1.2.5 diff -u -d -r1.1.2.4 -r1.1.2.5 --- sysid.mak 15 Aug 2005 14:03:59 -0000 1.1.2.4 +++ sysid.mak 11 Sep 2005 06:27:35 -0000 1.1.2.5 @@ -1,4 +1,4 @@ -# Time-stamp: <04/03/17 15:37:53 ptr> +# Time-stamp: <05/09/09 20:39:43 ptr> # $Id$ ifndef BUILD_DATE @@ -31,12 +31,8 @@ P_ARCH := $(shell uname -p | tr '[A-Z]' '[a-z]' | tr ', /\\()"' ',//////' | tr ',/' ',-') endif -ifeq ($(OSNAME),freebsd) -OSREL_MAJOR := $(shell echo ${OSREL} | tr '.-' ' ' | awk '{print $$1;}') -OSREL_MINOR := $(shell echo ${OSREL} | tr '.-' ' ' | awk '{print $$2;}') -endif - else +# TARGET_OS defined, cross compilation assumed ifndef (mwccnlm,$(COMPILER_NAME)) OSNAME := $(shell echo ${TARGET_OS} | sed 's/^[a-z0-9]\+-[a-z0-9]\+-\([a-z]\+\).*/\1/' ) OSREL := $(shell echo ${TARGET_OS} | sed 's/^[[:alnum:]]\+-[a-z0-9]\+-[a-z]\+\([a-zA-Z.0-9]*\).*/\1/' ) @@ -48,6 +44,7 @@ M_ARCH := i386 P_ARCH := unknown endif +# TARGET_OS endif NODENAME := $(shell uname -n | tr '[A-Z]' '[a-z]' ) @@ -64,4 +61,27 @@ BUILD_SYSTEM := $(shell echo `uname -n` `uname -s` `uname -r` `uname -v` `uname -m` $$USER) BUILD_DATE := $(shell date +'%Y/%m/%d %T %Z') +BUILD_OSNAME := $(shell uname -s | tr '[A-Z]' '[a-z]' | tr ', /\\()"' ',//////' | tr ',/' ',-') + +# RedHat use nonstandard options for uname at least in cygwin, +# macro should be overwritten: +ifeq (cygwin,$(findstring cygwin,$(BUILD_OSNAME))) +BUILD_OSNAME := cygming +BUILD_OSREALNAME := $(shell uname -o | tr '[A-Z]' '[a-z]' | tr ', /\\()"' ',//////' | tr ',/' ',-') +endif + +ifeq (mingw,$(findstring mingw,$(BUILD_OSNAME))) +BUILD_OSNAME := cygming +BUILD_OSREALNAME := mingw +endif + +BUILD_OSREL := $(shell uname -r | tr '[A-Z]' '[a-z]' | tr ', /\\()"' ',//////' | tr ',/' ',-') +BUILD_M_ARCH := $(shell uname -m | tr '[A-Z]' '[a-z]' | tr ', /\\()"' ',//////' | tr ',/' ',-') +ifeq ($(OSNAME),hp-ux) +BUILD_P_ARCH := unknown +else +BUILD_P_ARCH := $(shell uname -p | tr '[A-Z]' '[a-z]' | tr ', /\\()"' ',//////' | tr ',/' ',-') +endif + +# end of BUILD_DATE not defined endif Index: targetdirs.mak =================================================================== RCS file: /cvsroot/stlport/STLport/build/Makefiles/gmake/targetdirs.mak,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -u -d -r1.1.2.3 -r1.1.2.4 --- targetdirs.mak 4 Sep 2005 18:16:49 -0000 1.1.2.3 +++ targetdirs.mak 11 Sep 2005 06:27:35 -0000 1.1.2.4 @@ -1,4 +1,4 @@ -# Time-stamp: <05/03/02 18:44:41 ptr> +# Time-stamp: <05/09/09 22:00:37 ptr> # $Id$ ifdef TARGET_OS @@ -55,7 +55,7 @@ PHONY += $(OUTPUT_DIRS) $(INSTALL_DIRS) $(OUTPUT_DIRS): - @if /usr/bin/test -e $@ -a -f $@ ; then \ + @if ${EXT_TEST} -e $@ -a -f $@ ; then \ echo "ERROR: Regular file $@ present, directory instead expected" ; \ exit 1; \ elif [ ! -d $@ ] ; then \ @@ -63,7 +63,7 @@ fi $(INSTALL_DIRS): - @if /usr/bin/test -e $@ -a -f $@ ; then \ + @if ${EXT_TEST} -e $@ -a -f $@ ; then \ echo "ERROR: Regular file $@ present, directory instead expected" ; \ exit 1; \ elif [ ! -d $@ ] ; then \ |