Skip to content

R
riscv-gcc-1
Commit ab408bac by Jakub Jelinek Committed by Jakub Jelinek
Options

re PR libgcj/24940 (libjava/configure uses $SED without defining it) 

	PR libgcj/24940
	* shlibpath.m4: Replace $SED with sed.
	* configure: Rebuilt.

From-SVN: r109452
parent 2b9a33ae
Showing with 26 additions and 20 deletions
libjava/ChangeLog
2006-01-07 Jakub Jelinek <jakub@redhat.com>
PR libgcj/24940
* shlibpath.m4: Replace $SED with sed.
* configure: Rebuilt.
2006-01-06 Tom Tromey <tromey@redhat.com> 2006-01-06 Tom Tromey <tromey@redhat.com>
* java/lang/Character.java (SIZE, MAX_CACHE, charCache, * java/lang/Character.java (SIZE, MAX_CACHE, charCache,
......
libjava/configure
...@@ -4031,15 +4031,15 @@ version_type=none ...@@ -4031,15 +4031,15 @@ version_type=none
dynamic_linker="$host_os ld.so" dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib" sys_lib_dlsearch_path_spec="/lib /usr/lib"
if test "$GCC" = yes; then if test "$GCC" = yes; then
sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g"`
if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
# if the path contains ";" then we assume it to be the separator # if the path contains ";" then we assume it to be the separator
# otherwise default to the standard path separator (i.e. ":") - it is # otherwise default to the standard path separator (i.e. ":") - it is
# assumed that no part of a normal pathname contains ";" but that should # assumed that no part of a normal pathname contains ";" but that should
# okay in the real world where ";" in dirpaths is itself problematic. # okay in the real world where ";" in dirpaths is itself problematic.
sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | sed -e 's/;/ /g'`
else else
sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | sed -e "s/$PATH_SEPARATOR/ /g"`
fi fi
else else
sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
...@@ -4154,13 +4154,13 @@ cygwin* | mingw* | pw32*) ...@@ -4154,13 +4154,13 @@ cygwin* | mingw* | pw32*)
case $host_os in case $host_os in
cygwin*) cygwin*)
# Cygwin DLLs use 'cyg' prefix rather than 'lib' # Cygwin DLLs use 'cyg' prefix rather than 'lib'
soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | sed -e 's/[.]/-/g'`${versuffix}${shared_ext}'
sys_lib_search_path_spec="/lib /lib/w32api /usr/lib /usr/local/lib" sys_lib_search_path_spec="/lib /lib/w32api /usr/lib /usr/local/lib"
;; ;;
mingw*) mingw*)
# MinGW DLLs use traditional 'lib' prefix # MinGW DLLs use traditional 'lib' prefix
soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' soname_spec='${libname}`echo ${release} | sed -e 's/[.]/-/g'`${versuffix}${shared_ext}'
sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g"`
if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then
# It is most probably a Windows format PATH printed by # It is most probably a Windows format PATH printed by
# mingw gcc, but we are running on Cygwin. Gcc prints its search # mingw gcc, but we are running on Cygwin. Gcc prints its search
...@@ -4168,20 +4168,20 @@ cygwin* | mingw* | pw32*) ...@@ -4168,20 +4168,20 @@ cygwin* | mingw* | pw32*)
# drive letters (cygwin fileutils understands them), so leave them, # drive letters (cygwin fileutils understands them), so leave them,
# especially as we might pass files found there to a mingw objdump, # especially as we might pass files found there to a mingw objdump,
# which wouldn't understand a cygwinified path. Ahh. # which wouldn't understand a cygwinified path. Ahh.
sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | sed -e 's/;/ /g'`
else else
sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | sed -e "s/$PATH_SEPARATOR/ /g"`
fi fi
;; ;;
pw32*) pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib' # pw32 DLLs use 'pw' prefix rather than 'lib'
library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}' library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | sed -e 's/./-/g'`${versuffix}${shared_ext}'
;; ;;
esac esac
;; ;;
*) *)
library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' library_names_spec='${libname}`echo ${release} | sed -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
;; ;;
esac esac
dynamic_linker='Win32 ld.exe' dynamic_linker='Win32 ld.exe'
......
libjava/shlibpath.m4
...@@ -41,15 +41,15 @@ version_type=none ...@@ -41,15 +41,15 @@ version_type=none
dynamic_linker="$host_os ld.so" dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib" sys_lib_dlsearch_path_spec="/lib /usr/lib"
if test "$GCC" = yes; then if test "$GCC" = yes; then
sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g"`
if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
# if the path contains ";" then we assume it to be the separator # if the path contains ";" then we assume it to be the separator
# otherwise default to the standard path separator (i.e. ":") - it is # otherwise default to the standard path separator (i.e. ":") - it is
# assumed that no part of a normal pathname contains ";" but that should # assumed that no part of a normal pathname contains ";" but that should
# okay in the real world where ";" in dirpaths is itself problematic. # okay in the real world where ";" in dirpaths is itself problematic.
sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | sed -e 's/;/ /g'`
else else
sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | sed -e "s/$PATH_SEPARATOR/ /g"`
fi fi
else else
sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
...@@ -164,13 +164,13 @@ cygwin* | mingw* | pw32*) ...@@ -164,13 +164,13 @@ cygwin* | mingw* | pw32*)
case $host_os in case $host_os in
cygwin*) cygwin*)
# Cygwin DLLs use 'cyg' prefix rather than 'lib' # Cygwin DLLs use 'cyg' prefix rather than 'lib'
soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | sed -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
sys_lib_search_path_spec="/lib /lib/w32api /usr/lib /usr/local/lib" sys_lib_search_path_spec="/lib /lib/w32api /usr/lib /usr/local/lib"
;; ;;
mingw*) mingw*)
# MinGW DLLs use traditional 'lib' prefix # MinGW DLLs use traditional 'lib' prefix
soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' soname_spec='${libname}`echo ${release} | sed -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g"`
if echo "$sys_lib_search_path_spec" | [grep ';[c-zC-Z]:/' >/dev/null]; then if echo "$sys_lib_search_path_spec" | [grep ';[c-zC-Z]:/' >/dev/null]; then
# It is most probably a Windows format PATH printed by # It is most probably a Windows format PATH printed by
# mingw gcc, but we are running on Cygwin. Gcc prints its search # mingw gcc, but we are running on Cygwin. Gcc prints its search
...@@ -178,20 +178,20 @@ cygwin* | mingw* | pw32*) ...@@ -178,20 +178,20 @@ cygwin* | mingw* | pw32*)
# drive letters (cygwin fileutils understands them), so leave them, # drive letters (cygwin fileutils understands them), so leave them,
# especially as we might pass files found there to a mingw objdump, # especially as we might pass files found there to a mingw objdump,
# which wouldn't understand a cygwinified path. Ahh. # which wouldn't understand a cygwinified path. Ahh.
sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | sed -e 's/;/ /g'`
else else
sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | sed -e "s/$PATH_SEPARATOR/ /g"`
fi fi
;; ;;
pw32*) pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib' # pw32 DLLs use 'pw' prefix rather than 'lib'
library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | sed -e 's/[.]/-/g'`${versuffix}${shared_ext}'
;; ;;
esac esac
;; ;;
*) *)
library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' library_names_spec='${libname}`echo ${release} | sed -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
;; ;;
esac esac
dynamic_linker='Win32 ld.exe' dynamic_linker='Win32 ld.exe'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment