tng 2003/03/13 14:11:59
Modified: c/src/xercesc configure configure.in Makefile.incl
runConfigure
Log:
[Bug 17858] Support for QNX/Neutrino. Patch from Chris McKillop.
Revision Changes Path
1.12 +3 -0 xml-xerces/c/src/xercesc/configure
Index: configure
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/configure,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- configure 20 Feb 2003 18:06:17 -0000 1.11
+++ configure 13 Mar 2003 22:11:59 -0000 1.12
@@ -1255,6 +1255,7 @@
*-*-UnixWare*) platform=UNIXWARE ;;
*-*-unixware*) platform=UNIXWARE ;;
*-*-beos*) platform=BEOS ;;
+ *-*-nto*) platform=QNX ;;
*-*-linux*) platform=LINUX ;;
*-*-freebsd*) platform=FREEBSD ;;
*-*-irix*) platform=IRIX ;;
@@ -1453,6 +1454,7 @@
util/Platforms/Solaris/Makefile \
util/Platforms/AIX/Makefile \
util/Platforms/BeOS/Makefile \
+util/Platforms/QNX/Makefile \
util/Platforms/Linux/Makefile \
util/Platforms/FreeBSD/Makefile \
util/Platforms/HPUX/Makefile \
@@ -1606,6 +1608,7 @@
util/Platforms/Solaris/Makefile \
util/Platforms/AIX/Makefile \
util/Platforms/BeOS/Makefile \
+util/Platforms/QNX/Makefile \
util/Platforms/Linux/Makefile \
util/Platforms/FreeBSD/Makefile \
util/Platforms/HPUX/Makefile \
1.15 +2 -0 xml-xerces/c/src/xercesc/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/configure.in,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- configure.in 20 Feb 2003 18:06:17 -0000 1.14
+++ configure.in 13 Mar 2003 22:11:59 -0000 1.15
@@ -33,6 +33,7 @@
*-*-UnixWare*) platform=UNIXWARE ;;
*-*-unixware*) platform=UNIXWARE ;;
*-*-beos*) platform=BEOS ;;
+ *-*-nto*) platform=QNX ;;
*-*-linux*) platform=LINUX ;;
*-*-freebsd*) platform=FREEBSD ;;
*-*-irix*) platform=IRIX ;;
@@ -123,6 +124,7 @@
util/Platforms/Solaris/Makefile \
util/Platforms/AIX/Makefile \
util/Platforms/BeOS/Makefile \
+util/Platforms/QNX/Makefile \
util/Platforms/Linux/Makefile \
util/Platforms/FreeBSD/Makefile \
util/Platforms/HPUX/Makefile \
1.37 +32 -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.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- Makefile.incl 25 Feb 2003 19:43:19 -0000 1.36
+++ Makefile.incl 13 Mar 2003 22:11:59 -0000 1.37
@@ -336,6 +336,27 @@
LD_SONAME = -Wl,-soname,${SO_NAME}
endif
+#=============== QNX SPECIFIC OPTIONS =========================
+ifeq (${PLATFORM}, QNX)
+PLATFORM_COMPILE_OPTIONS = -shared
+MAKE_SHARED = ${CXX} -shared ${LDFLAGS}
+MAKE_SHARED_C = ${CC} -shared ${LDFLAGS}
+ifeq (${TRANSCODER}, ICU)
+ ALLLIBS = ${LIBS} -L/usr/local/lib -licuuc -licudata
+else
+ ALLLIBS = ${LIBS}
+endif
+
+ifeq (${MESSAGELOADER}, ICU)
+ ALLLIBS = ${LIBS} -L/usr/local/lib -licuuc -licudata -lXercesMessages
+endif
+
+EXTRA_LINK_OPTIONS =
+SHLIBSUFFIX=.so
+## Compiler switch to embed a library name
+LD_SONAME = -Wl,-soname,${SO_NAME}
+endif
+
#=============== FREEBSD SPECIFIC OPTIONS =========================
ifeq (${PLATFORM}, FREEBSD)
MAKE_SHARED = ${CXX} -D${PLATFORM} -shared -fPIC ${LDFLAGS}
@@ -584,6 +605,16 @@
LINK_NAME=${LIBNAME}${SHLIBSUFFIX}
SO_NAME =${LIBNAME}.${SO_TARGET_VERSION}${SHLIBSUFFIX}
REAL_NAME=${LIBNAME}.${SO_TARGET_VERSION}.${SO_TARGET_VERSION_MAJOR}${SHLIBSUFFIX}
+endif
+ifeq (${PLATFORM}, QNX)
+ #
+ # LINK_NAME=libxerces-c.{suffix}
+ # SO_NAME =libxerces-c.20.{suffix}
+ # REAL_NAME=libxerces-c.20.{suffix}
+ #
+ LINK_NAME=${LIBNAME}${SHLIBSUFFIX}
+ SO_NAME =${LIBNAME}${SHLIBSUFFIX}.${SO_TARGET_VERSION}
+ REAL_NAME=$(SO_NAME)
endif
# Default naming (if no special cases above)
1.26 +10 -6 xml-xerces/c/src/xercesc/runConfigure
Index: runConfigure
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/runConfigure,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- runConfigure 23 Feb 2003 06:37:27 -0000 1.25
+++ runConfigure 13 Mar 2003 22:11:59 -0000 1.26
@@ -86,9 +86,9 @@
echo " where options may be any of the following:"
echo " -p <platform> (accepts 'aix', 'beos', 'linux', 'freebsd',
'solaris',
'hp-10', 'hp-11', 'openserver', 'unixware', 'os400', 'irix',
- 'ptx', 'tru64', 'macosx'. 'cygwin')"
- echo " -c <C compiler name> (e.g. gcc, cc, xlc_r, icc or ecc)"
- echo " -x <C++ compiler name> (e.g. g++, CC, aCC, xlC_r, icc or ecc)"
+ 'ptx', 'tru64', 'macosx', 'cygwin', 'qnx')"
+ echo " -c <C compiler name> (e.g. gcc, cc, xlc_r, qcc, icc or ecc)"
+ echo " -x <C++ compiler name> (e.g. g++, CC, aCC, xlC_r, , QCC, icc or
ecc)"
echo " -d (specifies that you want to build debug version)"
echo " -m <message loader> can be 'inmem', 'icu', 'MsgFile' or 'iconv'"
echo " -n <net accessor> can be 'fileonly', 'libwww', 'socket' or
'native'"
@@ -227,7 +227,7 @@
#
case $platform in
- aix | openserver | unixware | beos | linux | freebsd | solaris | hp-10 | hp-11 |
os400 | irix | ptx | tru64 | macosx | cygwin)
+ aix | openserver | unixware | beos | linux | freebsd | solaris | hp-10 | hp-11 |
os400 | irix | ptx | tru64 | macosx | cygwin | qnx)
# platform has been recognized
;;
*)
@@ -287,6 +287,8 @@
exit ${ERROR_EXIT_CODE};;
esac
fi
+ elif test $platform = "qnx"; then
+ threadingLibs=""; ## QNX has pthread API in libc
elif test $platform = "openserver"; then
case $thread in
pthread)
@@ -530,6 +532,8 @@
netaccessorLibs="";;
beos)
netaccessorLibs="-lnet";;
+ qnx)
+ netaccessorLibs="-lsocket";;
solaris)
netaccessorLibs="-lnsl -lsocket"
if test $thread = "dce"; then
@@ -577,7 +581,7 @@
#
case $cppcompiler in
- xlC* | xlc* | g++ | c++ | cc | CC | aCC | icc | ICC | cxx | ecc)
+ xlC* | xlc* | g++ | c++ | cc | CC | aCC | icc | ICC | cxx | ecc | QCC )
;;
'')
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
