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 2009/06/22 15:36:14 UTC
svn commit: r787234 - in /harmony/enhanced/classlib/trunk/depends/build: ./
platform/
Author: hindessm
Date: Mon Jun 22 13:36:14 2009
New Revision: 787234
URL: http://svn.apache.org/viewvc?rev=787234&view=rev
Log:
Moving platform specific defines in to platform make files.
Modified:
harmony/enhanced/classlib/trunk/depends/build/defines.mk
harmony/enhanced/classlib/trunk/depends/build/platform/linux.ia64.mk
harmony/enhanced/classlib/trunk/depends/build/platform/linux.ppc32.mk
harmony/enhanced/classlib/trunk/depends/build/platform/linux.ppc64.mk
harmony/enhanced/classlib/trunk/depends/build/platform/linux.s390.mk
harmony/enhanced/classlib/trunk/depends/build/platform/linux.s390x.mk
harmony/enhanced/classlib/trunk/depends/build/platform/linux.x86.mk
harmony/enhanced/classlib/trunk/depends/build/platform/linux.x86_64.mk
harmony/enhanced/classlib/trunk/depends/build/platform/macosx.ppc32.mk
harmony/enhanced/classlib/trunk/depends/build/platform/zos.s390.mk
harmony/enhanced/classlib/trunk/depends/build/platform/zos.s390x.mk
Modified: harmony/enhanced/classlib/trunk/depends/build/defines.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/depends/build/defines.mk?rev=787234&r1=787233&r2=787234&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/depends/build/defines.mk (original)
+++ harmony/enhanced/classlib/trunk/depends/build/defines.mk Mon Jun 22 13:36:14 2009
@@ -21,6 +21,7 @@
CPP = $(CC) -E
AS = as
AR = ar
+RANLIB=echo
ARFLAGS = rcv
DLL_LD = $(CC)
DLL_LDFLAGS = -shared -Wl,-soname=$(@F) -Wl,--version-script,$(EXPFILE)
@@ -34,51 +35,20 @@
EXERPATHPREFIX = -Xlinker -z -Xlinker origin -Xlinker -rpath \
-Xlinker \$$ORIGIN/ -Xlinker -rpath-link \
-Xlinker
-ifneq ($(HY_OS),zos)
WARNFLAGS=-Werror
-else
-WARNFLAGS=
-endif
-include $(HY_HDK)/build/make/platform/$(HY_PLATFORM).mk
-
-ifeq ($(RANLIB),)
-RANLIB=echo
-endif
-
-ifneq ($(HY_OS),freebsd)
-ifneq ($(HY_OS),zos)
-OSLIBS += -ldl
-endif
-endif
+HYDEBUGCFLAGS = -ggdb -O0
+HYRELEASECFLAGS = -O1 -DNDEBUG
EXEPATH=../
LIBPATH=$(HY_HDK)/lib/
-
-ifneq ($(HY_OS),zos)
DLLPATH=$(HY_HDK)/jdk/jre/bin/
-else
-# 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)
-endif
SHAREDSUB=../shared/
-
-DEFINES += -D_REENTRANT
INCLUDES += -I$(HY_HDK)/include -I$(HY_HDK)/jdk/include -I. -I$(SHAREDSUB)
-ifndef HYDEBUGCFLAGS
-ifneq ($(HY_OS),zos)
-HYDEBUGCFLAGS = -ggdb -O0
-else
-# z/OS has different debug flags
-HYDEBUGCFLAGS = -g -O0
-endif
-endif
+include $(HY_HDK)/build/make/platform/$(HY_PLATFORM).mk
-ifndef HYRELEASECFLAGS
-HYRELEASECFLAGS = -O1 -DNDEBUG
-endif
+DEFINES += -D_REENTRANT
ifeq ($(HY_CFG),release)
OPT += $(HYRELEASECFLAGS)
Modified: harmony/enhanced/classlib/trunk/depends/build/platform/linux.ia64.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/depends/build/platform/linux.ia64.mk?rev=787234&r1=787233&r2=787234&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/depends/build/platform/linux.ia64.mk (original)
+++ harmony/enhanced/classlib/trunk/depends/build/platform/linux.ia64.mk Mon Jun 22 13:36:14 2009
@@ -16,3 +16,4 @@
DEFINES += -DLINUX -DLINUX_IA64 -DHYIA64 -DIPv6_FUNCTION_SUPPORT
OPT += -fpic
+OSLIBS += -ldl
Modified: harmony/enhanced/classlib/trunk/depends/build/platform/linux.ppc32.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/depends/build/platform/linux.ppc32.mk?rev=787234&r1=787233&r2=787234&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/depends/build/platform/linux.ppc32.mk (original)
+++ harmony/enhanced/classlib/trunk/depends/build/platform/linux.ppc32.mk Mon Jun 22 13:36:14 2009
@@ -18,3 +18,4 @@
ASFLAGS += -a32
LDFLAGS += -m32
+OSLIBS += -ldl
Modified: harmony/enhanced/classlib/trunk/depends/build/platform/linux.ppc64.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/depends/build/platform/linux.ppc64.mk?rev=787234&r1=787233&r2=787234&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/depends/build/platform/linux.ppc64.mk (original)
+++ harmony/enhanced/classlib/trunk/depends/build/platform/linux.ppc64.mk Mon Jun 22 13:36:14 2009
@@ -19,3 +19,4 @@
ASFLAGS += -a64
LDFLAGS += -m64
+OSLIBS += -ldl
Modified: harmony/enhanced/classlib/trunk/depends/build/platform/linux.s390.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/depends/build/platform/linux.s390.mk?rev=787234&r1=787233&r2=787234&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/depends/build/platform/linux.s390.mk (original)
+++ harmony/enhanced/classlib/trunk/depends/build/platform/linux.s390.mk Mon Jun 22 13:36:14 2009
@@ -18,3 +18,4 @@
ASFLAGS += -m31
LDFLAGS += -m31
+OSLIBS += -ldl
Modified: harmony/enhanced/classlib/trunk/depends/build/platform/linux.s390x.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/depends/build/platform/linux.s390x.mk?rev=787234&r1=787233&r2=787234&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/depends/build/platform/linux.s390x.mk (original)
+++ harmony/enhanced/classlib/trunk/depends/build/platform/linux.s390x.mk Mon Jun 22 13:36:14 2009
@@ -18,3 +18,4 @@
ASFLAGS += -m64
LDFLAGS += -m64
+OSLIBS += -ldl
Modified: harmony/enhanced/classlib/trunk/depends/build/platform/linux.x86.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/depends/build/platform/linux.x86.mk?rev=787234&r1=787233&r2=787234&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/depends/build/platform/linux.x86.mk (original)
+++ harmony/enhanced/classlib/trunk/depends/build/platform/linux.x86.mk Mon Jun 22 13:36:14 2009
@@ -15,3 +15,4 @@
DEFINES += -DLINUX -DLINUX_X86 -DHYX86 -DIPv6_FUNCTION_SUPPORT
OPT += -fpic -march=pentium3
+OSLIBS += -ldl
Modified: harmony/enhanced/classlib/trunk/depends/build/platform/linux.x86_64.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/depends/build/platform/linux.x86_64.mk?rev=787234&r1=787233&r2=787234&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/depends/build/platform/linux.x86_64.mk (original)
+++ harmony/enhanced/classlib/trunk/depends/build/platform/linux.x86_64.mk Mon Jun 22 13:36:14 2009
@@ -16,3 +16,4 @@
DEFINES += -DLINUX -DLINUX_X86_64 -DHYX86_64 -DIPv6_FUNCTION_SUPPORT
OPT += -fpic
XLIBS = -L/usr/X11R6/lib64 -lX11 -lXft -lXext -lXtst
+OSLIBS += -ldl
Modified: harmony/enhanced/classlib/trunk/depends/build/platform/macosx.ppc32.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/depends/build/platform/macosx.ppc32.mk?rev=787234&r1=787233&r2=787234&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/depends/build/platform/macosx.ppc32.mk (original)
+++ harmony/enhanced/classlib/trunk/depends/build/platform/macosx.ppc32.mk Mon Jun 22 13:36:14 2009
@@ -15,7 +15,7 @@
DEFINES += -DMACOSX -DMACOSX_PPC32 -DPPC32 -DIPv6_FUNCTION_SUPPORT
OPT += -fpic -fno-common
-OSLIBS = -lc -lm -ldl -liconv
+OSLIBS += -ldl -liconv
XLIBS = -L/usr/X11R6/lib -lX11 -lXft -lXext -lXtst -lXrender -lexpat \
-L/sw/lib/freetype2/lib -lfreetype -lfontconfig
MDLLIBPREFIX =
Modified: harmony/enhanced/classlib/trunk/depends/build/platform/zos.s390.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/depends/build/platform/zos.s390.mk?rev=787234&r1=787233&r2=787234&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/depends/build/platform/zos.s390.mk (original)
+++ harmony/enhanced/classlib/trunk/depends/build/platform/zos.s390.mk Mon Jun 22 13:36:14 2009
@@ -40,3 +40,13 @@
# We can't use the -Xlinker options on zOS
EXERPATHPREFIX =
+
+# Different compiler on zOS
+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)
Modified: harmony/enhanced/classlib/trunk/depends/build/platform/zos.s390x.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/depends/build/platform/zos.s390x.mk?rev=787234&r1=787233&r2=787234&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/depends/build/platform/zos.s390x.mk (original)
+++ harmony/enhanced/classlib/trunk/depends/build/platform/zos.s390x.mk Mon Jun 22 13:36:14 2009
@@ -40,3 +40,13 @@
# We can't use the -Xlinker options on z/OS
EXERPATHPREFIX =
+
+# Different compiler on zOS
+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)