Remove amuse-ph4-sapporo package in favour of amuse-ph4-sapporo2

Author: LourensVeen

src/amuse_ph4/Makefile

@@ -39,9 +39,6 @@ ph4_worker.o: ph4_worker.cc ph4_worker.h
 ph4_worker: ph4_worker.o interface.o $(CODELIB)
 	$(MPICXX) -o $@ $(LDFLAGS) $^ $(LDLIBS)
 
-ph4_sapporo_worker: ph4_worker.o interface.o $(CODELIB_SAPPORO)
-	$(MPICXX) -o $@ $(LDFLAGS) $^ $(LDLIBS) $(SAPPORO_LIGHT_LIBS)
-
 ph4_sapporo2_worker: ph4_worker.o interface.o $(CODELIB_SAPPORO)
 	$(MPICXX) -o $@ $(LDFLAGS) $^ $(LDLIBS) -lsapporoG6 $(SAPPORO2_LIBS)
 
@@ -52,8 +49,6 @@ ph4_sapporo2_worker: ph4_worker.o interface.o $(CODELIB_SAPPORO)
 # Which packages contain which workers?
 amuse-ph4_contains: ph4_worker
 
-amuse-ph4-sapporo_contains: ph4_sapporo_worker
-
 amuse-ph4-sapporo2_contains: ph4_sapporo2_worker
 
 

src/amuse_ph4/packages/amuse-ph4-sapporo.amuse_deps

@@ -25,10 +25,6 @@ STOPCOND_LIBS = @STOPCOND_LIBS@
 
 
 # External dependencies
-FOUND_SAPPORO_LIGHT = @FOUND_SAPPORO_LIGHT@
-SAPPORO_LIGHT_CFLAGS = @SAPPORO_LIGHT_CFLAGS@
-SAPPORO_LIGHT_LIBS = @SAPPORO_LIGHT_LIBS@
-
 FOUND_SAPPORO2 = @FOUND_SAPPORO2@
 SAPPORO2_CFLAGS = @SAPPORO2_CFLAGS@
 SAPPORO2_LIBS = @SAPPORO2_LIBS@

src/amuse_ph4/packages/amuse-ph4-sapporo/amuse_ph4

@@ -625,9 +625,6 @@ MPICC
 FOUND_SAPPORO2
 SAPPORO2_LIBS
 SAPPORO2_CFLAGS
-FOUND_SAPPORO_LIGHT
-SAPPORO_LIGHT_LIBS
-SAPPORO_LIGHT_CFLAGS
 FOUND_STOPCOND
 STOPCOND_LIBS
 STOPCOND_CFLAGS
@@ -721,8 +718,6 @@ PKG_CONFIG_PATH
 PKG_CONFIG_LIBDIR
 STOPCOND_CFLAGS
 STOPCOND_LIBS
-SAPPORO_LIGHT_CFLAGS
-SAPPORO_LIGHT_LIBS
 SAPPORO2_CFLAGS
 SAPPORO2_LIBS
 MPICC
@@ -1365,10 +1360,6 @@ Some influential environment variables:
               C compiler flags for STOPCOND, overriding pkg-config
   STOPCOND_LIBS
               linker flags for STOPCOND, overriding pkg-config
-  SAPPORO_LIGHT_CFLAGS
-              C compiler flags for SAPPORO_LIGHT, overriding pkg-config
-  SAPPORO_LIGHT_LIBS
-              linker flags for SAPPORO_LIGHT, overriding pkg-config
   SAPPORO2_CFLAGS
               C compiler flags for SAPPORO2, overriding pkg-config
   SAPPORO2_LIBS
@@ -5060,211 +5051,6 @@ fi
 
 
 
