o Remove the '--enable-static-only' flag from configure.ac.

  o Remove reading the '-static' flag from the package metadata.

diff --git a/openssh/configure.ac b/openssh/configure.ac
index e028a9da1e74dd1bb0da920ec49db0dcc4992e5d..405b17091b2f1f965d2c1fbe82eb52cbca33db00 100644 (file)
--- a/openssh/configure.ac
+++ b/openssh/configure.ac
@@ -2193,21 +2193,6 @@ AC_ARG_ENABLE(suid-ssh,
 )
 AC_SUBST(SSHMODE)
 
-AC_MSG_CHECKING(whether to build only static binaries)
-AC_ARG_ENABLE(static-only,
-[  --enable-static-only    Build only static binaries
-  --disable-static-only   Build shared binaries where supported (default)],
-[ case "$enableval" in
-  yes)
-       AC_MSG_RESULT(yes)
-       LDFLAGS="$LDFLAGS -static"
-       ;;
-  *)   AC_MSG_RESULT(no)
-       ;;
-  esac ],
-  AC_MSG_RESULT(no)
-)
-
 # Where to place sshd.pid
 piddir=/var/run
 # make sure the directory exists

diff --git a/openssh/pkg_data_src.gpt b/openssh/pkg_data_src.gpt
index f3f107b6d408da483dac953b8da2cf696983b62d..bf4e5a61d1c36fc96cd72b04731f960450aafa5a 100644 (file)
--- a/openssh/pkg_data_src.gpt
+++ b/openssh/pkg_data_src.gpt
@@ -46,11 +46,7 @@
       <Build_Step>
         . $GLOBUS_LOCATION/libexec/globus-build-env-FLAVOR_GPTMACRO.sh
 
-        if test "STATIC_LINK_GPTMACRO" = "yes"; then
-          static_option=--enable-static-only
-        fi
-
-        ./configure --prefix=INSTALLDIR_GPTMACRO --with-globus=INSTALLDIR_GPTMACRO --with-globus-flavor=FLAVOR_GPTMACRO --disable-suid-ssh $static_option GSI_OPENSSH_GPTMACRO
+        ./configure --prefix=INSTALLDIR_GPTMACRO --with-globus=INSTALLDIR_GPTMACRO --with-globus-flavor=FLAVOR_GPTMACRO --disable-suid-ssh GSI_OPENSSH_GPTMACRO
       </Build_Step>
 
       <Build_Step>