[libxml2] small changes for OS/400
- From: Daniel Veillard <veillard src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libxml2] small changes for OS/400
- Date: Thu, 27 Jul 2017 03:20:49 +0000 (UTC)
commit d1f90624864c321e38d3a09a014afd56eb438702
Author: Patrick Monnerat <patrick monnerat dh com>
Date: Thu Jul 27 11:20:02 2017 +0800
small changes for OS/400
OS/400 version V5R3 is not supported by IBM anymore.
In addition, the iSeries system I have here for development has been changed
and the new system is not able to compile for an OS version lower than V6R1.
Thus I made some updates to the libxml2 os400 scripts accordingly:
- Oldest supported OS version is now V6R1.
- Adjust ILE/RPG wrappers comments.
- Update copyright year range.
- Do not log compiler informational messages.
os400/initscript.sh | 4 ++--
os400/libxmlrpg/xmlstring.rpgle | 4 ++--
os400/make-src.sh | 2 +-
python/setup.py | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/os400/initscript.sh b/os400/initscript.sh
index cc52e45..42ce54d 100644
--- a/os400/initscript.sh
+++ b/os400/initscript.sh
@@ -50,7 +50,7 @@ setenv TGTCCSID '500' # Target CCSID of objects.
setenv DEBUG '*ALL' # Debug level.
setenv OPTIMIZE '10' # Optimisation level.
setenv OUTPUT '*NONE' # Compilation output option.
-setenv TGTRLS 'V5R3M0' # Target OS release.
+setenv TGTRLS 'V6R1M0' # Target OS release.
setenv IFSDIR '/libxml2' # Installation IFS directory.
@@ -217,7 +217,7 @@ make_module()
cat "${2}" >> __tmpsrcf.c
CMD="CRTCMOD MODULE(${TARGETLIB}/${1}) SRCSTMF('__tmpsrcf.c')"
# CMD="${CMD} OPTION(*INCDIRFIRST *SHOWINC *SHOWSYS)"
- CMD="${CMD} OPTION(*INCDIRFIRST)"
+ CMD="${CMD} OPTION(*INCDIRFIRST) FLAG(10)"
CMD="${CMD} SYSIFCOPT(*IFS64IO) LANGLVL(*EXTENDED) LOCALETYPE(*LOCALE)"
CMD="${CMD} INCDIR("
if [ -z "${SYSICONV}" ]
diff --git a/os400/libxmlrpg/xmlstring.rpgle b/os400/libxmlrpg/xmlstring.rpgle
index 8980fc0..59a7625 100644
--- a/os400/libxmlrpg/xmlstring.rpgle
+++ b/os400/libxmlrpg/xmlstring.rpgle
@@ -115,7 +115,7 @@
d like(xmlCint)
d buf * value options(*string) xmlChar *
d len value like(xmlCint)
- d msg * value options(*string) const xmlChar *
+ d msg * value options(*string) const char *
d arg1 * value options(*string: *nopass)
d arg2 * value options(*string: *nopass)
d arg3 * value options(*string: *nopass)
@@ -129,7 +129,7 @@
d like(xmlCint)
d buf * value options(*string) xmlChar *
d len value like(xmlCint)
- d msg * value options(*string) const xmlChar *
+ d msg * value options(*string) const char *
d ap likeds(xmlVaList)
d xmlGetUTF8Char pr extproc('xmlGetUTF8Char')
diff --git a/os400/make-src.sh b/os400/make-src.sh
index 6094de8..4c03c56 100644
--- a/os400/make-src.sh
+++ b/os400/make-src.sh
@@ -17,7 +17,7 @@ cd "${TOPDIR}"
echo '#pragma comment(user, "libxml2 version '"${LIBXML_VERSION}"'")' > os400.c
echo '#pragma comment(user, __DATE__)' >> os400.c
echo '#pragma comment(user, __TIME__)' >> os400.c
-echo '#pragma comment(copyright, "Copyright (C) 1998-2015 Daniel Veillard. OS/400 version by P. Monnerat.")'
os400.c
+echo '#pragma comment(copyright, "Copyright (C) 1998-2017 Daniel Veillard. OS/400 version by P. Monnerat.")'
os400.c
make_module OS400 os400.c
LINK= # No need to rebuild service program yet.
MODULES=
diff --git a/python/setup.py b/python/setup.py
index c44269a..1ac4eac 100755
--- a/python/setup.py
+++ b/python/setup.py
@@ -8,7 +8,7 @@ from distutils.core import setup, Extension
# Below ROOT, we expect to find include, include/libxml2, lib and bin.
# On *nix, it is not needed (but should not harm),
# on Windows, it is set by configure.js.
-ROOT = r'/usr'
+ROOT = r'/usr/local'
# Thread-enabled libxml2
with_threads = 1
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]