remove duplicate patches
This commit is contained in:
parent
8c686f60e5
commit
1b65e2d8f4
@ -1,69 +0,0 @@
|
||||
$OpenBSD: patch-aclocal_m4,v 1.2 2001/09/06 13:01:53 espie Exp $
|
||||
--- aclocal.m4.orig Thu Aug 23 06:48:31 2001
|
||||
+++ aclocal.m4 Wed Sep 5 15:33:17 2001
|
||||
@@ -1,6 +1,6 @@
|
||||
-dnl aclocal.m4 generated automatically by aclocal 1.4
|
||||
+dnl aclocal.m4 generated automatically by aclocal 1.4-p5
|
||||
|
||||
-dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
|
||||
+dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
|
||||
dnl This file is free software; the Free Software Foundation
|
||||
dnl gives unlimited permission to copy and/or distribute it,
|
||||
dnl with or without modifications, as long as this notice is preserved.
|
||||
@@ -4722,19 +4722,7 @@ netbsd*)
|
||||
;;
|
||||
|
||||
openbsd* )
|
||||
- if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
|
||||
- case "$host_cpu" in
|
||||
- i*86 )
|
||||
- changequote(,)dnl
|
||||
- lt_cv_deplibs_check_method='file_magic OpenBSD/i[3-9]86 demand paged shared library'
|
||||
- changequote([, ])dnl
|
||||
- lt_cv_file_magic_cmd=/usr/bin/file
|
||||
- lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
|
||||
- ;;
|
||||
- esac
|
||||
- else
|
||||
- lt_cv_deplibs_check_method=pass_all
|
||||
- fi
|
||||
+ lt_cv_deplibs_check_method=pass_all
|
||||
;;
|
||||
|
||||
newsos6)
|
||||
@@ -4981,7 +4969,7 @@ AC_DEFUN([LT_AC_PROG_GCJ],
|
||||
dnl Usage:
|
||||
dnl AM_INIT_AUTOMAKE(package,version, [no-define])
|
||||
|
||||
-AC_DEFUN(AM_INIT_AUTOMAKE,
|
||||
+AC_DEFUN([AM_INIT_AUTOMAKE],
|
||||
[AC_REQUIRE([AC_PROG_INSTALL])
|
||||
PACKAGE=[$1]
|
||||
AC_SUBST(PACKAGE)
|
||||
@@ -5009,7 +4997,7 @@ AC_REQUIRE([AC_PROG_MAKE_SET])])
|
||||
# Check to make sure that the build environment is sane.
|
||||
#
|
||||
|
||||
-AC_DEFUN(AM_SANITY_CHECK,
|
||||
+AC_DEFUN([AM_SANITY_CHECK],
|
||||
[AC_MSG_CHECKING([whether build environment is sane])
|
||||
# Just in case
|
||||
sleep 1
|
||||
@@ -5050,7 +5038,7 @@ AC_MSG_RESULT(yes)])
|
||||
|
||||
dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
|
||||
dnl The program must properly implement --version.
|
||||
-AC_DEFUN(AM_MISSING_PROG,
|
||||
+AC_DEFUN([AM_MISSING_PROG],
|
||||
[AC_MSG_CHECKING(for working $2)
|
||||
# Run test in a subshell; some versions of sh will print an error if
|
||||
# an executable is not found, even if stderr is redirected.
|
||||
@@ -5066,7 +5054,7 @@ AC_SUBST($1)])
|
||||
|
||||
# Like AC_CONFIG_HEADER, but automatically create stamp file.
|
||||
|
||||
-AC_DEFUN(AM_CONFIG_HEADER,
|
||||
+AC_DEFUN([AM_CONFIG_HEADER],
|
||||
[AC_PREREQ([2.12])
|
||||
AC_CONFIG_HEADER([$1])
|
||||
dnl When config.status generates a header, we must update the stamp-h file.
|
@ -1,20 +0,0 @@
|
||||
$OpenBSD: patch-admin_ltcf-c_sh,v 1.2 2001/09/06 13:01:53 espie Exp $
|
||||
--- admin/ltcf-c.sh.orig Sat May 19 09:19:10 2001
|
||||
+++ admin/ltcf-c.sh Fri Aug 17 00:02:40 2001
|
||||
@@ -457,10 +457,14 @@ else
|
||||
;;
|
||||
|
||||
openbsd*)
|
||||
- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
|
||||
- hardcode_libdir_flag_spec='-R$libdir'
|
||||
+ archive_cmds='$CC $pic_flag -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
|
||||
+ archive_expsym_cmds='$CC $pic_flag -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
|
||||
+ old_archive_cmds="$old_archive_cmds~"'$RANLIB $oldlib'
|
||||
+ hardcode_libdir_flag_spec='${wl}-R$libdir'
|
||||
hardcode_direct=yes
|
||||
hardcode_shlibpath_var=no
|
||||
+ remove_lgcc=yes
|
||||
+ output_verbose_link_cmds='$CC $ac_cv_prog_cc_pic -shared $CFLAGS -v conftest.$objext 2>&1 | egrep "\-L"'
|
||||
;;
|
||||
|
||||
os2*)
|
@ -1,21 +0,0 @@
|
||||
$OpenBSD: patch-admin_ltcf-cxx_sh,v 1.3 2001/09/06 13:01:53 espie Exp $
|
||||
--- admin/ltcf-cxx.sh.orig Sat May 19 09:19:10 2001
|
||||
+++ admin/ltcf-cxx.sh Fri Aug 17 00:02:40 2001
|
||||
@@ -409,14 +409,14 @@ case $host_os in
|
||||
openbsd*)
|
||||
if test "$with_gcc" = yes && test "$with_gnu_ld" = no; then
|
||||
# MM: OpenBSD 2.7 uses G++, but not GNU ld
|
||||
- archive_cmds='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
|
||||
- archive_expsym_cmds='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
|
||||
+ archive_cmds='$CC $pic_flag -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
|
||||
+ archive_expsym_cmds='$CC $pic_flag -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
|
||||
old_archive_cmds="$old_archive_cmds~"'$RANLIB $oldlib'
|
||||
hardcode_libdir_flag_spec='${wl}-R$libdir'
|
||||
hardcode_direct=yes
|
||||
hardcode_shlibpath_var=no
|
||||
- whole_archive_flag_spec='${wl}-Bforcearchive'
|
||||
remove_lgcc=yes
|
||||
+ output_verbose_link_cmds='$CC $ac_cv_prog_cc_pic -shared $CFLAGS -v conftest.$objext 2>&1 | egrep "\-L"'
|
||||
fi
|
||||
;;
|
||||
osf3*)
|
@ -1,26 +0,0 @@
|
||||
$OpenBSD: patch-admin_ltconfig,v 1.3 2001/09/06 13:01:53 espie Exp $
|
||||
--- admin/ltconfig.orig Sat May 19 09:19:10 2001
|
||||
+++ admin/ltconfig Mon Aug 20 18:56:38 2001
|
||||
@@ -625,7 +625,12 @@ old_postuninstall_cmds=
|
||||
|
||||
if test -n "$RANLIB"; then
|
||||
old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
|
||||
- old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
|
||||
+ case $host_os in
|
||||
+ openbsd*)
|
||||
+ old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds";;
|
||||
+ *)
|
||||
+ old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds";;
|
||||
+ esac
|
||||
fi
|
||||
|
||||
# Source the script associated with the $tagname tag configuration.
|
||||
@@ -1254,6 +1259,8 @@ openbsd*)
|
||||
shlibpath_var=LD_LIBRARY_PATH
|
||||
# OpenBSD 2.7 the overriding is needed for fast-install
|
||||
shlibpath_overrides_runpath=yes
|
||||
+ deplib_check_method=pass_all
|
||||
+ sys_lib_dlsearch_path_spec='/usr/lib /usr/local/lib /usr/X11R6/lib /usr/local/lib/qt2'
|
||||
;;
|
||||
|
||||
os2*)
|
Loading…
Reference in New Issue
Block a user