-    amuse_save_LIBS="$LIBS"
-    amuse_save_LIB_CFLAGS="$SAPPORO_LIGHT_CFLAGS"
-    amuse_save_LIB_LIBS="$SAPPORO_LIGHT_LIBS"
-    amuse_save_PKG_CONFIG_PATH="$PKG_CONFIG_PATH"
-
-    # If we have an active virtualenv, make sure pkg-config searches it
-    if test "a${VIRTUAL_ENV}" != "a"
-    then
-        PKG_CONFIG_PATH="${VIRTUAL_ENV}/lib/pkgconfig:${PKG_CONFIG_PATH}"
-    fi
-
-    # All AMUSE libs export C symbols
-    ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-    # Search for the library, first directly then fall back to pkg-config
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing get_device_count" >&5
-printf %s "checking for library containing get_device_count... " >&6; }
-if test ${ac_cv_search_get_device_count+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  ac_func_search_save_LIBS=$LIBS
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-char get_device_count ();
-int
-main (void)
-{
-return get_device_count ();
-  ;
-  return 0;
-}
-_ACEOF
-for ac_lib in '' sapporo
-do
-  if test -z "$ac_lib"; then
-    ac_res="none required"
-  else
-    ac_res=-l$ac_lib
-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-  fi
-  if ac_fn_c_try_link "$LINENO"
-then :
-  ac_cv_search_get_device_count=$ac_res
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
-    conftest$ac_exeext
-  if test ${ac_cv_search_get_device_count+y}
-then :
-  break
-fi
-done
-if test ${ac_cv_search_get_device_count+y}
-then :
-
-else $as_nop
-  ac_cv_search_get_device_count=no
-fi
-rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_get_device_count" >&5
-printf "%s\n" "$ac_cv_search_get_device_count" >&6; }
-ac_res=$ac_cv_search_get_device_count
-if test "$ac_res" != no
-then :
-  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-
-        FOUND_SAPPORO_LIGHT="yes"
-        SAPPORO_LIGHT_LIBS="$LIBS"
-        SAPPORO_LIGHT_CFLAGS=""
-
-else $as_nop
-
-
-pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SAPPORO_LIGHT" >&5
-printf %s "checking for SAPPORO_LIGHT... " >&6; }
-
-if test -n "$SAPPORO_LIGHT_CFLAGS"; then
-    pkg_cv_SAPPORO_LIGHT_CFLAGS="$SAPPORO_LIGHT_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sapporo_light\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "sapporo_light") 2>&5
-  ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_SAPPORO_LIGHT_CFLAGS=`$PKG_CONFIG --cflags "sapporo_light" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-if test -n "$SAPPORO_LIGHT_LIBS"; then
-    pkg_cv_SAPPORO_LIGHT_LIBS="$SAPPORO_LIGHT_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sapporo_light\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "sapporo_light") 2>&5
-  ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_SAPPORO_LIGHT_LIBS=`$PKG_CONFIG --libs "sapporo_light" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
-   	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi
-        if test $_pkg_short_errors_supported = yes; then
-	        SAPPORO_LIGHT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "sapporo_light" 2>&1`
-        else
-	        SAPPORO_LIGHT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "sapporo_light" 2>&1`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$SAPPORO_LIGHT_PKG_ERRORS" >&5
-
-
-            FOUND_SAPPORO_LIGHT="no"
-
-elif test $pkg_failed = untried; then
-     	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-
-            FOUND_SAPPORO_LIGHT="no"
-
-else
-	SAPPORO_LIGHT_CFLAGS=$pkg_cv_SAPPORO_LIGHT_CFLAGS
-	SAPPORO_LIGHT_LIBS=$pkg_cv_SAPPORO_LIGHT_LIBS
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
-
-            FOUND_SAPPORO_LIGHT="yes"
-
-fi
-
-fi
-
-
-    ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-    PKG_CONFIG_PATH="$amuse_save_PKG_CONFIG_PATH"
-    LIBS="$amuse_save_LIBS"
-
-    # If we have an active CONDA environment, assume that the lib is coming from
-    # there and add an additional flag so that .mod files can be found. Only really
-    # needed for stopcond and forsockets, and hopefully conda-forge will give us a
-    # better solution soon.
-    if test "${FOUND_SAPPORO_LIGHT}" == "yes" -a "x$CONDA_PREFIX" != "x"
-    then
-        SAPPORO_LIGHT_CFLAGS="${SAPPORO_LIGHT_CFLAGS} -I${CONDA_PREFIX}/include"
-    fi
-
-    # If the user overrode the variables, go with what they set instead of
-    # what we just detected.
-    if test "x$amuse_save_LIB_CFLAGS" != "x"
-then :
-
-        SAPPORO_LIGHT_CFLAGS="$amuse_save_LIB_CFLAGS"
-
-fi
-    if test "x$amuse_save_LIB_LIBS" != "x"
-then :
-
-        SAPPORO_LIGHT_LIBS="$amuse_save_LIB_LIBS"
-
-fi
-
-
-
-
-
-
-
-
     amuse_save_LIBS="$LIBS"
     amuse_save_LIB_CFLAGS="$SAPPORO2_CFLAGS"
     amuse_save_LIB_LIBS="$SAPPORO2_LIBS"

src/amuse_ph4/packages/amuse-ph4-sapporo/pyproject.toml

@@ -26,7 +26,6 @@ AS_IF([test $RANLIB = ":"], [AC_MSG_ERROR([ranlib command not found.])])
 
 # Find AMUSE libraries
 AMUSE_LIB_STOPCOND()
-AMUSE_LIB_SAPPORO_LIGHT()
 AMUSE_LIB_SAPPORO2()