Skip to content

Commit

Permalink
use external libxmlrpc
Browse files Browse the repository at this point in the history
  • Loading branch information
joequant committed Apr 30, 2017
1 parent e37a94a commit cabab0e
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 4 deletions.
5 changes: 3 additions & 2 deletions build.sh
@@ -1,12 +1,13 @@
export iraf=`pwd`/
export host=unix
export host=unix/
export hlib=${iraf}${host}/hlib/
export PATH=$PATH:${iraf}${host}"/bin/"
export pkglibs=${iraf}noao/lib/,${iraf}${host}/hlib/libc/,${iraf}${host}/bin/
export HOST_CURL=1
export HOST_READLINE=1
export HOST_EXPAT=1
export HOST_CFITSIO=1
export HOST_XMLRPC=1
export IRAFARCH=`${hlib}irafarch.csh`

rm -rf vo/votools/.old
Expand Down Expand Up @@ -41,7 +42,7 @@ popd

export pkglibs=${iraf}noao/lib/,${iraf}${host}/bin/,${iraf}${host}/hlib/libc/
${iraf}util/mksysvos
sed -i ${host}/hlib/mkiraf.csh -e s!/iraf/iraf!%{_datadir}/iraf!g
sed -i ${host}/hlib/mkiraf.csh -e s!/iraf/iraf!%{_libdir}/iraf!g
cp ${iraf}${host}/bin/*.a ${iraf}lib
rm pkg/utilities/nttools/xx_nttools.e

Expand Down
3 changes: 3 additions & 0 deletions unix/boot/spp/xc.c
Expand Up @@ -1265,6 +1265,9 @@ passflag: mkobject = YES;
#endif
#ifdef HOST_EXPAT
arglist[nargs++] = "-lexpat";
#endif
#ifdef HOST_XMLRPC
arglist[nargs++] = "-lxmlrpc";
#endif
/* Host libraries, searched after iraf libraries. */
for (i=0; i < nhlibs; i++)
Expand Down
2 changes: 1 addition & 1 deletion unix/hlib/irafuser.csh
Expand Up @@ -124,7 +124,7 @@ case ipad:
case linux64:
setenv XC_CFLAGS "-I${iraf}unix/f2c"
setenv XC_FFLAGS "-I${iraf}unix/f2c"
setenv HSI_CF "-I${iraf}unix/f2c -g -O2 -I/usr/include -I${hlib}libc -DLINUX -DREDHAT -DPOSIX -DSYSV -DLINUX64 -DMACH64 -w -m64 -DNOLIBCNAMES -DHOST_F2C -DHOST_CURL -DHOST_EXPAT -DHOST_CFITSIO"
setenv HSI_CF "-I${iraf}unix/f2c -g -O2 -I/usr/include -I${hlib}libc -DLINUX -DREDHAT -DPOSIX -DSYSV -DLINUX64 -DMACH64 -w -m64 -DNOLIBCNAMES -DHOST_F2C -DHOST_CURL -DHOST_EXPAT -DHOST_XMLRPC -DHOST_CFITSIO"
setenv HSI_XF "-I${iraf}unix/f2c -g -Inolibc -I${hlib}libc -w -/m64 -/Wunused"
setenv HSI_FF "-I${iraf}unix/f2c -g -m64 -DBLD_KERNEL"
setenv HSI_LF "-m64 "
Expand Down
2 changes: 1 addition & 1 deletion vendor/voclient/libsamp/libxrpc/mklibs
Expand Up @@ -10,7 +10,7 @@ setenv PLATFORM `uname -s`
setenv PLMACH `uname -m`

set build_curl = 0
set build_xmlrpc = 1
set build_xmlrpc = 0


if ($PLATFORM == "Darwin") then
Expand Down

0 comments on commit cabab0e

Please sign in to comment.