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 2008/01/23 13:13:22 UTC
svn commit: r614515 - in /harmony/enhanced/classlib/trunk/depends/build: defines.mk platform/aix.ppc32.mk platform/aix.ppc64.mk platform/freebsd.x86.mk platform/linux.ppc64.mk platform/linux.x86_64.mk platform/macosx.ppc32.mk

Author: hindessm
Date: Wed Jan 23 04:13:13 2008
New Revision: 614515

URL: http://svn.apache.org/viewvc?rev=614515&view=rev
Log:
Fixing linker errors after commit r614497.

Modified:
    harmony/enhanced/classlib/trunk/depends/build/defines.mk
    harmony/enhanced/classlib/trunk/depends/build/platform/aix.ppc32.mk
    harmony/enhanced/classlib/trunk/depends/build/platform/aix.ppc64.mk
    harmony/enhanced/classlib/trunk/depends/build/platform/freebsd.x86.mk
    harmony/enhanced/classlib/trunk/depends/build/platform/linux.ppc64.mk
    harmony/enhanced/classlib/trunk/depends/build/platform/linux.x86_64.mk
    harmony/enhanced/classlib/trunk/depends/build/platform/macosx.ppc32.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=614515&r1=614514&r2=614515&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/depends/build/defines.mk (original)
+++ harmony/enhanced/classlib/trunk/depends/build/defines.mk Wed Jan 23 04:13:13 2008
@@ -27,7 +27,7 @@
 CXX_DLL_LD = $(CXX)
 STDCLIBS = -lstdc++
 OSLIBS = -lc -lm
-XLIBS = -L/usr/X11R6/lib -lX11 -lXft -lXext
+XLIBS = -L/usr/X11R6/lib -lX11 -lXft -lXext -lXtst
 MDLLIBPREFIX = -Xlinker --start-group
 MDLLIBSUFFIX = -Xlinker --end-group
 EXELDFLAGS = $(LDFLAGS)

Modified: harmony/enhanced/classlib/trunk/depends/build/platform/aix.ppc32.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/depends/build/platform/aix.ppc32.mk?rev=614515&r1=614514&r2=614515&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/depends/build/platform/aix.ppc32.mk (original)
+++ harmony/enhanced/classlib/trunk/depends/build/platform/aix.ppc32.mk Wed Jan 23 04:13:13 2008
@@ -16,7 +16,7 @@
 DEFINES += -DAIX -DAIX_PPC32 -DHYPPC32 -D_Xconst="" -DIPv6_FUNCTION_SUPPORT
 OPT += -fpic -qcpluscmt -O3 -s -q mbcs -qlanglvl=extended -qarch=ppc -qinfo=pro -qalias=noansi -D_XOPEN_SOURCE_EXTENDED=1 -D_ALL_SOURCE -D_LARGE_FILES -qsuppress=1500-010
 OSLIBS = -lc_r -lC_r -lm -lpthread -liconv
-XLIBS = -L/opt/freeware/lib -lX11 -lXft -lfreetype -lfontconfig -lXext
+XLIBS = -L/opt/freeware/lib -lX11 -lXft -lfreetype -lfontconfig -lXext -lXtst
 STDCLIBS = 
 
 ARFLAGS = -X32 rcv

Modified: harmony/enhanced/classlib/trunk/depends/build/platform/aix.ppc64.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/depends/build/platform/aix.ppc64.mk?rev=614515&r1=614514&r2=614515&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/depends/build/platform/aix.ppc64.mk (original)
+++ harmony/enhanced/classlib/trunk/depends/build/platform/aix.ppc64.mk Wed Jan 23 04:13:13 2008
@@ -16,7 +16,7 @@
 DEFINES += -DAIX -DAIX_PPC64 -DHYPPC64 -D_Xconst="" -DIPv6_FUNCTION_SUPPORT
 OPT += -fpic -q64 -qcpluscmt -O3 -s -q64 -DPPC64 -q mbcs -qlanglvl=extended -qarch=ppc -qinfo=pro -qalias=noansi -D_XOPEN_SOURCE_EXTENDED=1 -D_ALL_SOURCE -D_LARGE_FILES -qsuppress=1500-010
 OSLIBS = -lc_r -lC_r -lm -lpthread -liconv
-XLIBS = -L/opt/freeware/lib -lX11 -lXft -lfreetype -lfontconfig -lXext
+XLIBS = -L/opt/freeware/lib -lX11 -lXft -lfreetype -lfontconfig -lXext -lXtst
 STDCLIBS = 
 
 ARFLAGS = -X64 rcv

Modified: harmony/enhanced/classlib/trunk/depends/build/platform/freebsd.x86.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/depends/build/platform/freebsd.x86.mk?rev=614515&r1=614514&r2=614515&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/depends/build/platform/freebsd.x86.mk (original)
+++ harmony/enhanced/classlib/trunk/depends/build/platform/freebsd.x86.mk Wed Jan 23 04:13:13 2008
@@ -17,4 +17,4 @@
 OPT += -fpic -march=pentium3
 OSLIBS = -lpthread -lm
 INCLUDES += -I/usr/local/include
-XLIBS = -L/usr/local/lib -lX11 -lXft -lXext
+XLIBS = -L/usr/local/lib -lX11 -lXft -lXext -lXtst

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=614515&r1=614514&r2=614515&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/depends/build/platform/linux.ppc64.mk (original)
+++ harmony/enhanced/classlib/trunk/depends/build/platform/linux.ppc64.mk Wed Jan 23 04:13:13 2008
@@ -15,7 +15,7 @@
 
 DEFINES += -DLINUX -DLINUX_PPC64 -DHYPPC64 -DIPv6_FUNCTION_SUPPORT
 OPT += -fpic -m64
-XLIBS = -L/usr/X11R6/lib64 -lX11 -lXft -lXext
+XLIBS = -L/usr/X11R6/lib64 -lX11 -lXft -lXext -lXtst
 
 ASFLAGS += -a64
 LDFLAGS += -m64

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=614515&r1=614514&r2=614515&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 Wed Jan 23 04:13:13 2008
@@ -15,4 +15,4 @@
 
 DEFINES += -DLINUX -DLINUX_X86_64 -DHYX86_64 -DIPv6_FUNCTION_SUPPORT
 OPT += -fpic
-XLIBS = -L/usr/X11R6/lib64 -lX11 -lXft -lXext
+XLIBS = -L/usr/X11R6/lib64 -lX11 -lXft -lXext -lXtst

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=614515&r1=614514&r2=614515&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/depends/build/platform/macosx.ppc32.mk (original)
+++ harmony/enhanced/classlib/trunk/depends/build/platform/macosx.ppc32.mk Wed Jan 23 04:13:13 2008
@@ -16,7 +16,7 @@
 DEFINES += -DMACOSX -DMACOSX_PPC32 -DPPC32 -DIPv6_FUNCTION_SUPPORT
 OPT += -fpic -fno-common
 OSLIBS = -lc -lm -ldl -liconv
-XLIBS = -L/usr/X11R6/lib -lX11 -lXft -lXext -lXrender -lexpat \
+XLIBS = -L/usr/X11R6/lib -lX11 -lXft -lXext -lXtst -lXrender -lexpat \
         -L/sw/lib/freetype2/lib -lfreetype -lfontconfig
 MDLLIBPREFIX =
 MDLLIBSUFFIX =