You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by kn...@apache.org on 2002/04/11 19:40:57 UTC
cvs commit: xml-xerces/c/tests/IDom/ITraversal Makefile.in
knoaman 02/04/11 10:40:57
Modified: c/src/xercesc Makefile.incl
c/tests Makefile.in runConfigure
c/tests/IDom/ITraversal Makefile.in
Log:
Patch to build the library on FreeBSD using shared library naming convention + minor changes, by Max Gotlib
Revision Changes Path
1.6 +3 -1 xml-xerces/c/src/xercesc/Makefile.incl
Index: Makefile.incl
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/Makefile.incl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Makefile.incl 9 Apr 2002 16:42:01 -0000 1.5
+++ Makefile.incl 11 Apr 2002 17:40:57 -0000 1.6
@@ -54,7 +54,7 @@
# <http://www.apache.org/>.
#
#
-# $Id: Makefile.incl,v 1.5 2002/04/09 16:42:01 peiyongz Exp $
+# $Id: Makefile.incl,v 1.6 2002/04/11 17:40:57 knoaman Exp $
#
###################################################################
@@ -305,6 +305,8 @@
ALLLIBS = ${LIBS}
endif
SHLIBSUFFIX=.so
+## Compiler switch to embed a library name
+LD_SONAME = -Wl,-soname,${SO_NAME}
endif
#=============== IRIX SPECIFIC OPTIONS ============================
1.21 +5 -2 xml-xerces/c/tests/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/xml-xerces/c/tests/Makefile.in,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- Makefile.in 25 Feb 2002 21:03:50 -0000 1.20
+++ Makefile.in 11 Apr 2002 17:40:57 -0000 1.21
@@ -54,7 +54,7 @@
# <http://www.apache.org/>.
#
#
-# $Id: Makefile.in,v 1.20 2002/02/25 21:03:50 tng Exp $
+# $Id: Makefile.in,v 1.21 2002/04/11 17:40:57 knoaman Exp $
#
DOMIDTest_DIR=DOM/DOMIDTest
@@ -87,7 +87,10 @@
all:: bindir domidtest dommemtest idommemtest domtest idomtest threadtest encodingtest traversal itraversal rangetest irangetest inittermtest
endif
else
- all:: bindir domidtest dommemtest idommemtest domtest idomtest threadtest encodingtest traversal itraversal rangetest irangetest inittermtest
+ all:: bindir domidtest dommemtest idommemtest domtest idomtest encodingtest traversal itraversal rangetest irangetest inittermtest
+ ifneq (${THREADS},none)
+ all:: threadtest
+ endif
endif
bindir::
1.16 +10 -9 xml-xerces/c/tests/runConfigure
Index: runConfigure
===================================================================
RCS file: /home/cvs/xml-xerces/c/tests/runConfigure,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- runConfigure 18 Jan 2002 19:48:55 -0000 1.15
+++ runConfigure 11 Apr 2002 17:40:57 -0000 1.16
@@ -56,7 +56,7 @@
#
#
-# $Id: runConfigure,v 1.15 2002/01/18 19:48:55 tng Exp $
+# $Id: runConfigure,v 1.16 2002/04/11 17:40:57 knoaman Exp $
#
#
@@ -339,21 +339,22 @@
if test -n "${XERCESCROOT}"; then
# try lookup the configuration results
. "${XERCESCROOT}/version.incl"
- if test -f "${XERCESCROOT}/src/config.log" ; then
- if grep XML_USE_LIBICONV "${XERCESCROOT}/src/config.log" \
+ SOLIBNAME=libxerces-c.so.${SO_TARGET_VERSION}.${SO_TARGET_VERSION_MAJOR}
+ if test -f "${XERCESCROOT}/src/xercesc/config.log" ; then
+ if grep XML_USE_LIBICONV "${XERCESCROOT}/src/xercesc/config.log" \
> /dev/null 2>&1 ; then
transcodingLibs=" -L/usr/local/lib -liconv "
transcodingDefines=" -DXML_USE_LIBICONV -I/usr/local/include "
fi
- elif test -f "${XERCESCROOT}/obj/IconvFBSDTransService.o" ; then
- if nm "${XERCESCROOT}/obj/IconvFBSDTransService.o" | \
- grep XML_USE_LIBICONV > /dev/null 2>&1 ; then
+ elif test -f "${XERCESCROOT}/obj/FREEBSD/IconvFBSDTransService.o" ; then
+ if nm "${XERCESCROOT}/obj/FREEBSD/IconvFBSDTransService.o" | \
+ grep iconv_open > /dev/null 2>&1 ; then
transcodingLibs=" -L/usr/local/lib -liconv "
transcodingDefines=" -DXML_USE_LIBICONV -I/usr/local/include "
fi
- elif test -f "${XERCESCROOT}/lib/libxerces-c${VER}.so" ; then
- if nm "${XERCESCROOT}/lib/libxerces-c${VER}.so" | \
- grep XML_USE_LIBICONV > /dev/null 2>&1 ; then
+ elif test -f "${XERCESCROOT}/lib/${SOLIBNAME}" ; then
+ if nm "${XERCESCROOT}/lib/${SOLIBNAME}" | \
+ grep iconv_open > /dev/null 2>&1 ; then
transcodingLibs=" -L/usr/local/lib -liconv "
transcodingDefines=" -DXML_USE_LIBICONV -I/usr/local/include "
fi
1.6 +2 -2 xml-xerces/c/tests/IDom/ITraversal/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/xml-xerces/c/tests/IDom/ITraversal/Makefile.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Makefile.in 18 Jan 2002 19:48:56 -0000 1.5
+++ Makefile.in 11 Apr 2002 17:40:57 -0000 1.6
@@ -54,7 +54,7 @@
# <http://www.apache.org/>.
#
#
-# $Id: Makefile.in,v 1.5 2002/01/18 19:48:56 tng Exp $
+# $Id: Makefile.in,v 1.6 2002/04/11 17:40:57 knoaman Exp $
#
#
@@ -75,7 +75,7 @@
LDFLAGS = @ldflags@
PREFIX = @prefix@
THREADS = @threads@
-LIBS = @extra_libs@
+EXTRA_LIBS = @extra_libs@
include ../../../version.incl
include ../../Makefile.incl
---------------------------------------------------------------------
To unsubscribe, e-mail: xerces-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xerces-cvs-help@xml.apache.org