diff options
| author | Rene Engelhard <rene@openoffice.org> | 2010-05-05 13:18:49 +0200 |
|---|---|---|
| committer | Rene Engelhard <rene@openoffice.org> | 2010-05-05 13:18:49 +0200 |
| commit | 7e7496bceecb366e9edaf885d41ece736218ceb5 (patch) | |
| tree | 286dca33d97b2556f7f85745fdfc32ffb48289a7 /odk | |
| parent | e91dde17f239ac9aa2f5ee49333ff9dbeb091995 (diff) | |
kfreebsdport01v2: fix odks settings.mk to add kfreebsd support and add amd64. Remove obsolete gcc version check
Diffstat (limited to 'odk')
| -rw-r--r-- | odk/settings/settings.mk | 31 |
1 files changed, 25 insertions, 6 deletions
diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk index 3f84612e48c3..f03deaf7fa1d 100644 --- a/odk/settings/settings.mk +++ b/odk/settings/settings.mk @@ -498,13 +498,37 @@ ifneq (,$(findstring freebsd,$(PLATFORM))) PROCTYPE := $(shell $(PRJ)/config.guess | cut -d"-" -f1) -# Default is freebsd on a intel machine +ifeq (kfreebsd,$(findstring kfreebsd,$(PLATFORM))) +PLATFORM=kfreebsd +ifeq "$(PROCTYPE)" "x86_64" +PACKAGE_LIB_DIR=kfreebsd_x86_64.plt +UNOPKG_PLATFORM=kFreeBSD_x86_64 +else +PACKAGE_LIB_DIR=kfreebsd_x86.plt +UNOPKG_PLATFORM=kFreeBSD_x86 +endif +else PLATFORM=freebsd +ifeq "$(PROCTYPE)" "x86_64" +PACKAGE_LIB_DIR=freebsd_x86_64.plt +UNOPKG_PLATFORM=FreeBSD_x86_64 +else PACKAGE_LIB_DIR=freebsd_x86.plt UNOPKG_PLATFORM=FreeBSD_x86 +endif +endif + +ifeq "$(PROCTYPE)" "x86_64" +JAVA_PROC_TYPE=amd64 +else JAVA_PROC_TYPE=i386 +endif +ifeq (kfreebsd,$(findstring kfreebsd,$(PLATFORM))) +OS=LINUX +else OS=FREEBSD +endif PS=/ ICL=\$$ CC=gcc @@ -520,13 +544,8 @@ SHAREDLIB_OUT=$(OUT_LIB) GCC_VERSION=$(shell $(CC) -dumpversion) -ifeq "$(shell echo $(GCC_VERSION) | cut -c 1)" "3" COMID=gcc3 CPPU_ENV=gcc3 -else -COMID=GCC -CPPU_ENV=gcc2 -endif OSEP=\< CSEP=\> |