March 2018 - PPL-devel - BUGSENG Mailman

[GIT] ppl/ppl(master): Revert " Better support for dynamically-loadable modules."
by Roberto Bagnara 28 Mar '18

28 Mar '18

Module: ppl/ppl Branch: master Commit: 5f4acc5462c8c60fd216c0a98ae6b724ea12872a URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=5f4acc5462c8… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Wed Mar 28 08:20:46 2018 +0200 Revert "Better support for dynamically-loadable modules." This reverts commit bc7ffae942e400c282f1e3abd06db6aa5d434035. --- configure.ac | 8 -------- interfaces/Java/jni/Makefile.am | 5 ----- interfaces/Prolog/Ciao/Makefile.am | 3 --- interfaces/Prolog/GNU/Makefile.am | 3 --- interfaces/Prolog/SICStus/Makefile.am | 3 --- interfaces/Prolog/SWI/Makefile.am | 3 --- interfaces/Prolog/XSB/Makefile.am | 3 --- interfaces/Prolog/YAP/Makefile.am | 3 --- 8 files changed, 0 insertions(+), 31 deletions(-) diff --git a/configure.ac b/configure.ac index 6d62c66..39e02af 100644 --- a/configure.ac +++ b/configure.ac @@ -1281,13 +1281,6 @@ fi AM_CONDITIONAL(BUILD_YAP_PROLOG_INTERFACE, test x$build_yap_prolog_interface = xyes) -# Allow extra Libtool flags (typically to set the rpath) for linking -# dynamically-loadable modules. -AC_ARG_WITH(module-flags, - AS_HELP_STRING([--with-module-flags=XXX], - [add XXX to the linking options for dynamically-loadable modules]), - module_flags="$with_module_flags") - # Test if some Prolog interfaces have to be built. if test x$build_ciao_prolog_interface = xyes \ || test x$build_gnu_prolog_interface = xyes \ @@ -1671,7 +1664,6 @@ AC_SUBST(required_instantiations_ocaml_cxx_headers) AC_SUBST(required_instantiations_ocaml_cxx_sources) AC_SUBST(required_instantiations_ocaml_cxx_objects) AC_SUBST(mlgmp_dir) -AC_SUBST(module_flags) AC_CONFIG_FILES(Makefile ppl.lsm diff --git a/interfaces/Java/jni/Makefile.am b/interfaces/Java/jni/Makefile.am index 0bd5d33..0b0704d 100644 --- a/interfaces/Java/jni/Makefile.am +++ b/interfaces/Java/jni/Makefile.am @@ -64,12 +64,9 @@ NO_UNDEFINED_FLAG = -no-undefined endif NO_UNDEFINED -MODULE_FLAGS = @module_flags@ - if HOST_OS_DARWIN libppl_java_la_LDFLAGS = \ -$(MODULE_FLAGS) \ $(NO_UNDEFINED_FLAG) \ -avoid-version \ -shrext .jnilib @@ -79,7 +76,6 @@ else !HOST_OS_DARWIN if HOST_OS_MINGW libppl_java_la_LDFLAGS = \ -$(MODULE_FLAGS) \ $(NO_UNDEFINED_FLAG) \ -module \ -avoid-version \ @@ -88,7 +84,6 @@ $(NO_UNDEFINED_FLAG) \ else !HOST_OS_MINGW libppl_java_la_LDFLAGS = \ -$(MODULE_FLAGS) \ $(NO_UNDEFINED_FLAG) \ -module \ -avoid-version diff --git a/interfaces/Prolog/Ciao/Makefile.am b/interfaces/Prolog/Ciao/Makefile.am index 6e91715..561c439 100644 --- a/interfaces/Prolog/Ciao/Makefile.am +++ b/interfaces/Prolog/Ciao/Makefile.am @@ -156,10 +156,7 @@ $(top_builddir)/src/libppl.la \ libppl_ciao_la_DEPENDENCIES = \ @required_instantiations_prolog_cxx_objects@ -MODULE_FLAGS = @module_flags@ - libppl_ciao_la_LDFLAGS = \ -$(MODULE_FLAGS) \ $(NO_UNDEFINED_FLAG) \ -module \ -avoid-version diff --git a/interfaces/Prolog/GNU/Makefile.am b/interfaces/Prolog/GNU/Makefile.am index 07d178d..4aef5cd 100644 --- a/interfaces/Prolog/GNU/Makefile.am +++ b/interfaces/Prolog/GNU/Makefile.am @@ -151,10 +151,7 @@ $(top_builddir)/src/libppl.la \ libppl_gprolog_la_DEPENDENCIES = \ @required_instantiations_prolog_cxx_objects@ -MODULE_FLAGS = @module_flags@ - libppl_gprolog_la_LDFLAGS = \ -$(MODULE_FLAGS) \ $(NO_UNDEFINED_FLAG) \ -module \ -avoid-version diff --git a/interfaces/Prolog/SICStus/Makefile.am b/interfaces/Prolog/SICStus/Makefile.am index 2c8030a..2cc9061 100644 --- a/interfaces/Prolog/SICStus/Makefile.am +++ b/interfaces/Prolog/SICStus/Makefile.am @@ -184,10 +184,7 @@ $(top_builddir)/src/libppl.la \ libppl_sicstus_la_DEPENDENCIES = \ @required_instantiations_prolog_cxx_objects@ -MODULE_FLAGS = @module_flags@ - libppl_sicstus_la_LDFLAGS = \ -$(MODULE_FLAGS) \ $(NO_UNDEFINED_FLAG) \ -module \ -avoid-version diff --git a/interfaces/Prolog/SWI/Makefile.am b/interfaces/Prolog/SWI/Makefile.am index 18e7fbf..dcb8954 100644 --- a/interfaces/Prolog/SWI/Makefile.am +++ b/interfaces/Prolog/SWI/Makefile.am @@ -178,10 +178,7 @@ $(SWI_PROLOG_LD_OPTIONS) libppl_swiprolog_la_DEPENDENCIES = \ @required_instantiations_prolog_cxx_objects@ -MODULE_FLAGS = @module_flags@ - libppl_swiprolog_la_LDFLAGS = \ -$(MODULE_FLAGS) \ $(NO_UNDEFINED_FLAG) \ -module \ -avoid-version diff --git a/interfaces/Prolog/XSB/Makefile.am b/interfaces/Prolog/XSB/Makefile.am index 7ac1c79..ddce881 100644 --- a/interfaces/Prolog/XSB/Makefile.am +++ b/interfaces/Prolog/XSB/Makefile.am @@ -174,10 +174,7 @@ $(top_builddir)/src/libppl.la \ libppl_xsb_la_DEPENDENCIES = \ @required_instantiations_prolog_cxx_objects@ -MODULE_FLAGS = @module_flags@ - libppl_xsb_la_LDFLAGS = \ -$(MODULE_FLAGS) \ $(NO_UNDEFINED_FLAG) \ -module \ -avoid-version diff --git a/interfaces/Prolog/YAP/Makefile.am b/interfaces/Prolog/YAP/Makefile.am index 6b5f724..85dbc2a 100644 --- a/interfaces/Prolog/YAP/Makefile.am +++ b/interfaces/Prolog/YAP/Makefile.am @@ -165,10 +165,7 @@ $(top_builddir)/src/libppl.la \ ppl_yap_la_DEPENDENCIES = \ @required_instantiations_prolog_cxx_objects@ -MODULE_FLAGS = @module_flags@ - ppl_yap_la_LDFLAGS = \ -$(MODULE_FLAGS) \ $(NO_UNDEFINED_FLAG) \ -module \ -avoid-version

