search

datalogistics / ibp_server

3 stars 3 forks source link

Merging changes from upstream #5

Closed PerilousApricot closed 10 years ago

PerilousApricot commented 10 years ago

Most recent changes from:

http://www.lstore.org/wp-content/uploads/2013/11/ibp_server-accre-dev.tar.gz

PerilousApricot commented 10 years ago

This builds fine without phoebus, but otherwise I get:

/usr/bin/cc   -O0 -Wall -g -D_ENABLE_DEBUG -DHAVE_CONFIG_H -DLINUX=2 -D_REENTRANT -D_GNU_SOURCE -D_LARGEFILE64_SOURCE -I/home/meloam/DLT/ibp_server -I/usr/local/include -I/usr/local/include/apr-1    -o CMakeFiles/date_spacefree.dir/date_spacefree.c.o   -c /home/meloam/DLT/ibp_server/date_spacefree.c
In file included from /home/meloam/DLT/ibp_server/phoebus.h:39,
                 from /home/meloam/DLT/ibp_server/network.h:44,
                 from /home/meloam/DLT/ibp_server/ibp_server.h:39,
                 from /home/meloam/DLT/ibp_server/date_spacefree.c:16:
/usr/include/libxsp_client.h:6:22: error: #elif with no expression
make[2]: *** [CMakeFiles/date_spacefree.dir/date_spacefree.c.o] Error 1
make[2]: Leaving directory `/nfs_mounts/home/meloam/DLT/ibp_server'
make[1]: *** [CMakeFiles/date_spacefree.dir/all] Error 2
make[1]: Leaving directory `/nfs_mounts/home/meloam/DLT/ibp_server'
make: *** [all] Error 2

I'm using libxsp-client-1.0-8.x86_64. @disprosium8 -- any suggestions?

PerilousApricot commented 10 years ago

FWIW, this happens with the current master ( c072eb84b647f317a551b90072396c1e3bdd0806 ) as well.

ameyjah commented 10 years ago

Yeah, I also encountered this error on debian. Sort of hack I am right now using this.

after ./bootstrap edit config.h and set these #define as follows (observer 1 after #define tag_name)

define HAVE_STDINT_H 1

define HAVE_INTTYPES_H 1

I tried CMakeLists.txt:check_include_file("stdint.h" HAVE_STDINT_H) to get that kind of result after ./bootstrap but due to my limited knowledge of cmake I somehow couldn't get that.

BTW I checked my hack with pulled up code and it builds fine. As far as I have checked there is nothing wrong with the syntax of that .h file it is complaining about. That builds fine when compiled in xsp but somehow doesn't work when compiling with ibp_server. Let me also take a look at phoebus who uses xsp *.h files.

cbrumgard commented 10 years ago

Ameyjah,

Did you do configure_file on the config.h.in file and did you have #define HAVE_STDINT_H @HAVE_STDINT_H@ inside of config.h.in?

—Chris

On Mar 19, 2014, at 11:10 PM, ameyjah notifications@github.com wrote:

Yeah, I also encountered this error on debian. Sort of hack I am right now using this.

after ./bootstrap edit config.h and set these #define as follows (observer 1 after #define tag_name)

define HAVE_STDINT_H 1

define HAVE_INTTYPES_H 1

I tried CMakeLists.txt:check_include_file("stdint.h" HAVE_STDINT_H) to get that kind of result after ./bootstrap but due to my limited knowledge of cmake I somehow couldn't get that.

— Reply to this email directly or view it on GitHub.

ameyjah commented 10 years ago

Yup that works. Should I check in?

cbrumgard commented 10 years ago

I would assume so.

—Chris

On Mar 19, 2014, at 11:48 PM, ameyjah notifications@github.com wrote:

Yup that works. Should I check in?

— Reply to this email directly or view it on GitHub.

ameyjah commented 10 years ago

https://github.com/datalogistics/ibp_server/commit/0201953d1e0dd2e5ea2299c5a7cc262bf5604c04

This should solve this problem.