harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r979564 - in /harmony/enhanced/java/branches/java6: ./ classlib/ classlib/depends/build/platform/ classlib/depends/libs/ classlib/modules/archive/src/main/native/archive/unix/ drlvm/ jdktools/
Date Tue, 27 Jul 2010 07:32:27 GMT
Author: hindessm
Date: Tue Jul 27 07:32:27 2010
New Revision: 979564

URL: http://svn.apache.org/viewvc?rev=979564&view=rev
Log:
Merge change from /harmony/enhanced/java/trunk@979545:

  r979545 | regisxu | 2010-07-27 06:52:11 +0100 (Tue, 27 Jul 2010) | 4 lines
  
  Fix build on z/OS.
  
  .so libraries should alse be placed in $(HY_HDK)/jdk/jre/bin, .x files
  will be moved to $(HY_HDK)/lib.


Modified:
    harmony/enhanced/java/branches/java6/   (props changed)
    harmony/enhanced/java/branches/java6/classlib/   (props changed)
    harmony/enhanced/java/branches/java6/classlib/depends/build/platform/zos.s390.mk
    harmony/enhanced/java/branches/java6/classlib/depends/build/platform/zos.s390x.mk
    harmony/enhanced/java/branches/java6/classlib/depends/libs/   (props changed)
    harmony/enhanced/java/branches/java6/classlib/modules/archive/src/main/native/archive/unix/makefile
    harmony/enhanced/java/branches/java6/drlvm/   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/   (props changed)

Propchange: harmony/enhanced/java/branches/java6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jul 27 07:32:27 2010
@@ -1,4 +1,4 @@
 /harmony/enhanced/java/branches/mrh:935751-941490
-/harmony/enhanced/java/trunk:929253-967074,967199,967211,967216,979280
+/harmony/enhanced/java/trunk:929253-967074,967199,967211,967216,979280,979545
 /harmony/enhanced/trunk:476395-929252
 /incubator/harmony/enhanced/trunk:292550-476394

Propchange: harmony/enhanced/java/branches/java6/classlib/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jul 27 07:32:27 2010
@@ -1,7 +1,7 @@
 /harmony/enhanced/classlib/trunk:713674-735919,765923-926091,926318-926838
 /harmony/enhanced/classlib/trunk/working_classlib:884014-884286
 /harmony/enhanced/java/branches/mrh/classlib:935751-941490
-/harmony/enhanced/java/trunk/classlib:929253-967074,967199,967211,967216,979280
+/harmony/enhanced/java/trunk/classlib:929253-967074,967199,967211,967216,979280,979545
 /harmony/enhanced/trunk/classlib:476395-929252
 /harmony/enhanced/trunk/working_classlib:476396-920147
 /incubator/harmony/enhanced/trunk/classlib:292550-476394

Modified: harmony/enhanced/java/branches/java6/classlib/depends/build/platform/zos.s390.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/depends/build/platform/zos.s390.mk?rev=979564&r1=979563&r2=979564&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/depends/build/platform/zos.s390.mk (original)
+++ harmony/enhanced/java/branches/java6/classlib/depends/build/platform/zos.s390.mk Tue Jul
27 07:32:27 2010
@@ -49,9 +49,5 @@ WARNFLAGS =
 # z/OS has different debug flags
 HYDEBUGCFLAGS = -g -O0
 
-# On z/OS set DLLPATH to LIBPATH so we link against .x export files in
-# $(HY_HDK)/lib instead of directly against the .so libraries.
-DLLPATH=$(LIBPATH)
-
 # AR doesn't support the 'o' option on z/OS so mtime will be updated
 AREXTRACT= x

Modified: harmony/enhanced/java/branches/java6/classlib/depends/build/platform/zos.s390x.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/depends/build/platform/zos.s390x.mk?rev=979564&r1=979563&r2=979564&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/depends/build/platform/zos.s390x.mk (original)
+++ harmony/enhanced/java/branches/java6/classlib/depends/build/platform/zos.s390x.mk Tue
Jul 27 07:32:27 2010
@@ -49,9 +49,5 @@ WARNFLAGS =
 # z/OS has different debug flags
 HYDEBUGCFLAGS = -g -O0
 
-# On z/OS set DLLPATH to LIBPATH so we link against .x export files in
-# $(HY_HDK)/lib instead of directly against the .so libraries.
-DLLPATH=$(LIBPATH)
-
 # AR doesn't support the 'o' option on z/OS so mtime will be updated
 AREXTRACT= x

Propchange: harmony/enhanced/java/branches/java6/classlib/depends/libs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jul 27 07:32:27 2010
@@ -1,4 +1,4 @@
 /harmony/enhanced/classlib/trunk/depends/libs:544451-926091
-/harmony/enhanced/java/trunk/classlib/depends/libs:929253-967074,967199,967211,967216,979280
+/harmony/enhanced/java/trunk/classlib/depends/libs:929253-967074,967199,967211,967216,979280,979545
 /harmony/enhanced/trunk/classlib/depends/libs:476395-929252
 /incubator/harmony/enhanced/trunk/classlib/depends/libs:292550-476394

Modified: harmony/enhanced/java/branches/java6/classlib/modules/archive/src/main/native/archive/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/archive/src/main/native/archive/unix/makefile?rev=979564&r1=979563&r2=979564&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/archive/src/main/native/archive/unix/makefile
(original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/archive/src/main/native/archive/unix/makefile
Tue Jul 27 07:32:27 2010
@@ -33,9 +33,15 @@ ifeq ($(HY_LOCAL_ZLIB),true)
 DEFINES += -DHY_LOCAL_ZLIB
 OSLIBS += -lz
 else
+
+ifeq ($(HY_OS),zos)
+MDLLIBZLIB += $(LIBPATH)libhyzlib$(HY_LINKLIB_SUFFIX)
+else
 MDLLIBZLIB += $(DLLPATH)libhyzlib$(HY_LINKLIB_SUFFIX)
 endif
 
+endif
+
 MDLLIBFILES += \
 	$(MDLLIBZLIB) $(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
 

Propchange: harmony/enhanced/java/branches/java6/drlvm/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jul 27 07:32:27 2010
@@ -1,5 +1,5 @@
 /harmony/enhanced/java/branches/mrh/drlvm:935751-941490
-/harmony/enhanced/java/trunk/drlvm:929253-967074,967199,967211,967216,979280
+/harmony/enhanced/java/trunk/drlvm:929253-967074,967199,967211,967216,979280,979545
 /harmony/enhanced/trunk/drlvm:476395-929252
 /harmony/enhanced/trunk/working_vm:476396-920147
 /incubator/harmony/enhanced/trunk/drlvm:292550-476394

Propchange: harmony/enhanced/java/branches/java6/jdktools/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jul 27 07:32:27 2010
@@ -1,4 +1,4 @@
-/harmony/enhanced/java/trunk/jdktools:929253-967074,967199,967211,967216,979280
+/harmony/enhanced/java/trunk/jdktools:929253-967074,967199,967211,967216,979280,979545
 /harmony/enhanced/jdktools/trunk:630107-925933
 /harmony/enhanced/trunk/jdktools:476395-929252
 /harmony/enhanced/trunk/working_jdktools:476396-920147



Mime
View raw message