openbsd-ports/converters/libiconv/patches/patch-libcharset_autoconf_ltmain_sh
brad 410ae9bae6 remove local changes to libtool made by libiconv authors
which make dirs with mode 777.
--
Brought to my attention by: Mike Pechkin <mpech@prosoft.org.lv>
2002-09-17 01:25:03 +00:00

113 lines
3.5 KiB
Plaintext

--- libcharset/autoconf/ltmain.sh.orig Wed Feb 6 07:11:25 2002
+++ libcharset/autoconf/ltmain.sh Mon Sep 16 19:04:12 2002
@@ -546,8 +546,6 @@ compiler."
if test $status -ne 0 && test ! -d $dir; then
exit $status
fi
- $show "chmod 777 $dir"
- $run chmod 777 $dir
fi
fi
if test "$compiler_o_lo" = yes; then
@@ -1312,8 +1310,6 @@ compiler."
if test $status -ne 0 && test ! -d $output_objdir; then
exit $status
fi
- $show "chmod 777 $output_objdir"
- $run chmod 777 $output_objdir
fi
# Determine the type of output
@@ -1888,11 +1884,7 @@ compiler."
add="-l$name"
else
# We cannot seem to hardcode it, guess we'll fake it.
- if test "X$installed" = Xyes; then
- add_dir="-L$libdir"
- else
- add_dir="-L$DESTDIR$libdir"
- fi
+ add_dir="-L$libdir"
add="-l$name"
fi
@@ -4149,21 +4141,12 @@ relink_command=\"$relink_command\""
esac
# Add the libdir to current_libdirs if it is the destination.
- DESTDIR=
if test "X$destdir" = "X$libdir"; then
case "$current_libdirs " in
*" $libdir "*) ;;
*) current_libdirs="$current_libdirs $libdir" ;;
esac
else
- case "$destdir" in
- *"$libdir")
- DESTDIR=`$echo "$destdir" | sed -e 's!'"$libdir"'$!!'`
- if test "X$destdir" != "X$DESTDIR$libdir"; then
- DESTDIR=
- fi
- ;;
- esac
# Note the libdir as a future libdir.
case "$future_libdirs " in
*" $libdir "*) ;;
@@ -4177,7 +4160,6 @@ relink_command=\"$relink_command\""
if test -n "$relink_command"; then
$echo "$modename: warning: relinking \`$file'" 1>&2
- export DESTDIR
$show "$relink_command"
if $run eval "$relink_command"; then :
else
@@ -4185,7 +4167,6 @@ relink_command=\"$relink_command\""
continue
fi
fi
- unset DESTDIR
# See the names of the shared library.
set dummy $library_names
@@ -4465,40 +4446,6 @@ relink_command=\"$relink_command\""
# Exit here if they wanted silent mode.
test "$show" = ":" && exit 0
- echo "----------------------------------------------------------------------"
- echo "Libraries have been installed in:"
- for libdir in $libdirs; do
- echo " $libdir"
- done
- echo
- echo "If you ever happen to want to link against installed libraries"
- echo "in a given directory, LIBDIR, you must either use libtool, and"
- echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
- echo "flag during linking and do at least one of the following:"
- if test -n "$shlibpath_var"; then
- echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
- echo " during execution"
- fi
- if test -n "$runpath_var"; then
- echo " - add LIBDIR to the \`$runpath_var' environment variable"
- echo " during linking"
- fi
- if test -n "$hardcode_libdir_flag_spec"; then
- libdir=LIBDIR
- eval flag=\"$hardcode_libdir_flag_spec\"
-
- echo " - use the \`$flag' linker flag"
- fi
- if test -n "$admincmds"; then
- echo " - have your system administrator run these commands:$admincmds"
- fi
- if test -f /etc/ld.so.conf; then
- echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
- fi
- echo
- echo "See any operating system documentation about shared libraries for"
- echo "more information, such as the ld(1) and ld.so(8) manual pages."
- echo "----------------------------------------------------------------------"
exit 0
;;