You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by hi...@apache.org on 2010/06/28 09:57:53 UTC
svn commit: r958493 - in /harmony/enhanced/java/trunk/classlib:
depends/build/platform/zos.s390.mk depends/build/platform/zos.s390x.mk
modules/archive/src/main/native/zip/unix/makefile
modules/luni/src/main/native/hyzip/unix/makefile
Author: hindessm
Date: Mon Jun 28 07:57:53 2010
New Revision: 958493
URL: http://svn.apache.org/viewvc?rev=958493&view=rev
Log:
Use the AREXTRACT make variable and override it on z/OS. Thanks to
Jim Yu for pointing out that z/OS build was broken.
Modified:
harmony/enhanced/java/trunk/classlib/depends/build/platform/zos.s390.mk
harmony/enhanced/java/trunk/classlib/depends/build/platform/zos.s390x.mk
harmony/enhanced/java/trunk/classlib/modules/archive/src/main/native/zip/unix/makefile
harmony/enhanced/java/trunk/classlib/modules/luni/src/main/native/hyzip/unix/makefile
Modified: harmony/enhanced/java/trunk/classlib/depends/build/platform/zos.s390.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/depends/build/platform/zos.s390.mk?rev=958493&r1=958492&r2=958493&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/depends/build/platform/zos.s390.mk (original)
+++ harmony/enhanced/java/trunk/classlib/depends/build/platform/zos.s390.mk Mon Jun 28 07:57:53 2010
@@ -52,3 +52,6 @@ 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/trunk/classlib/depends/build/platform/zos.s390x.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/depends/build/platform/zos.s390x.mk?rev=958493&r1=958492&r2=958493&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/depends/build/platform/zos.s390x.mk (original)
+++ harmony/enhanced/java/trunk/classlib/depends/build/platform/zos.s390x.mk Mon Jun 28 07:57:53 2010
@@ -52,3 +52,6 @@ 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/trunk/classlib/modules/archive/src/main/native/zip/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/archive/src/main/native/zip/unix/makefile?rev=958493&r1=958492&r2=958493&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/archive/src/main/native/zip/unix/makefile (original)
+++ harmony/enhanced/java/trunk/classlib/modules/archive/src/main/native/zip/unix/makefile Mon Jun 28 07:57:53 2010
@@ -27,6 +27,6 @@ BUILDFILES = $(SHAREDSUB)zcpool.o $(SHAR
LIBNAME = $(LIBPATH)libhyzip.a
%.o: $(LIBPATH)libhypool.a(%.o)
- ar $(ARFLAGS) xo $(LIBPATH)libhypool.a $@
+ ar $(ARFLAGS) $(AREXTRACT) $(LIBPATH)libhypool.a $@
include $(HY_HDK)/build/make/rules.mk
Modified: harmony/enhanced/java/trunk/classlib/modules/luni/src/main/native/hyzip/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/luni/src/main/native/hyzip/unix/makefile?rev=958493&r1=958492&r2=958493&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/luni/src/main/native/hyzip/unix/makefile (original)
+++ harmony/enhanced/java/trunk/classlib/modules/luni/src/main/native/hyzip/unix/makefile Mon Jun 28 07:57:53 2010
@@ -25,6 +25,6 @@ BUILDFILES = $(SHAREDSUB)hyzip.o $(SHARE
LIBNAME = $(LIBPATH)libhyzip.a
%.o: $(LIBPATH)libhypool.a(%.o)
- ar $(ARFLAGS) xo $(LIBPATH)libhypool.a $@
+ ar $(ARFLAGS) $(AREXTRACT) $(LIBPATH)libhypool.a $@
include $(HY_HDK)/build/make/rules.mk