rename patches; sync with libtool.
This commit is contained in:
parent
dd6dfc72ed
commit
77eaa3e87a
@ -1,43 +0,0 @@
|
||||
--- ltmain.sh.orig Wed Mar 17 15:17:14 1999
|
||||
+++ ltmain.sh Wed Mar 17 15:17:40 1999
|
||||
@@ -2162,40 +2162,6 @@
|
||||
done
|
||||
fi
|
||||
|
||||
- echo "----------------------------------------------------------------------"
|
||||
- echo "Libraries have been installed in:"
|
||||
- for libdir in $libdirs; do
|
||||
- echo " $libdir"
|
||||
- done
|
||||
- echo
|
||||
- echo "To link against installed libraries in a given directory, LIBDIR,"
|
||||
- echo "you must use the \`-LLIBDIR' flag during linking."
|
||||
- echo
|
||||
- echo " You will also need to 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
|
||||
;;
|
||||
|
@ -1,6 +1,7 @@
|
||||
--- lib/Makefile.in.orig Wed Mar 17 15:19:06 1999
|
||||
+++ lib/Makefile.in Wed Mar 17 15:19:21 1999
|
||||
@@ -97,7 +97,7 @@
|
||||
$OpenBSD: patch-lib_Makefile_in,v 1.1 2001/02/20 22:07:48 danh Exp $
|
||||
--- lib/Makefile.in.orig Wed Feb 10 01:49:56 1999
|
||||
+++ lib/Makefile.in Tue Feb 20 16:53:37 2001
|
||||
@@ -97,7 +97,7 @@ libgif_la_SOURCES = dev2gif.c \
|
||||
quantize.c \
|
||||
gif_lib_private.h
|
||||
|
62
graphics/giflib/patches/patch-ltconfig
Normal file
62
graphics/giflib/patches/patch-ltconfig
Normal file
@ -0,0 +1,62 @@
|
||||
$OpenBSD: patch-ltconfig,v 1.1 2001/02/20 22:07:48 danh Exp $
|
||||
--- ltconfig.orig Tue Feb 20 17:01:27 2001
|
||||
+++ ltconfig Tue Feb 20 17:06:36 2001
|
||||
@@ -740,6 +740,13 @@ hardcode_minus_L=no
|
||||
hardcode_shlibpath_var=unsupported
|
||||
runpath_var=
|
||||
|
||||
+case "$host_os" in
|
||||
+openbsd*)
|
||||
+ with_gnu_ld=no
|
||||
+ ;;
|
||||
+
|
||||
+esac
|
||||
+
|
||||
ld_shlibs=yes
|
||||
if test "$with_gnu_ld" = yes; then
|
||||
|
||||
@@ -865,10 +872,21 @@ else
|
||||
;;
|
||||
|
||||
openbsd*)
|
||||
- archive_cmds='$LD -Bshareable -o $lib$libobjs'
|
||||
- hardcode_libdir_flag_spec='-R$libdir'
|
||||
hardcode_direct=yes
|
||||
hardcode_shlibpath_var=no
|
||||
+ case "$host_os" in
|
||||
+ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
|
||||
+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'
|
||||
+ hardcode_libdir_flag_spec='-R$libdir'
|
||||
+ ;;
|
||||
+ *)
|
||||
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linkopts'
|
||||
+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
|
||||
+ if [ "`/usr/bin/file /usr/lib/libc.so.* | grep ELF`" != "" ]; then
|
||||
+ export_dynamic_flag_spec='${wl}-E'
|
||||
+ fi
|
||||
+ ;;
|
||||
+ esac
|
||||
;;
|
||||
|
||||
os2*)
|
||||
@@ -1216,11 +1234,19 @@ linux-gnu*)
|
||||
fi
|
||||
;;
|
||||
|
||||
-netbsd* | openbsd*)
|
||||
+netbsd*)
|
||||
+ version_type=sunos
|
||||
+ library_names_spec='${libname}${release}.so$versuffix'
|
||||
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
|
||||
+ shlibpath_var=LD_LIBRARY_PATH
|
||||
+ ;;
|
||||
+
|
||||
+openbsd*)
|
||||
version_type=sunos
|
||||
library_names_spec='${libname}${release}.so$versuffix'
|
||||
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
|
||||
shlibpath_var=LD_LIBRARY_PATH
|
||||
+ deplibs_check_method='pass_all'
|
||||
;;
|
||||
|
||||
os2*)
|
101
graphics/giflib/patches/patch-ltmain_sh
Normal file
101
graphics/giflib/patches/patch-ltmain_sh
Normal file
@ -0,0 +1,101 @@
|
||||
$OpenBSD: patch-ltmain_sh,v 1.1 2001/02/20 22:07:48 danh Exp $
|
||||
--- ltmain.sh.orig Thu Sep 10 03:42:47 1998
|
||||
+++ ltmain.sh Tue Feb 20 17:06:50 2001
|
||||
@@ -537,7 +537,28 @@ if test -z "$show_help"; then
|
||||
deplibs="$deplibs $arg"
|
||||
;;
|
||||
|
||||
- -l*) deplibs="$deplibs $arg" ;;
|
||||
+ -l*)
|
||||
+ if test "$arg" = "-lc"; then
|
||||
+ case "$host" in
|
||||
+ *-*-openbsd*)
|
||||
+ # Do not include libc due to us having libc/libc_r.
|
||||
+ continue
|
||||
+ ;;
|
||||
+ esac
|
||||
+ elif test "$arg" = "-lc_r"; then
|
||||
+ case "$host" in
|
||||
+ *-*-openbsd*)
|
||||
+ # Do not include libc_r directly, use -pthread flag.
|
||||
+ continue
|
||||
+ ;;
|
||||
+ esac
|
||||
+ fi
|
||||
+ deplibs="$deplibs $arg"
|
||||
+ ;;
|
||||
+
|
||||
+ -?thread)
|
||||
+ deplibs="$deplibs $arg"
|
||||
+ ;;
|
||||
|
||||
-no-undefined)
|
||||
allow_undefined=no
|
||||
@@ -1056,9 +1077,23 @@ if test -z "$show_help"; then
|
||||
allow_undefined_flag="$no_undefined_flag"
|
||||
fi
|
||||
|
||||
- # Add libc to deplibs on all systems.
|
||||
- dependency_libs="$deplibs"
|
||||
- deplibs="$deplibs -lc"
|
||||
+ dependency_libs="$deplibs"
|
||||
+ case "$host" in
|
||||
+ *-*-cygwin* | *-*-mingw* | *-*-os2* | *-*-beos*)
|
||||
+ # these systems don't actually have a c library (as such)!
|
||||
+ ;;
|
||||
+ *-*-openbsd*)
|
||||
+ # Do not include libc due to us having libc/libc_r.
|
||||
+ ;;
|
||||
+ *-*-rhapsody*)
|
||||
+ # rhapsody is a little odd...
|
||||
+ deplibs="$deplibs -framework System"
|
||||
+ ;;
|
||||
+ *)
|
||||
+ # Add libc to deplibs on all other systems.
|
||||
+ deplibs="$deplibs -lc"
|
||||
+ ;;
|
||||
+ esac
|
||||
fi
|
||||
|
||||
# Create the output directory, or remove our outputs if we need to.
|
||||
@@ -2162,40 +2197,6 @@ libdir='$install_libdir'\
|
||||
done
|
||||
fi
|
||||
|
||||
- echo "----------------------------------------------------------------------"
|
||||
- echo "Libraries have been installed in:"
|
||||
- for libdir in $libdirs; do
|
||||
- echo " $libdir"
|
||||
- done
|
||||
- echo
|
||||
- echo "To link against installed libraries in a given directory, LIBDIR,"
|
||||
- echo "you must use the \`-LLIBDIR' flag during linking."
|
||||
- echo
|
||||
- echo " You will also need to 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
|
||||
;;
|
||||
|
Loading…
Reference in New Issue
Block a user