jdk: Path corrections (utils & cups)

[Greg Lewis]

On Mon, Jan 12, 2009 at 03:47:26PM -0500, Kurt Miller wrote:
> The following diff cleans up paths for utils defined Def-utils.gmk
> as well as setting the correct default cups headers path for Apple.
> 
> I have tested it on OpenBSD and FreeBSD but I don't have OS X on
> x86 to do a test build. However, I carefully checked the paths on
> my Lepoard/ppc laptop to ensure they are correct for Apple too.

They look right for Leopard/x86 too, although I haven't had time to
try them.

> - Set DEVTOOLS_PATH to $(PACKAGE_PATH)/bin/ which is the correct
>   location for tools that don't come preinstalled with the platform.

D'oh, I always thought this was the path to gcc/g++, but you're right.

> - Set _CUPS_HEADERS_PATH correctly for Apple which comes
>   with cups.
> - Set up full paths to utils defined in Defs-utils.gmk
>   for bsd with exceptions for OS_VENDOR differences.

Looks good.  Minor comments below.

> --- a/make/common/shared/Defs-utils.gmk	Sat Jan 10 22:13:03 2009 -0500
> +++ b/make/common/shared/Defs-utils.gmk	Sun Jan 11 21:30:19 2009 -0500
> @@ -64,6 +64,13 @@
>    UTILS_COMMAND_PATH=$(UNIXCOMMAND_PATH)
>    UTILS_USR_BIN_PATH=$(UNIXCOMMAND_PATH)
>    UTILS_CCS_BIN_PATH=$(UNIXCOMMAND_PATH)
> +  UTILS_DEVTOOL_PATH=$(DEVTOOLS_PATH)
> +endif
> +
> +ifeq ($(PLATFORM),bsd)
> +  UTILS_COMMAND_PATH=$(UNIXCOMMAND_PATH)
> +  UTILS_USR_BIN_PATH=$(USRBIN_PATH)
> +  UTILS_CCS_BIN_PATH=$(USRBIN_PATH)
>    UTILS_DEVTOOL_PATH=$(DEVTOOLS_PATH)
>  endif
>  
> @@ -202,6 +209,32 @@
>  endif
>  
>  # BSD specific
> -ifeq ($(SYSTEM_UNAME),Darwin)
> -  NAWK = $(USRBIN_PATH)awk
> +ifeq ($(PLATFORM),bsd)
> +  BASENAME     = $(UTILS_USR_BIN_PATH)basename
> +  EGREP        = $(UTILS_USR_BIN_PATH)egrep
> +  EXPR         = $(UTILS_COMMAND_PATH)expr
> +  FMT          = $(UTILS_USR_BIN_PATH)fmt
> +  GREP         = $(UTILS_USR_BIN_PATH)grep
> +  GUNZIP       = $(UTILS_USR_BIN_PATH)gunzip
> +  ID           = $(UTILS_USR_BIN_PATH)id
> +  MSGFMT       = $(UTILS_DEVTOOL_PATH)msgfmt
> +  SED          = $(UTILS_USR_BIN_PATH)sed
> +  SORT         = $(UTILS_USR_BIN_PATH)sort
> +  TEST         = $(UTILS_COMMAND_PATH)test
> +  TOUCH        = $(UTILS_USR_BIN_PATH)touch
> +  TRUE         = $(UTILS_USR_BIN_PATH)true
> +  UNAME        = $(UTILS_USR_BIN_PATH)uname
> +  # BSD OS_VENDOR specific
> +  ifeq ($(OS_VENDOR), Apple)
> +    NAWK       = $(UTILS_USR_BIN_PATH)awk
> +    UNZIP      = $(UTILS_USR_BIN_PATH)unzip

NAWK and UNZIP for Apple are the same as the default, so they don't need
to be overridden.

> +    UNZIPSFX   = $(UTILS_USR_BIN_PATH)unzipsfx
> +    ZIP        = $(UTILS_USR_BIN_PATH)zip

This should be ZIPEXE based on the default variables.

> +  else
> +    UNZIP      = $(UTILS_DEVTOOL_PATH)unzip
> +  endif
> +  ifneq ($(OS_VENDOR), OpenBSD)
> +    CPIO       = $(UTILS_USR_BIN_PATH)cpio
> +    TAR        = $(UTILS_USR_BIN_PATH)tar
> +  endif
>  endif

-- 
Greg Lewis                          Email   : glewis at eyesbeyond.com
Eyes Beyond                         Web     : http://www.eyesbeyond.com
Information Technology              FreeBSD : glewis at FreeBSD.org