If $XERCESROOT/lib points to the place where we have 32 bit xerces libraries,
it should look for 64 bit libraries in $XERCESROOT/lib/64 automatically
------------------------------------------------------------------------------------------------------------------------------------------------------
Key: XALANC-693
URL: https://issues.apache.org/jira/browse/XALANC-693
Project: XalanC
Issue Type: Bug
Components: XalanC
Affects Versions: 1.10
Environment: OpenSolaris
Reporter: Meena Vyas
This patch works for me.
$cat Makefile.incl.in.patch
--- xml-xalan/c/Makefile.incl.in Tue Oct 4 14:25:21 2005
+++ xml-xalan/c/Makefile.incl.in.new Thu May 28 01:57:46 2009
@@ -70,7 +70,11 @@
endif
# required libraries
+ifeq (${BITSTOBUILD}, 64)
+XERCES_LIB = -L$(XERCESCROOT)/lib/64 -lxerces-c
+else
XERCES_LIB = -L$(XERCESCROOT)/lib -lxerces-c
+endif
ICU_LIB = -L$(ICUROOT)/lib -licuuc -L$(ICUI18NROOT)/lib -licui18n
XALAN_LIB = $(LIBRARY_SEARCH_PATH) $(LIBRARY_LINK_NAME)
@@ -182,7 +186,11 @@
SHLIBSUFFIX=.so
+ ifeq (${BITSTOBUILD}, 64)
+ XERCES_LIB= -L$(XERCESCROOT)/lib/64 -lxerces-c
+ else
XERCES_LIB= -L$(XERCESCROOT)/lib -lxerces-c
+ endif
ICU_LIB= -L$(ICUROOT)/lib -licuuc32 -L$(ICUI18NROOT)/lib
-licui18n32
LIB =
$(LIB_NAME)$(LIB_MAJOR_VER).$(LIB_MINOR_VER)$(SHLIBSUFFIX)
@@ -339,14 +347,14 @@
else
- PLATFORM_COMPILE_OPTIONS = -KPIC -mt -xs -ptr$(XSL_OBJ_DIR)
-features=rtti -D${PLATFORM} -D_REENTRANT
+ PLATFORM_COMPILE_OPTIONS = -KPIC -mt -xs -features=rtti -D${PLATFORM}
-D_REENTRANT
CC1 = $(CXX) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
CC4 = $(CC) $(CFLAGS) -KPIC -mt -xs -D${PLATFORM} -D_REENTRANT
- MAKE_SHARED = ${CXX} -D${PLATFORM} -G -ptr$(XSL_OBJ_DIR) ${LDFLAGS}
+ MAKE_SHARED = ${CXX} -D${PLATFORM} -G ${LDFLAGS}
LINK_SONAME = -h ${SO_NAME}
MAKE_SHARED_C = ${CC} -D${PLATFORM} -G ${LDFLAGS}
- LINK = ${CXX} -D${PLATFORM} -ptr$(XSL_OBJ_DIR) ${LDFLAGS}
+ LINK = ${CXX} -D${PLATFORM} ${LDFLAGS}
ALLLIBS = -mt ${LIBS} -L/usr/local/SUNWspro/lib -L/usr/ccs/lib -lc -lgen
endif
@@ -357,10 +365,10 @@
# if there is a LD_LIBRARY_PATH_64, we need to set this also
ifdef LD_LIBRARY_PATH_64
- export LD_LIBRARY_PATH_64 :=
$(XERCESCROOT)/lib:$(ICUROOT)/lib:$(LD_LIBRARY_PATH_64)
+ export LD_LIBRARY_PATH_64 :=
$(XERCESCROOT)/lib/64:$(ICUROOT)/lib:$(LD_LIBRARY_PATH_64)
endif
- MAKE_SHARED_LOC = ${CXX} -D${PLATFORM} -G -ptr$(ALL_OBJECTS_DIR) ${LDFLAGS}
-h ${LOC_SONAME}
+ MAKE_SHARED_LOC = ${CXX} -D${PLATFORM} -G ${LDFLAGS} -h ${LOC_SONAME}
endif
@@ -411,7 +419,11 @@
endif
+ifeq (${BITSTOBUILD}, 64)
+ XERCES_LIB= -L$(XERCESCROOT)/lib/64 -lxerces-c27
+else
XERCES_LIB= -L$(XERCESCROOT)/lib -lxerces-c27
+endif
ICU_LIB= -L$(ICUROOT)/lib -licuuc32 -L$(ICUI18NROOT)/lib -licui18n32
LIB = $(LIB_NAME)$(LIB_MAJOR_VER).$(LIB_MINOR_VER)$(SHLIBSUFFIX)
@@ -507,12 +519,12 @@
ifeq ($(PLATFORM), TRU64)
SUPPORTED = TRUE
- PLATFORM_COMPILE_OPTIONS = -D${PLATFORM} -ptr ${XSL_OBJ_DIR}/.cxx_repository
-ieee -pthread -std strict_ansi_errors
+ PLATFORM_COMPILE_OPTIONS = -D${PLATFORM} -ieee -pthread -std
strict_ansi_errors
ALLLIBS = ${LIBS} -L/usr/lib -lm
SHLIBSUFFIX = .so
CC1 = $(CXX) ${CXXFLAGS} $(PLATFORM_COMPILE_OPTIONS) -nocxxstd
CC4 = $(CC) $(CFLAGS) $(PLATFORM_COMPILE_OPTIONS)
- MAKE_SHARED = ${CXX} ${CXXFLAGS} -shared -D${PLATFORM} -ptr
${XSL_OBJ_DIR}/.cxx_repository -ieee -pthread -std strict_ansi_errors -nocxxstd
${LDFLAGS}
+ MAKE_SHARED = ${CXX} ${CXXFLAGS} -shared -D${PLATFORM} -ieee -pthread -std
strict_ansi_errors -nocxxstd ${LDFLAGS}
LINK = ${CXX} $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS) ${LDFLAGS}
MAKE_SHARED_LOC=$(MAKE_SHARED)
endif
--
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