1 0

[GIT] ppl/ppl(master): Escape backslashes in PPL_CONFIGURE_OPTIONS.
by Roberto Bagnara 27 Mar '18

27 Mar '18

Module: ppl/ppl Branch: master Commit: 2ad4d2017354a3331d1a6bc015c0be76c1a262a0 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=2ad4d2017354… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Tue Mar 27 22:17:33 2018 +0200 Escape backslashes in PPL_CONFIGURE_OPTIONS. --- configure.ac | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 3380534..6d62c66 100644 --- a/configure.ac +++ b/configure.ac @@ -68,10 +68,6 @@ AC_SUBST(PPL_VERSION_MINOR) AC_SUBST(PPL_VERSION_REVISION) AC_SUBST(PPL_VERSION_BETA) -AC_DEFINE_UNQUOTED(PPL_CONFIGURE_OPTIONS, "$ac_configure_args", [This contains the options with which `configure' was invoked.]) -PPL_CONFIGURE_OPTIONS="\"$ac_configure_args\"" -AC_SUBST(CONFIGURE_OPTIONS) - # Generate a configuration header file. AC_CONFIG_HEADER([config.h]) @@ -291,6 +287,11 @@ AC_PROG_CXXCPP AC_PROG_MAKE_SET AC_PROG_INSTALL +AC_DEFINE_UNQUOTED(PPL_CONFIGURE_OPTIONS, "`echo $ac_configure_args | $SED -e 's/\\\\/\\\\\\\\/g'`", [This contains the options with which `configure' was invoked.]) +PPL_CONFIGURE_OPTIONS="\"$ac_configure_args\"" +AC_SUBST(CONFIGURE_OPTIONS) + + # Compilation flags. COMP_FLAGS=""

1 0

[GIT] ppl/ppl(master): Better support for dynamically-loadable modules.
by Roberto Bagnara 27 Mar '18

27 Mar '18

Module: ppl/ppl Branch: master Commit: bc7ffae942e400c282f1e3abd06db6aa5d434035 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=bc7ffae942e4… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Tue Mar 27 19:57:43 2018 +0200 Better support for dynamically-loadable modules. --- configure.ac | 8 ++++++++ interfaces/Java/jni/Makefile.am | 5 +++++ interfaces/Prolog/Ciao/Makefile.am | 3 +++ interfaces/Prolog/GNU/Makefile.am | 3 +++ interfaces/Prolog/SICStus/Makefile.am | 3 +++ interfaces/Prolog/SWI/Makefile.am | 3 +++ interfaces/Prolog/XSB/Makefile.am | 3 +++ interfaces/Prolog/YAP/Makefile.am | 3 +++ 8 files changed, 31 insertions(+), 0 deletions(-) diff --git a/configure.ac b/configure.ac index 7b360f6..3380534 100644 --- a/configure.ac +++ b/configure.ac @@ -1280,6 +1280,13 @@ fi AM_CONDITIONAL(BUILD_YAP_PROLOG_INTERFACE, test x$build_yap_prolog_interface = xyes) +# Allow extra Libtool flags (typically to set the rpath) for linking +# dynamically-loadable modules. +AC_ARG_WITH(module-flags, + AS_HELP_STRING([--with-module-flags=XXX], + [add XXX to the linking options for dynamically-loadable modules]), + module_flags="$with_module_flags") + # Test if some Prolog interfaces have to be built. if test x$build_ciao_prolog_interface = xyes \ || test x$build_gnu_prolog_interface = xyes \ @@ -1663,6 +1670,7 @@ AC_SUBST(required_instantiations_ocaml_cxx_headers) AC_SUBST(required_instantiations_ocaml_cxx_sources) AC_SUBST(required_instantiations_ocaml_cxx_objects) AC_SUBST(mlgmp_dir) +AC_SUBST(module_flags) AC_CONFIG_FILES(Makefile ppl.lsm diff --git a/interfaces/Java/jni/Makefile.am b/interfaces/Java/jni/Makefile.am index 0b0704d..0bd5d33 100644 --- a/interfaces/Java/jni/Makefile.am +++ b/interfaces/Java/jni/Makefile.am @@ -64,9 +64,12 @@ NO_UNDEFINED_FLAG = -no-undefined endif NO_UNDEFINED +MODULE_FLAGS = @module_flags@ + if HOST_OS_DARWIN libppl_java_la_LDFLAGS = \ +$(MODULE_FLAGS) \ $(NO_UNDEFINED_FLAG) \ -avoid-version \ -shrext .jnilib @@ -76,6 +79,7 @@ else !HOST_OS_DARWIN if HOST_OS_MINGW libppl_java_la_LDFLAGS = \ +$(MODULE_FLAGS) \ $(NO_UNDEFINED_FLAG) \ -module \ -avoid-version \ @@ -84,6 +88,7 @@ $(NO_UNDEFINED_FLAG) \ else !HOST_OS_MINGW libppl_java_la_LDFLAGS = \ +$(MODULE_FLAGS) \ $(NO_UNDEFINED_FLAG) \ -module \ -avoid-version diff --git a/interfaces/Prolog/Ciao/Makefile.am b/interfaces/Prolog/Ciao/Makefile.am index 561c439..6e91715 100644 --- a/interfaces/Prolog/Ciao/Makefile.am +++ b/interfaces/Prolog/Ciao/Makefile.am @@ -156,7 +156,10 @@ $(top_builddir)/src/libppl.la \ libppl_ciao_la_DEPENDENCIES = \ @required_instantiations_prolog_cxx_objects@ +MODULE_FLAGS = @module_flags@ + libppl_ciao_la_LDFLAGS = \ +$(MODULE_FLAGS) \ $(NO_UNDEFINED_FLAG) \ -module \ -avoid-version diff --git a/interfaces/Prolog/GNU/Makefile.am b/interfaces/Prolog/GNU/Makefile.am index 4aef5cd..07d178d 100644 --- a/interfaces/Prolog/GNU/Makefile.am +++ b/interfaces/Prolog/GNU/Makefile.am @@ -151,7 +151,10 @@ $(top_builddir)/src/libppl.la \ libppl_gprolog_la_DEPENDENCIES = \ @required_instantiations_prolog_cxx_objects@ +MODULE_FLAGS = @module_flags@ + libppl_gprolog_la_LDFLAGS = \ +$(MODULE_FLAGS) \ $(NO_UNDEFINED_FLAG) \ -module \ -avoid-version diff --git a/interfaces/Prolog/SICStus/Makefile.am b/interfaces/Prolog/SICStus/Makefile.am index 2cc9061..2c8030a 100644 --- a/interfaces/Prolog/SICStus/Makefile.am +++ b/interfaces/Prolog/SICStus/Makefile.am @@ -184,7 +184,10 @@ $(top_builddir)/src/libppl.la \ libppl_sicstus_la_DEPENDENCIES = \ @required_instantiations_prolog_cxx_objects@ +MODULE_FLAGS = @module_flags@ + libppl_sicstus_la_LDFLAGS = \ +$(MODULE_FLAGS) \ $(NO_UNDEFINED_FLAG) \ -module \ -avoid-version diff --git a/interfaces/Prolog/SWI/Makefile.am b/interfaces/Prolog/SWI/Makefile.am index dcb8954..18e7fbf 100644 --- a/interfaces/Prolog/SWI/Makefile.am +++ b/interfaces/Prolog/SWI/Makefile.am @@ -178,7 +178,10 @@ $(SWI_PROLOG_LD_OPTIONS) libppl_swiprolog_la_DEPENDENCIES = \ @required_instantiations_prolog_cxx_objects@ +MODULE_FLAGS = @module_flags@ + libppl_swiprolog_la_LDFLAGS = \ +$(MODULE_FLAGS) \ $(NO_UNDEFINED_FLAG) \ -module \ -avoid-version diff --git a/interfaces/Prolog/XSB/Makefile.am b/interfaces/Prolog/XSB/Makefile.am index ddce881..7ac1c79 100644 --- a/interfaces/Prolog/XSB/Makefile.am +++ b/interfaces/Prolog/XSB/Makefile.am @@ -174,7 +174,10 @@ $(top_builddir)/src/libppl.la \ libppl_xsb_la_DEPENDENCIES = \ @required_instantiations_prolog_cxx_objects@ +MODULE_FLAGS = @module_flags@ + libppl_xsb_la_LDFLAGS = \ +$(MODULE_FLAGS) \ $(NO_UNDEFINED_FLAG) \ -module \ -avoid-version diff --git a/interfaces/Prolog/YAP/Makefile.am b/interfaces/Prolog/YAP/Makefile.am index 85dbc2a..6b5f724 100644 --- a/interfaces/Prolog/YAP/Makefile.am +++ b/interfaces/Prolog/YAP/Makefile.am @@ -165,7 +165,10 @@ $(top_builddir)/src/libppl.la \ ppl_yap_la_DEPENDENCIES = \ @required_instantiations_prolog_cxx_objects@ +MODULE_FLAGS = @module_flags@ + ppl_yap_la_LDFLAGS = \ +$(MODULE_FLAGS) \ $(NO_UNDEFINED_FLAG) \ -module \ -avoid-version

1 0

[GIT] ppl/ppl(master): Typo fixed.
by Roberto Bagnara 27 Mar '18

27 Mar '18

Module: ppl/ppl Branch: master Commit: f85b36accc826ec0a869e7fda61450136939d445 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=f85b36accc82… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Tue Mar 27 12:39:08 2018 +0200 Typo fixed. --- interfaces/Prolog/SWI/Makefile.am | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/interfaces/Prolog/SWI/Makefile.am b/interfaces/Prolog/SWI/Makefile.am index 783f6a2..dcb8954 100644 --- a/interfaces/Prolog/SWI/Makefile.am +++ b/interfaces/Prolog/SWI/Makefile.am @@ -72,7 +72,7 @@ ppl_swiprolog.cc: $(interface_generator_dependencies) pkglib_LTLIBRARIES = libppl_swiprolog.la -pkginclude_HEADERS = +pkginclude_HEADERS = \ $(SWI_CFLI_FILES) \ ppl_swiprolog.hh

1 0

[GIT] ppl/ppl(master): Install also the header files required for static linking.
by Roberto Bagnara 27 Mar '18

27 Mar '18

Module: ppl/ppl Branch: master Commit: e4afe707bbc8dccae4bc43a13eb8c09fb3dc9b37 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=e4afe707bbc8… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Tue Mar 27 12:36:06 2018 +0200 Install also the header files required for static linking. --- interfaces/Prolog/SWI/Makefile.am | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/interfaces/Prolog/SWI/Makefile.am b/interfaces/Prolog/SWI/Makefile.am index 0d44db7..783f6a2 100644 --- a/interfaces/Prolog/SWI/Makefile.am +++ b/interfaces/Prolog/SWI/Makefile.am @@ -72,6 +72,10 @@ ppl_swiprolog.cc: $(interface_generator_dependencies) pkglib_LTLIBRARIES = libppl_swiprolog.la +pkginclude_HEADERS = +$(SWI_CFLI_FILES) \ +ppl_swiprolog.hh + libppl_swiprolog_la_SOURCES = \ ppl_prolog_sysdep.hh \ ppl_swiprolog.hh \

1 0