[prev in list] [next in list] [prev in thread] [next in thread] 

List:       openjdk-build-dev
Subject:    Re: RFR: 8058756: OpenJDK builds fail on Windows - cannot copy freetype.dll
From:       Erik Joelsson <erik.joelsson () oracle ! com>
Date:       2014-09-22 6:56:10
Message-ID: 541FC80A.8020004 () oracle ! com
[Download RAW message or body]

Thanks!

Install-file is the pattern we normally use.

/Erik

On 2014-09-19 20:06, Phil Race wrote:
> I had considered that but thought that mkdir was more obvious.
> I've tried $(install-file) and it seems to work too .. so if that's what
> people prefer I'll use that (as below).
>
> -phil.
>
>
> hg diff make/copy/Copy-java.desktop.gmk
> diff --git a/make/copy/Copy-java.desktop.gmk 
> b/make/copy/Copy-java.desktop.gmk
> --- a/make/copy/Copy-java.desktop.gmk
> +++ b/make/copy/Copy-java.desktop.gmk
> @@ -68,7 +68,7 @@
>    endif
>
>    $(FREETYPE_TARGET_LIB): $(FREETYPE_BUNDLE_LIB_PATH)/$(call 
> SHARED_LIBRARY,freetype)
> -    $(CP) $(FREETYPE_BUNDLE_LIB_PATH)/$(call SHARED_LIBRARY,freetype) $@
> +    $(install-file)
>          ifeq ($(OPENJDK_BUILD_OS), windows)
>        $(CHMOD) +rx $@
>          endif
>
> On 09/19/2014 01:12 AM, Andrew Haley wrote:
>> On 19/09/14 08:30, Erik Joelsson wrote:
>>> I've noticed this problem too but never got around to fix it. The 
>>> fix is
>>> OK, but I would prefer just replacing the CP line with $(install-file),
>>> which will also avoid the duplicated source file definition.
>> Either is fine by me.  I don't have a Windows box to test this on right
>> now, but if it builds OK please push this.
>>
>> Andrew.
>>
>

[prev in list] [next in list] [prev in thread] [next in thread]