NetBSD compilation

This commit is contained in:
Charlie 2010-08-02 15:39:11 +01:00 committed by Vítor Santos Costa
parent 388f4fb782
commit fd64559643
4 changed files with 2592 additions and 12210 deletions

View File

@ -1,6 +1,10 @@
#if USE_DL_MALLOC #if USE_DL_MALLOC
#if HAVE_SYS_PARAM_H
#include <sys/param.h>
#endif
/* YAP only stuff */ /* YAP only stuff */
void STD_PROTO(Yap_initdlmalloc,(void)); void STD_PROTO(Yap_initdlmalloc,(void));
@ -489,7 +493,7 @@ extern Void_t* sbrk();
HAVE_USR_INCLUDE_MALLOC_H. HAVE_USR_INCLUDE_MALLOC_H.
*/ */
#if HAVE_MALLOC_H && !defined(_WIN32) #if HAVE_MALLOC_H && !defined(_WIN32) && !defined(__NetBSD_Version__)
#define HAVE_USR_INCLUDE_MALLOC_H 1 #define HAVE_USR_INCLUDE_MALLOC_H 1
#endif #endif

14396
configure vendored

File diff suppressed because it is too large Load Diff

View File

@ -1045,15 +1045,15 @@ dnl Linux has both elf and a.out, in this case we found elf
LDFLAGS="-Wl,--export-dynamic $LDFLAGS" LDFLAGS="-Wl,--export-dynamic $LDFLAGS"
SHLIB_CFLAGS="-fPIC $CFLAGS" SHLIB_CFLAGS="-fPIC $CFLAGS"
SHLIB_CXXFLAGS="-fPIC $CXXFLAGS" SHLIB_CXXFLAGS="-fPIC $CXXFLAGS"
SHLIB_LD="ld -Bshareable -x" SHLIB_LD="$CC -shared -export-dynamic"
SHLIB_CXX_LD="$SHLIB_LD" SHLIB_CXX_LD="$CXX -shared -export-dynamic"
DO_SECOND_LD="" DO_SECOND_LD=""
SO="so" SO="so"
INSTALL_DLLS="" INSTALL_DLLS=""
fi fi
LDFLAGS="$LDFLAGS -L\$(abs_top_builddir) -Wl,-R,\$(DESTDIR)\$(LIBDIR) -Wl,-R,\$(DESTDIR)\$(YAPLIBDIR)" LDFLAGS="$LDFLAGS -L\$(abs_top_builddir) -Wl,-R,\$(DESTDIR)\$(LIBDIR)"
DYNYAPLIB=libYap."$SO" DYNYAPLIB=libYap."$SO"
EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -lYap -Wl,-R,\$(DESTDIR)\$(YAPLIBDIR) -Wl,-R,\$(DESTDIR)\$(LIBDIR)" EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -Wl,-R,\$(DESTDIR)\$(YAPLIBDIR)"
PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir)" PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir)"
INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)" INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"
;; ;;

View File

@ -44,7 +44,7 @@ SOBJS=pl-tai.@SO@
all: $(SOBJS) all: $(SOBJS)
pl-tai.o: $(srcdir)/pl-tai.c pl-tai.o: $(srcdir)/pl-tai.c
(cd libtai ; make) (cd libtai ; $(MAKE))
$(CC) -c $(CFLAGS) $(srcdir)/pl-tai.c -o pl-tai.o $(CC) -c $(CFLAGS) $(srcdir)/pl-tai.c -o pl-tai.o
@DO_SECOND_LD@pl-tai.@SO@: pl-tai.o @DO_SECOND_LD@pl-tai.@SO@: pl-tai.o