You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by od...@apache.org on 2009/06/26 13:09:31 UTC
svn commit: r788654 - in /harmony/enhanced/classlib/trunk/modules:
archive/src/main/native/archive/windows/ auth/src/main/native/auth/windows/
instrument/src/main/native/instrument/windows/
misc/src/main/native/accessors/windows/ nio/src/main/native/ni...
Author: odeakin
Date: Fri Jun 26 11:09:30 2009
New Revision: 788654
URL: http://svn.apache.org/viewvc?rev=788654&view=rev
Log:
Remove fdlibm links where they are unnecessary in Windows makefiles, fixing Windows build broken by r788490. Also add missing link to vmi lib for nio_char module.
Modified:
harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/windows/makefile
harmony/enhanced/classlib/trunk/modules/auth/src/main/native/auth/windows/makefile
harmony/enhanced/classlib/trunk/modules/instrument/src/main/native/instrument/windows/makefile
harmony/enhanced/classlib/trunk/modules/misc/src/main/native/accessors/windows/makefile
harmony/enhanced/classlib/trunk/modules/nio/src/main/native/nio/windows/makefile
harmony/enhanced/classlib/trunk/modules/nio_char/src/main/native/niochar/windows/makefile
Modified: harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/windows/makefile?rev=788654&r1=788653&r2=788654&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/windows/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/windows/makefile Fri Jun 26 11:09:30 2009
@@ -43,7 +43,7 @@
MDLLIBFILES = $(MDLLIBFILES) \
$(LIBPATH)hyzlib$(HY_LINKLIB_SUFFIX) \
$(LIBPATH)hypool$(HY_LINKLIB_SUFFIX) \
- $(LIBPATH)hyfdlibm$(HY_LINKLIB_SUFFIX) $(LIBPATH)vmi$(HY_LINKLIB_SUFFIX)
+ $(LIBPATH)vmi$(HY_LINKLIB_SUFFIX)
DLLBASE=0x13100000
!include <$(HY_HDK)\build\make\rules.mak>
Modified: harmony/enhanced/classlib/trunk/modules/auth/src/main/native/auth/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/auth/src/main/native/auth/windows/makefile?rev=788654&r1=788653&r2=788654&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/auth/src/main/native/auth/windows/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/auth/src/main/native/auth/windows/makefile Fri Jun 26 11:09:30 2009
@@ -34,7 +34,7 @@
!ENDIF
MDLLIBFILES = $(MDLLIBFILES) $(LIBPATH)hypool$(HY_LINKLIB_SUFFIX) \
- $(LIBPATH)hyfdlibm$(HY_LINKLIB_SUFFIX) $(LIBPATH)vmi$(HY_LINKLIB_SUFFIX)
+ $(LIBPATH)vmi$(HY_LINKLIB_SUFFIX)
DLLBASE=0x1300000
COMMENT=/comment:"Auth component native code. (c) Copyright 2005, 2007 The Apache Software Foundation or its licensors, as applicable."
Modified: harmony/enhanced/classlib/trunk/modules/instrument/src/main/native/instrument/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/instrument/src/main/native/instrument/windows/makefile?rev=788654&r1=788653&r2=788654&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/instrument/src/main/native/instrument/windows/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/instrument/src/main/native/instrument/windows/makefile Fri Jun 26 11:09:30 2009
@@ -37,7 +37,7 @@
!ENDIF
MDLLIBFILES = $(MDLLIBFILES) $(LIBPATH)hypool$(HY_LINKLIB_SUFFIX) \
- $(LIBPATH)hyfdlibm$(HY_LINKLIB_SUFFIX) $(LIBPATH)vmi$(HY_LINKLIB_SUFFIX)
+ $(LIBPATH)vmi$(HY_LINKLIB_SUFFIX)
DLLBASE=0x13200000
COMMENT=/comment:"instrument component native code. (c) Copyright 2006, 2008 The Apache Software Foundation or its licensors, as applicable."
Modified: harmony/enhanced/classlib/trunk/modules/misc/src/main/native/accessors/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/misc/src/main/native/accessors/windows/makefile?rev=788654&r1=788653&r2=788654&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/misc/src/main/native/accessors/windows/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/misc/src/main/native/accessors/windows/makefile Fri Jun 26 11:09:30 2009
@@ -30,7 +30,7 @@
SYSLIBFILES = ws2_32.lib Iphlpapi.lib
MDLLIBFILES = $(MDLLIBFILES) \
- $(LIBPATH)hypool$(HY_LINKLIB_SUFFIX) $(LIBPATH)hyfdlibm$(HY_LINKLIB_SUFFIX) $(LIBPATH)vmi$(HY_LINKLIB_SUFFIX)
+ $(LIBPATH)hypool$(HY_LINKLIB_SUFFIX) $(LIBPATH)vmi$(HY_LINKLIB_SUFFIX)
DLLBASE=0x13300000
COMMENT=/comment:"Accessors native code. (c) Copyright 2006, 2008 The Apache Software Foundation or its licensors, as applicable."
Modified: harmony/enhanced/classlib/trunk/modules/nio/src/main/native/nio/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/nio/src/main/native/nio/windows/makefile?rev=788654&r1=788653&r2=788654&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/nio/src/main/native/nio/windows/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/nio/src/main/native/nio/windows/makefile Fri Jun 26 11:09:30 2009
@@ -37,7 +37,7 @@
!ENDIF
MDLLIBFILES = $(LIBPATH)hycommon$(HY_LINKLIB_SUFFIX) \
- $(LIBPATH)hypool$(HY_LINKLIB_SUFFIX) $(LIBPATH)hyfdlibm$(HY_LINKLIB_SUFFIX) \
+ $(LIBPATH)hypool$(HY_LINKLIB_SUFFIX) \
$(LIBPATH)hythr$(HY_LINKLIB_SUFFIX) $(LIBPATH)vmi$(HY_LINKLIB_SUFFIX)
DLLBASE=0x13200000
Modified: harmony/enhanced/classlib/trunk/modules/nio_char/src/main/native/niochar/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/nio_char/src/main/native/niochar/windows/makefile?rev=788654&r1=788653&r2=788654&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/nio_char/src/main/native/niochar/windows/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/nio_char/src/main/native/niochar/windows/makefile Fri Jun 26 11:09:30 2009
@@ -119,6 +119,7 @@
VIRTFILES = hynio_char.res
+MDLLIBFILES = $(MDLLIBFILES) $(LIBPATH)vmi$(HY_LINKLIB_SUFFIX)
DLLBASE=0x13200000
COMMENT=/comment:"nio_char component native code. (c) Copyright 1991, 2008 The Apache Software Foundation or its licensors, as applicable."
Re: svn commit: r788654 - in /harmony/enhanced/classlib/trunk/modules:
archive/src/main/native/archive/windows/ auth/src/main/native/auth/windows/
instrument/src/main/native/instrument/windows/ misc/src/main/native/accessors/windows/
nio/src/main/native/ni...
Posted by Oliver Deakin <ol...@googlemail.com>.
No problem Mark!
I was seeing a missing symbol reported [1] when we linked the nio_char
library, but because we use the /FORCE:UNRESOLVED option we went ahead
with the link anyway and built the libraries, hence did not get a build
break for this. I did not see any runtime failure from this, but I
wouldn't expect to unless I used the particular charset with the failing
symbol (GB18030).
Is there a particular reason we use the /FORCE:UNRESOLVED option? It
feels like it might do more harm than good...
Regards,
Oliver
[1] GB18030.obj : error LNK2019: unresolved external symbol
_VMI_GetVMIFromJNIEnv@4 referenced in function _unLinear
Mark Hindess wrote:
> Thanks Oliver!
>
> Oops. I meant to fix the windows makefiles before checking in the
> luni/build.xml guess it slipped my mind.
>
> BTW, what was the effect of the missing vmi link for nio_char?
>
> Regards,
> -Mark.
>
> In message <20...@eris.apache.org>, odeakin@apache.org
> writes:
>
>> Author: odeakin
>> Date: Fri Jun 26 11:09:30 2009
>> New Revision: 788654
>>
>> URL: http://svn.apache.org/viewvc?rev=788654&view=rev
>> Log:
>> Remove fdlibm links where they are unnecessary in Windows makefiles, fixing W
>> indows build broken by r788490. Also add missing link to vmi lib for nio_char
>> module.
>>
>
>
>
>
>
--
Oliver Deakin
Unless stated otherwise above:
IBM United Kingdom Limited - Registered in England and Wales with number 741598.
Registered office: PO Box 41, North Harbour, Portsmouth, Hampshire PO6 3AU
Re: svn commit: r788654 - in /harmony/enhanced/classlib/trunk/modules: archive/src/main/native/archive/windows/ auth/src/main/native/auth/windows/ instrument/src/main/native/instrument/windows/ misc/src/main/native/accessors/windows/ nio/src/main/native/ni...
Posted by Mark Hindess <ma...@googlemail.com>.
Thanks Oliver!
Oops. I meant to fix the windows makefiles before checking in the
luni/build.xml guess it slipped my mind.
BTW, what was the effect of the missing vmi link for nio_char?
Regards,
-Mark.
In message <20...@eris.apache.org>, odeakin@apache.org
writes:
>
> Author: odeakin
> Date: Fri Jun 26 11:09:30 2009
> New Revision: 788654
>
> URL: http://svn.apache.org/viewvc?rev=788654&view=rev
> Log:
> Remove fdlibm links where they are unnecessary in Windows makefiles, fixing W
> indows build broken by r788490. Also add missing link to vmi lib for nio_char
> module.