From dcda3d5bcfdaa79c34eaba04030eca7e8096d902 Mon Sep 17 00:00:00 2001 From: sheeple Date: Fri, 14 Mar 2008 01:36:30 -0500 Subject: [PATCH 1/2] Fix FreeBSD --- Makefile | 4 ++-- extra/io/unix/freebsd/freebsd.factor | 2 +- misc/_target | 20 ++++++++++++++++++++ misc/target | 9 ++++++--- 4 files changed, 29 insertions(+), 6 deletions(-) create mode 100755 misc/_target diff --git a/Makefile b/Makefile index 6f12633871..054d57b641 100755 --- a/Makefile +++ b/Makefile @@ -46,10 +46,10 @@ DLL_OBJS = $(PLAF_DLL_OBJS) \ EXE_OBJS = $(PLAF_EXE_OBJS) default: misc/wordsize - make `./misc/target` + $(MAKE) `./misc/target` help: - @echo "Run 'make' with one of the following parameters:" + @echo "Run '$(MAKE)' with one of the following parameters:" @echo "" @echo "freebsd-x86-32" @echo "freebsd-x86-64" diff --git a/extra/io/unix/freebsd/freebsd.factor b/extra/io/unix/freebsd/freebsd.factor index 2aad0bdb1a..65b4a6f0f7 100644 --- a/extra/io/unix/freebsd/freebsd.factor +++ b/extra/io/unix/freebsd/freebsd.factor @@ -1,5 +1,5 @@ IN: io.unix.freebsd -USING: io.unix.bsd io.backend core-foundation.fsevents ; +USING: io.unix.bsd io.backend ; TUPLE: freebsd-io ; diff --git a/misc/_target b/misc/_target new file mode 100755 index 0000000000..2be071c17d --- /dev/null +++ b/misc/_target @@ -0,0 +1,20 @@ +#!/bin/bash + +if [ \( `uname -s` = Darwin \) -a \( `uname -p` = powerpc \) ] +then + echo macosx-ppc +elif [ `uname -s` = Darwin ] +then + echo macosx-x86-`./misc/wordsize` +elif [ \( `uname -s` = Linux \) -a \( `uname -m` = i686 \) ] +then + echo linux-x86-32 +elif [ \( `uname -s` = Linux \) -a \( `uname -m` = x86_64 \) ] +then + echo linux-x86-64 +elif [ \( `uname -o` = Cygwin \) -a \( `uname -m` = i686 \) ] +then + echo winnt-x86-`./misc/wordsize` +else + echo help +fi \ No newline at end of file diff --git a/misc/target b/misc/target index 2be071c17d..880de8f47a 100755 --- a/misc/target +++ b/misc/target @@ -1,6 +1,9 @@ -#!/bin/bash +#!/bin/sh -if [ \( `uname -s` = Darwin \) -a \( `uname -p` = powerpc \) ] +if [ \( `uname -s ` = FreeBSD \) -a \( `uname -p` = i386 \) ] +then + echo freebsd-x86-32 +elif [ \( `uname -s` = Darwin \) -a \( `uname -p` = powerpc \) ] then echo macosx-ppc elif [ `uname -s` = Darwin ] @@ -17,4 +20,4 @@ then echo winnt-x86-`./misc/wordsize` else echo help -fi \ No newline at end of file +fi From f1ba5e8368f51c6b39b593407a6a2cca7fd5317a Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Fri, 14 Mar 2008 02:36:27 -0500 Subject: [PATCH 2/2] Remove obsolete file --- misc/_target | 20 -------------------- 1 file changed, 20 deletions(-) delete mode 100755 misc/_target diff --git a/misc/_target b/misc/_target deleted file mode 100755 index 2be071c17d..0000000000 --- a/misc/_target +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash - -if [ \( `uname -s` = Darwin \) -a \( `uname -p` = powerpc \) ] -then - echo macosx-ppc -elif [ `uname -s` = Darwin ] -then - echo macosx-x86-`./misc/wordsize` -elif [ \( `uname -s` = Linux \) -a \( `uname -m` = i686 \) ] -then - echo linux-x86-32 -elif [ \( `uname -s` = Linux \) -a \( `uname -m` = x86_64 \) ] -then - echo linux-x86-64 -elif [ \( `uname -o` = Cygwin \) -a \( `uname -m` = i686 \) ] -then - echo winnt-x86-`./misc/wordsize` -else - echo help -fi \ No newline at end of file