From 4644320d8ed89093925d4892a337d36bc0c33b54 Mon Sep 17 00:00:00 2001 From: Costa Vitor Date: Mon, 15 Jun 2009 17:44:13 -0500 Subject: [PATCH] fixes to support jpl compilation in Linux AMD64 bit machines. --- Makefile.in | 2 +- configure | 19 ++++++++++++++++--- configure.in | 16 ++++++++++++++-- packages/chr | 2 +- packages/jpl | 2 +- 5 files changed, 33 insertions(+), 8 deletions(-) diff --git a/Makefile.in b/Makefile.in index 10d398ddf..639bb7e4c 100644 --- a/Makefile.in +++ b/Makefile.in @@ -460,7 +460,7 @@ libYap.a: $(LIB_OBJECTS) $(RANLIB) libYap.a @DYNYAPLIB@: $(LIB_OBJECTS) - @DYNLIB_LD@ -install_name $(LIBDIR)/@YAPLIB@ -o @YAPLIB@ $(LIB_OBJECTS) $(LIBS) $(LDFLGS) + @DYNLIB_LD@ -o @YAPLIB@ $(LIB_OBJECTS) $(LIBS) $(LDFLGS) install: install_bin install_data diff --git a/configure b/configure index 5bccc0e81..3c745390d 100755 --- a/configure +++ b/configure @@ -309,7 +309,7 @@ ac_includes_default="\ # include #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT GCC C_INTERF_FLAGS C_PARSER_FLAGS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os LN_S INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA RANLIB ac_ct_RANLIB INDENT ac_ct_INDENT AR ac_ct_AR MPI_CC ac_ct_MPI_CC INSTALL_INFO CPP EGREP CPLINT_LIBS CPLINT_CFLAGS CPLINT_LDFLAGS CPLINT_SHLIB_LD ENABLE_CPLINT PRE_DYNLOADER_PATH EXTEND_DYNLOADER_PATH M4 M4GENHDRS INSTALL_DLLS MERGE_DLL_OBJS SHLIB_CFLAGS SHLIB_SUFFIX EXEC_SUFFIX DO_SECOND_LD SHLIB_LD SHLIB_SWI_LD DYNLIB_LD YAPLIB DYNYAPLIB YAP_EXTRAS NO_BUILTIN_REGEXP ENABLE_CHR ENABLE_CLPQR ENABLE_JPL JAVA_HOME JUNIT JAVAC JAVADOC JAVALIBS JAR IN_UNIX YAPMPILIB LAM_MPI_CC MPI_OBJS MPI_LIBS INSTALL_COMMAND INSTALLCLP JAVALIBPATH JAVAINCPATH LAMOBJS MAX_WORKERS STATIC_MODE ENABLE_WINCONSOLE USE_CUDD CUDD_LDFLAGS CUDD_CPPFLAGS INSTALL_MATLAB MATLAB_INCLUDE M4GENABSMI PROLOG_SYSTEM IN_YAP IN_SWI CHR_TARGETS LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT GCC C_INTERF_FLAGS C_PARSER_FLAGS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os LN_S INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA RANLIB ac_ct_RANLIB INDENT ac_ct_INDENT AR ac_ct_AR MPI_CC ac_ct_MPI_CC INSTALL_INFO CPP EGREP CPLINT_LIBS CPLINT_CFLAGS CPLINT_LDFLAGS CPLINT_SHLIB_LD ENABLE_CPLINT PRE_DYNLOADER_PATH EXTEND_DYNLOADER_PATH M4 M4GENHDRS INSTALL_DLLS MERGE_DLL_OBJS SHLIB_CFLAGS SHLIB_SUFFIX EXEC_SUFFIX DO_SECOND_LD SHLIB_LD SHLIB_SWI_LD DYNLIB_LD YAPLIB DYNYAPLIB YAP_EXTRAS NO_BUILTIN_REGEXP ENABLE_CHR ENABLE_CLPQR ENABLE_JPL JAVA JAVA_HOME JUNIT JAVAC JAVADOC JAVALIBS JAR IN_UNIX YAPMPILIB LAM_MPI_CC MPI_OBJS MPI_LIBS INSTALL_COMMAND INSTALLCLP JAVALIBPATH JAVAINCPATH LAMOBJS MAX_WORKERS STATIC_MODE ENABLE_WINCONSOLE USE_CUDD CUDD_LDFLAGS CUDD_CPPFLAGS INSTALL_MATLAB MATLAB_INCLUDE M4GENABSMI PROLOG_SYSTEM IN_YAP IN_SWI CHR_TARGETS LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -5508,6 +5508,7 @@ if test "$yap_cv_jpl" = no; then ENABLE_JPL="@#" elif test -e "$srcdir"/packages/jpl/Makefile.in; then ENABLE_JPL="" + JAVA=java JAVA_HOME="$yap_cv_jpl" if test "x$JAVALIBS" = "x"; then case "$target_os" in @@ -5523,10 +5524,12 @@ elif test -e "$srcdir"/packages/jpl/Makefile.in; then esac fi if test "$yap_cv_jpl" = ""; then + JAVA=java JAR=jar JAVAC=javac JAVADOC=javadoc else + JAVA="$yap_cv_jpl"/bin/java JAR="$yap_cv_jpl"/bin/jar JAVAC="$yap_cv_jpl"/bin/javac JAVADOC="$yap_cv_jpl"/bin/javadoc @@ -6453,12 +6456,20 @@ fi SHLIB_SWI_LD="gcc -shared -export-dynamic" DO_SECOND_LD="" LIBS="$LIBS -ldl" - case "$host_cpu" in + case "$target_cpu" in alpha*) LDFLAGS="-dynamic $LDFLAGS" ;; + x86*) + JAVALIBPATH="-L$JAVA_HOME/jre/lib/amd64 -L$JAVA_HOME/jre/lib/amd64/client -L$JAVA_HOME/jre/lib/amd64/server" + JAVAINCPATH="-I$JAVA_HOME/include -I$JAVA_HOME/include/linux" + if test "$CC" != "lcc" + then + LDFLAGS="-rdynamic $LDFLAGS" + fi + ;; *) - JAVALIBPATH="-L$JAVA_HOME/jre/lib/i386 -L$JAVA_HOME/jre/lib/i386/client" + JAVALIBPATH="-L$JAVA_HOME/jre/lib/i386 -L$JAVA_HOME/jre/lib/i386/client -L$JAVA_HOME/jre/lib/i386/server" JAVAINCPATH="-I$JAVA_HOME/include -I$JAVA_HOME/include/linux" if test "$CC" != "lcc" then @@ -13789,6 +13800,7 @@ EXEC_SUFFIX="" + echo "$as_me:$LINENO: checking for gcc threaded code" >&5 @@ -17685,6 +17697,7 @@ s,@NO_BUILTIN_REGEXP@,$NO_BUILTIN_REGEXP,;t t s,@ENABLE_CHR@,$ENABLE_CHR,;t t s,@ENABLE_CLPQR@,$ENABLE_CLPQR,;t t s,@ENABLE_JPL@,$ENABLE_JPL,;t t +s,@JAVA@,$JAVA,;t t s,@JAVA_HOME@,$JAVA_HOME,;t t s,@JUNIT@,$JUNIT,;t t s,@JAVAC@,$JAVAC,;t t diff --git a/configure.in b/configure.in index a9fe7eb77..32f2c0ad1 100644 --- a/configure.in +++ b/configure.in @@ -655,6 +655,7 @@ if test "$yap_cv_jpl" = no; then ENABLE_JPL="@#" elif test -e "$srcdir"/packages/jpl/Makefile.in; then ENABLE_JPL="" + JAVA=java JAVA_HOME="$yap_cv_jpl" if test "x$JAVALIBS" = "x"; then case "$target_os" in @@ -670,10 +671,12 @@ elif test -e "$srcdir"/packages/jpl/Makefile.in; then esac fi if test "$yap_cv_jpl" = ""; then + JAVA=java JAR=jar JAVAC=javac JAVADOC=javadoc else + JAVA="$yap_cv_jpl"/bin/java JAR="$yap_cv_jpl"/bin/jar JAVAC="$yap_cv_jpl"/bin/javac JAVADOC="$yap_cv_jpl"/bin/javadoc @@ -769,12 +772,20 @@ case "$target_os" in SHLIB_SWI_LD="gcc -shared -export-dynamic" DO_SECOND_LD="" LIBS="$LIBS -ldl" - case "$host_cpu" in + case "$target_cpu" in alpha*) LDFLAGS="-dynamic $LDFLAGS" ;; + x86*) + JAVALIBPATH="-L$JAVA_HOME/jre/lib/amd64 -L$JAVA_HOME/jre/lib/amd64/client -L$JAVA_HOME/jre/lib/amd64/server" + JAVAINCPATH="-I$JAVA_HOME/include -I$JAVA_HOME/include/linux" + if test "$CC" != "lcc" + then + LDFLAGS="-rdynamic $LDFLAGS" + fi + ;; *) - JAVALIBPATH="-L$JAVA_HOME/jre/lib/i386 -L$JAVA_HOME/jre/lib/i386/client" + JAVALIBPATH="-L$JAVA_HOME/jre/lib/i386 -L$JAVA_HOME/jre/lib/i386/client -L$JAVA_HOME/jre/lib/i386/server" JAVAINCPATH="-I$JAVA_HOME/include -I$JAVA_HOME/include/linux" if test "$CC" != "lcc" then @@ -1229,6 +1240,7 @@ AC_SUBST(NO_BUILTIN_REGEXP) AC_SUBST(ENABLE_CHR) AC_SUBST(ENABLE_CLPQR) AC_SUBST(ENABLE_JPL) +AC_SUBST(JAVA) AC_SUBST(JAVA_HOME) AC_SUBST(JUNIT) AC_SUBST(JAVAC) diff --git a/packages/chr b/packages/chr index e071f01c1..c325e4564 160000 --- a/packages/chr +++ b/packages/chr @@ -1 +1 @@ -Subproject commit e071f01c1d9015e6d3fabc73092a6e902541485a +Subproject commit c325e4564bb8d4e32c27f2061df85f13d315974e diff --git a/packages/jpl b/packages/jpl index eb6d27251..65951de17 160000 --- a/packages/jpl +++ b/packages/jpl @@ -1 +1 @@ -Subproject commit eb6d27251c2548c25e6d37fff2a27a014caaa7aa +Subproject commit 65951de17491d8c4190c0bb25b171752d11d96d2