From 3db4a36f913071e8f77ce3c9bf70ef81a2972d98 Mon Sep 17 00:00:00 2001 From: brad Date: Sun, 8 Jan 2006 02:48:34 +0000 Subject: [PATCH] remove unused libtool 1.3 patches --- infrastructure/patches/patch-lt1.3.0-ltconfig | 95 ------------------- .../patches/patch-lt1.3.0-ltmain_sh | 90 ------------------ infrastructure/patches/patch-lt1.3.3-ltconfig | 95 ------------------- .../patches/patch-lt1.3.3-ltmain_sh | 90 ------------------ infrastructure/patches/patch-lt1.3.4-ltconfig | 95 ------------------- .../patches/patch-lt1.3.4-ltmain_sh | 90 ------------------ infrastructure/patches/patch-lt1.3.5-ltconfig | 95 ------------------- .../patches/patch-lt1.3.5-ltmain_sh | 90 ------------------ sysutils/LPRng/Makefile | 9 +- 9 files changed, 2 insertions(+), 747 deletions(-) delete mode 100644 infrastructure/patches/patch-lt1.3.0-ltconfig delete mode 100644 infrastructure/patches/patch-lt1.3.0-ltmain_sh delete mode 100644 infrastructure/patches/patch-lt1.3.3-ltconfig delete mode 100644 infrastructure/patches/patch-lt1.3.3-ltmain_sh delete mode 100644 infrastructure/patches/patch-lt1.3.4-ltconfig delete mode 100644 infrastructure/patches/patch-lt1.3.4-ltmain_sh delete mode 100644 infrastructure/patches/patch-lt1.3.5-ltconfig delete mode 100644 infrastructure/patches/patch-lt1.3.5-ltmain_sh diff --git a/infrastructure/patches/patch-lt1.3.0-ltconfig b/infrastructure/patches/patch-lt1.3.0-ltconfig deleted file mode 100644 index 93b37afaf50..00000000000 --- a/infrastructure/patches/patch-lt1.3.0-ltconfig +++ /dev/null @@ -1,95 +0,0 @@ -$OpenBSD: patch-lt1.3.0-ltconfig,v 1.3 2004/06/01 21:43:09 brad Exp $ ---- ltconfig.orig Wed Apr 3 07:47:42 2002 -+++ ltconfig Wed Apr 3 07:53:55 2002 -@@ -499,7 +499,14 @@ - - 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 - - # Set sane defaults for `DLLTOOL', `OBJDUMP', and `AS', used on cygwin. -@@ -1061,7 +1068,9 @@ - with_gnu_ld=no - fi - ;; -- -+openbsd*) -+ with_gnu_ld=no -+ ;; - esac - - ld_shlibs=yes -@@ -1317,10 +1326,31 @@ - ;; - - openbsd*) -- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts' -- hardcode_libdir_flag_spec='-R$libdir' -- hardcode_direct=yes -- hardcode_shlibpath_var=no -+ case "$host_cpu" in -+ m88k|vax) -+ ld_shlibs=no -+ ;; -+ *) -+ hardcode_direct=yes -+ hardcode_shlibpath_var=no -+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linkopts' -+ hardcode_libdir_flag_spec='${wl}-R$libdir' -+ export_dynamic_flag_spec='${wl}-E' -+ else -+ 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}-R$libdir' -+ ;; -+ esac -+ fi -+ ;; -+ esac - ;; - - os2*) -@@ -1857,9 +1887,25 @@ - - openbsd*) - version_type=sunos -- if test "$with_gnu_ld" = yes; then -- need_lib_prefix=no -- need_version=no -+ need_lib_prefix=no -+ need_version=no -+ sys_lib_search_path_spec="/usr/lib" -+ sys_lib_dlsearch_path_spec="/usr/lib /usr/local/lib" -+ file_magic_cmd=/usr/bin/file -+ file_magic_test_file=`echo /usr/lib/libc.so.*` -+ if test "`echo __ELF__ | $CC -E - | grep __ELF__`" = "" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -+ deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object' -+ case "$host_os" in -+ openbsd2.[89] | openbsd2.[89].*) -+ shlibpath_overrides_runpath=no -+ ;; -+ *) -+ shlibpath_overrides_runpath=yes -+ ;; -+ esac -+ else -+ deplibs_check_method='file_magic OpenBSD.* shared library' -+ shlibpath_overrides_runpath=yes - fi - library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' diff --git a/infrastructure/patches/patch-lt1.3.0-ltmain_sh b/infrastructure/patches/patch-lt1.3.0-ltmain_sh deleted file mode 100644 index c45966499a4..00000000000 --- a/infrastructure/patches/patch-lt1.3.0-ltmain_sh +++ /dev/null @@ -1,90 +0,0 @@ -$OpenBSD: patch-lt1.3.0-ltmain_sh,v 1.1 2001/10/31 11:58:04 wilfried Exp $ ---- ltmain.sh.orig Fri Mar 31 22:10:25 2000 -+++ ltmain.sh Mon Oct 29 12:48:09 2001 -@@ -1054,6 +1054,17 @@ compiler." - # These systems don't actually have c library (as such) - continue - ;; -+ *-*-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 - elif test "$arg" = "-lm"; then - case "$host" in -@@ -1066,6 +1077,17 @@ compiler." - deplibs="$deplibs $arg" - ;; - -+ -pthread) -+ case $host in -+ *-*-openbsd*) -+ deplibs="$deplibs $arg" -+ ;; -+ *) -+ continue -+ ;; -+ esac -+ ;; -+ - -module) - module=yes - continue -@@ -1763,6 +1785,9 @@ compiler." - *-*-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. -+ ;; - *) - # Add libc to deplibs on all other systems. - deplibs="$deplibs -lc" -@@ -3437,40 +3462,6 @@ libdir='$install_libdir'\ - # 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 \`-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 - ;; - diff --git a/infrastructure/patches/patch-lt1.3.3-ltconfig b/infrastructure/patches/patch-lt1.3.3-ltconfig deleted file mode 100644 index 7bbee095cef..00000000000 --- a/infrastructure/patches/patch-lt1.3.3-ltconfig +++ /dev/null @@ -1,95 +0,0 @@ -$OpenBSD: patch-lt1.3.3-ltconfig,v 1.4 2004/06/01 21:43:09 brad Exp $ ---- ltconfig.orig Wed Apr 3 07:47:42 2002 -+++ ltconfig Wed Apr 3 07:55:04 2002 -@@ -501,7 +501,14 @@ - - 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 - - # Set sane defaults for `DLLTOOL', `OBJDUMP', and `AS', used on cygwin. -@@ -1105,7 +1112,9 @@ - with_gnu_ld=no - fi - ;; -- -+openbsd*) -+ with_gnu_ld=no -+ ;; - esac - - ld_shlibs=yes -@@ -1391,10 +1400,31 @@ - ;; - - openbsd*) -- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts' -- hardcode_libdir_flag_spec='-R$libdir' -- hardcode_direct=yes -- hardcode_shlibpath_var=no -+ case "$host_cpu" in -+ m88k|vax) -+ ld_shlibs=no -+ ;; -+ *) -+ hardcode_direct=yes -+ hardcode_shlibpath_var=no -+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linkopts' -+ hardcode_libdir_flag_spec='${wl}-R$libdir' -+ export_dynamic_flag_spec='${wl}-E' -+ else -+ 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}-R$libdir' -+ ;; -+ esac -+ fi -+ ;; -+ esac - ;; - - os2*) -@@ -1955,9 +1985,25 @@ - - openbsd*) - version_type=sunos -- if test "$with_gnu_ld" = yes; then -- need_lib_prefix=no -- need_version=no -+ need_lib_prefix=no -+ need_version=no -+ sys_lib_search_path_spec="/usr/lib" -+ sys_lib_dlsearch_path_spec="/usr/lib /usr/local/lib" -+ file_magic_cmd=/usr/bin/file -+ file_magic_test_file=`echo /usr/lib/libc.so.*` -+ if test "`echo __ELF__ | $CC -E - | grep __ELF__`" = "" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -+ deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object' -+ case "$host_os" in -+ openbsd2.[89] | openbsd2.[89].*) -+ shlibpath_overrides_runpath=no -+ ;; -+ *) -+ shlibpath_overrides_runpath=yes -+ ;; -+ esac -+ else -+ deplibs_check_method='file_magic OpenBSD.* shared library' -+ shlibpath_overrides_runpath=yes - fi - library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' diff --git a/infrastructure/patches/patch-lt1.3.3-ltmain_sh b/infrastructure/patches/patch-lt1.3.3-ltmain_sh deleted file mode 100644 index ed8b5e1b84f..00000000000 --- a/infrastructure/patches/patch-lt1.3.3-ltmain_sh +++ /dev/null @@ -1,90 +0,0 @@ -$OpenBSD: patch-lt1.3.3-ltmain_sh,v 1.1 2001/10/28 04:18:09 brad Exp $ ---- ltmain.sh.orig Sun Oct 3 15:17:34 1999 -+++ ltmain.sh Sat Oct 27 23:28:56 2001 -@@ -1073,6 +1073,17 @@ compiler." - # These systems don't actually have c library (as such) - continue - ;; -+ *-*-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 - elif test "$arg" = "-lm"; then - case "$host" in -@@ -1085,6 +1096,17 @@ compiler." - deplibs="$deplibs $arg" - ;; - -+ -pthread) -+ case $host in -+ *-*-openbsd*) -+ deplibs="$deplibs $arg" -+ ;; -+ *) -+ continue -+ ;; -+ esac -+ ;; -+ - -module) - module=yes - continue -@@ -1789,6 +1811,9 @@ compiler." - *-*-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. -+ ;; - *) - # Add libc to deplibs on all other systems. - deplibs="$deplibs -lc" -@@ -3522,40 +3547,6 @@ libdir='$install_libdir'\ - # 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 \`-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 - ;; - diff --git a/infrastructure/patches/patch-lt1.3.4-ltconfig b/infrastructure/patches/patch-lt1.3.4-ltconfig deleted file mode 100644 index 6af925153ca..00000000000 --- a/infrastructure/patches/patch-lt1.3.4-ltconfig +++ /dev/null @@ -1,95 +0,0 @@ -$OpenBSD: patch-lt1.3.4-ltconfig,v 1.4 2004/06/01 21:43:09 brad Exp $ ---- ltconfig.orig Wed Apr 3 07:47:42 2002 -+++ ltconfig Wed Apr 3 07:56:13 2002 -@@ -501,7 +501,14 @@ - - 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 - - # Set sane defaults for `DLLTOOL', `OBJDUMP', and `AS', used on cygwin. -@@ -1105,7 +1112,9 @@ - with_gnu_ld=no - fi - ;; -- -+openbsd*) -+ with_gnu_ld=no -+ ;; - esac - - ld_shlibs=yes -@@ -1396,10 +1405,31 @@ - ;; - - openbsd*) -- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts' -- hardcode_libdir_flag_spec='-R$libdir' -- hardcode_direct=yes -- hardcode_shlibpath_var=no -+ case "$host_cpu" in -+ m88k|vax) -+ ld_shlibs=no -+ ;; -+ *) -+ hardcode_direct=yes -+ hardcode_shlibpath_var=no -+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linkopts' -+ hardcode_libdir_flag_spec='${wl}-R$libdir' -+ export_dynamic_flag_spec='${wl}-E' -+ else -+ 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}-R$libdir' -+ ;; -+ esac -+ fi -+ ;; -+ esac - ;; - - os2*) -@@ -1997,9 +2027,25 @@ - - openbsd*) - version_type=sunos -- if test "$with_gnu_ld" = yes; then -- need_lib_prefix=no -- need_version=no -+ need_lib_prefix=no -+ need_version=no -+ sys_lib_search_path_spec="/usr/lib" -+ sys_lib_dlsearch_path_spec="/usr/lib /usr/local/lib" -+ file_magic_cmd=/usr/bin/file -+ file_magic_test_file=`echo /usr/lib/libc.so.*` -+ if test "`echo __ELF__ | $CC -E - | grep __ELF__`" = "" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -+ deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object' -+ case "$host_os" in -+ openbsd2.[89] | openbsd2.[89].*) -+ shlibpath_overrides_runpath=no -+ ;; -+ *) -+ shlibpath_overrides_runpath=yes -+ ;; -+ esac -+ else -+ deplibs_check_method='file_magic OpenBSD.* shared library' -+ shlibpath_overrides_runpath=yes - fi - library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' diff --git a/infrastructure/patches/patch-lt1.3.4-ltmain_sh b/infrastructure/patches/patch-lt1.3.4-ltmain_sh deleted file mode 100644 index 9174b9e9338..00000000000 --- a/infrastructure/patches/patch-lt1.3.4-ltmain_sh +++ /dev/null @@ -1,90 +0,0 @@ -$OpenBSD: patch-lt1.3.4-ltmain_sh,v 1.2 2001/10/06 01:38:03 brad Exp $ ---- ltmain.sh.orig Tue Dec 7 16:50:49 1999 -+++ ltmain.sh Wed Oct 3 10:11:58 2001 -@@ -1079,6 +1079,17 @@ compiler." - # These systems don't actually have c library (as such) - continue - ;; -+ *-*-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 - elif test "$arg" = "-lm"; then - case "$host" in -@@ -1091,6 +1102,17 @@ compiler." - deplibs="$deplibs $arg" - ;; - -+ -pthread) -+ case $host in -+ *-*-openbsd*) -+ deplibs="$deplibs $arg" -+ ;; -+ *) -+ continue -+ ;; -+ esac -+ ;; -+ - -module) - module=yes - continue -@@ -1795,6 +1817,9 @@ compiler." - *-*-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. -+ ;; - *) - # Add libc to deplibs on all other systems. - deplibs="$deplibs -lc" -@@ -3555,40 +3580,6 @@ libdir='$install_libdir'\ - # 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 \`-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 - ;; - diff --git a/infrastructure/patches/patch-lt1.3.5-ltconfig b/infrastructure/patches/patch-lt1.3.5-ltconfig deleted file mode 100644 index fb748831cd4..00000000000 --- a/infrastructure/patches/patch-lt1.3.5-ltconfig +++ /dev/null @@ -1,95 +0,0 @@ -$OpenBSD: patch-lt1.3.5-ltconfig,v 1.4 2004/06/01 21:43:09 brad Exp $ ---- ltconfig.orig Wed Apr 3 07:47:42 2002 -+++ ltconfig Wed Apr 3 07:57:21 2002 -@@ -501,7 +501,14 @@ - - 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 - - # Set sane defaults for `DLLTOOL', `OBJDUMP', and `AS', used on cygwin. -@@ -1105,7 +1112,9 @@ - with_gnu_ld=no - fi - ;; -- -+openbsd*) -+ with_gnu_ld=no -+ ;; - esac - - ld_shlibs=yes -@@ -1402,10 +1411,31 @@ - ;; - - openbsd*) -- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts' -- hardcode_libdir_flag_spec='-R$libdir' -- hardcode_direct=yes -- hardcode_shlibpath_var=no -+ case "$host_cpu" in -+ m88k|vax) -+ ld_shlibs=no -+ ;; -+ *) -+ hardcode_direct=yes -+ hardcode_shlibpath_var=no -+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linkopts' -+ hardcode_libdir_flag_spec='${wl}-R$libdir' -+ export_dynamic_flag_spec='${wl}-E' -+ else -+ 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}-R$libdir' -+ ;; -+ esac -+ fi -+ ;; -+ esac - ;; - - os2*) -@@ -2021,9 +2051,25 @@ - - openbsd*) - version_type=sunos -- if test "$with_gnu_ld" = yes; then -- need_lib_prefix=no -- need_version=no -+ need_lib_prefix=no -+ need_version=no -+ sys_lib_search_path_spec="/usr/lib" -+ sys_lib_dlsearch_path_spec="/usr/lib /usr/local/lib" -+ file_magic_cmd=/usr/bin/file -+ file_magic_test_file=`echo /usr/lib/libc.so.*` -+ if test "`echo __ELF__ | $CC -E - | grep __ELF__`" = "" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -+ deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object' -+ case "$host_os" in -+ openbsd2.[89] | openbsd2.[89].*) -+ shlibpath_overrides_runpath=no -+ ;; -+ *) -+ shlibpath_overrides_runpath=yes -+ ;; -+ esac -+ else -+ deplibs_check_method='file_magic OpenBSD.* shared library' -+ shlibpath_overrides_runpath=yes - fi - library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' diff --git a/infrastructure/patches/patch-lt1.3.5-ltmain_sh b/infrastructure/patches/patch-lt1.3.5-ltmain_sh deleted file mode 100644 index 9bdef023837..00000000000 --- a/infrastructure/patches/patch-lt1.3.5-ltmain_sh +++ /dev/null @@ -1,90 +0,0 @@ -$OpenBSD: patch-lt1.3.5-ltmain_sh,v 1.1 2001/10/03 14:47:01 brad Exp $ ---- ltmain.sh.orig Sat May 27 07:15:01 2000 -+++ ltmain.sh Tue Oct 2 09:05:28 2001 -@@ -1079,6 +1079,17 @@ compiler." - # These systems don't actually have c library (as such) - continue - ;; -+ *-*-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 - elif test "$arg" = "-lm"; then - case "$host" in -@@ -1091,6 +1102,17 @@ compiler." - deplibs="$deplibs $arg" - ;; - -+ -pthread) -+ case $host in -+ *-*-openbsd*) -+ deplibs="$deplibs $arg" -+ ;; -+ *) -+ continue -+ ;; -+ esac -+ ;; -+ - -module) - module=yes - continue -@@ -1795,6 +1817,9 @@ compiler." - *-*-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" -@@ -3567,40 +3592,6 @@ libdir='$install_libdir'\ - # 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 \`-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 - ;; - diff --git a/sysutils/LPRng/Makefile b/sysutils/LPRng/Makefile index 5e6af1b3a5c..7db067ed8ed 100644 --- a/sysutils/LPRng/Makefile +++ b/sysutils/LPRng/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.31 2005/12/23 19:54:17 mbalmer Exp $ +# $OpenBSD: Makefile,v 1.32 2006/01/08 02:48:34 brad Exp $ COMMENT= "enhanced printer spooler" @@ -19,6 +19,7 @@ PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes WANTLIB= c crypto ssl util +USE_LIBTOOL= Yes CONFIGURE_STYLE= gnu dest CONFIGURE_ARGS= --with-sbindir=${PREFIX}/sbin \ --with-filterdir=${PREFIX}/libexec/filters \ @@ -29,8 +30,6 @@ CONFIGURE_ARGS= --with-sbindir=${PREFIX}/sbin \ --with-ldopts=-L${LOCALBASE}/lib \ --disable-nls -USE_LIBTOOL= Yes - CFLAGS+= -Dlog=mylog FAKE_FLAGS= DESTDIR=${WRKINST} POSTINSTALL=NO prefix=${TRUEPREFIX} \ FILTER_DIR=${TRUEPREFIX}/libexec/filters \ @@ -38,10 +37,6 @@ FAKE_FLAGS= DESTDIR=${WRKINST} POSTINSTALL=NO prefix=${TRUEPREFIX} \ LPD_CONF_PATH=${TRUEPREFIX}${CONFDIR}/lpd.conf \ PRINTCAP_PATH=${TRUEPREFIX}${CONFDIR}/printcap -PATCH_LIST= ${PORTSDIR}/infrastructure/patches/patch-lt1.3.4-ltconfig \ - ${PORTSDIR}/infrastructure/patches/patch-lt1.3.4-ltmain_sh \ - patch-* - CONFDIR= ${SYSCONFDIR}/LPRng HTMLFILES= LPRng-HOWTO.html