harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r950910 - in /harmony/enhanced/java/trunk/classlib: depends/build/ depends/build/platform/ modules/archive/src/main/native/zip/unix/ modules/luni/src/main/native/hyzip/unix/
Date Thu, 03 Jun 2010 08:16:19 GMT
Author: hindessm
Date: Thu Jun  3 08:16:18 2010
New Revision: 950910

URL: http://svn.apache.org/viewvc?rev=950910&view=rev
Log:
RefaChange ASFLAGS to really be just the flags and then fix 'ar xo' on aix.

Modified:
    harmony/enhanced/java/trunk/classlib/depends/build/defines.mk
    harmony/enhanced/java/trunk/classlib/depends/build/platform/aix.ppc32.mk
    harmony/enhanced/java/trunk/classlib/depends/build/platform/aix.ppc64.mk
    harmony/enhanced/java/trunk/classlib/depends/build/rules.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/defines.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/depends/build/defines.mk?rev=950910&r1=950909&r2=950910&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/depends/build/defines.mk (original)
+++ harmony/enhanced/java/trunk/classlib/depends/build/defines.mk Thu Jun  3 08:16:18 2010
@@ -24,7 +24,9 @@ CPP = $(CC) -E
 AS = as
 AR = ar
 RANLIB=echo
-ARFLAGS = rcv
+ARFLAGS =
+ARCREATE = rcv
+AREXTRACT = xo
 DLL_LD = $(CC)
 DLL_LDFLAGS = -shared -Wl,-soname=$(@F) -Wl,--version-script,$(EXPFILE)
 CXX_DLL_LD = $(CXX)

Modified: harmony/enhanced/java/trunk/classlib/depends/build/platform/aix.ppc32.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/depends/build/platform/aix.ppc32.mk?rev=950910&r1=950909&r2=950910&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/depends/build/platform/aix.ppc32.mk (original)
+++ harmony/enhanced/java/trunk/classlib/depends/build/platform/aix.ppc32.mk Thu Jun  3 08:16:18
2010
@@ -25,7 +25,7 @@ WARNFLAGS =
 HYDEBUGCFLAGS = -g -O0
 HYRELEASEFLAGS = -s -O3 -DNDEBUG
 
-ARFLAGS = -X32 rcv
+ARFLAGS = -X32
 ASFLAGS += -a32 -mppc
 DLL_LD = $(LD)
 DLL_LDFLAGS = -bE:$(EXPFILE)

Modified: harmony/enhanced/java/trunk/classlib/depends/build/platform/aix.ppc64.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/depends/build/platform/aix.ppc64.mk?rev=950910&r1=950909&r2=950910&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/depends/build/platform/aix.ppc64.mk (original)
+++ harmony/enhanced/java/trunk/classlib/depends/build/platform/aix.ppc64.mk Thu Jun  3 08:16:18
2010
@@ -25,7 +25,7 @@ WARNFLAGS =
 HYDEBUGCFLAGS = -g -O0
 HYRELEASEFLAGS = -s -O3 -DNDEBUG
 
-ARFLAGS = -X64 rcv
+ARFLAGS = -X64
 ASFLAGS += -a64 -many
 DLL_LD = $(LD)
 DLL_LDFLAGS = -bE:$(EXPFILE)

Modified: harmony/enhanced/java/trunk/classlib/depends/build/rules.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/depends/build/rules.mk?rev=950910&r1=950909&r2=950910&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/depends/build/rules.mk (original)
+++ harmony/enhanced/java/trunk/classlib/depends/build/rules.mk Thu Jun  3 08:16:18 2010
@@ -37,7 +37,7 @@ endif
 all: $(DLLNAME) $(EXENAME) $(LIBNAME)
 
 $(LIBNAME): $(BUILDFILES)
-	$(AR) $(ARFLAGS) $@ $(BUILDFILES)
+	$(AR) $(ARFLAGS) $(ARCREATE) $@ $(BUILDFILES)
 	$(RANLIB) $@
 
 $(EXPFILE): exports.txt

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=950910&r1=950909&r2=950910&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
Thu Jun  3 08:16:18 2010
@@ -27,6 +27,6 @@ BUILDFILES = $(SHAREDSUB)zcpool.o $(SHAR
 LIBNAME = $(LIBPATH)libhyzip.a
 
 %.o: $(LIBPATH)libhypool.a(%.o)
-	ar xo $(LIBPATH)libhypool.a $@
+	ar $(ARFLAGS) xo $(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=950910&r1=950909&r2=950910&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
Thu Jun  3 08:16:18 2010
@@ -25,6 +25,6 @@ BUILDFILES = $(SHAREDSUB)hyzip.o $(SHARE
 LIBNAME = $(LIBPATH)libhyzip.a
 
 %.o: $(LIBPATH)libhypool.a(%.o)
-	ar xo $(LIBPATH)libhypool.a $@
+	ar $(ARFLAGS) xo $(LIBPATH)libhypool.a $@
 
 include $(HY_HDK)/build/make/rules.mk



Mime
View raw message