From bef0c103cb5f5a0f6c6678e2fa65b781f1f1c9fe Mon Sep 17 00:00:00 2001 From: brad Date: Wed, 5 Sep 2001 21:55:50 +0000 Subject: [PATCH] this port uses libtool 1.4 as well. --- textproc/libxml/patches/patch-configure | 81 +++++++++++++++++++++++++ textproc/libxml/patches/patch-ltconfig | 51 ---------------- textproc/libxml/patches/patch-ltmain.sh | 28 +++++++-- 3 files changed, 104 insertions(+), 56 deletions(-) create mode 100644 textproc/libxml/patches/patch-configure delete mode 100644 textproc/libxml/patches/patch-ltconfig diff --git a/textproc/libxml/patches/patch-configure b/textproc/libxml/patches/patch-configure new file mode 100644 index 00000000000..8bc488e639e --- /dev/null +++ b/textproc/libxml/patches/patch-configure @@ -0,0 +1,81 @@ +$OpenBSD: patch-configure,v 1.4 2001/09/05 21:55:50 brad Exp $ +--- configure.orig Wed Sep 5 15:12:00 2001 ++++ configure Wed Sep 5 17:37:39 2001 +@@ -2958,7 +2958,14 @@ 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 + + # Allow CC to be a program name with arguments. +@@ -3455,7 +3462,9 @@ cygwin* | mingw* | pw32* ) + with_gnu_ld=no + fi + ;; +- ++openbsd*) ++ with_gnu_ld=no ++ ;; + esac + + ld_shlibs=yes +@@ -3859,10 +3868,21 @@ else + ;; + + openbsd*) +- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' +- 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 $linker_flags' ++ hardcode_libdir_flag_spec='-R$libdir' ++ ;; ++ *) ++ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags' ++ hardcode_libdir_flag_spec='${wl}-rpath,$libdir' ++ if test "`echo __ELF__ | $CC -E - | grep __ELF__`" = "" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then ++ export_dynamic_flag_spec='${wl}-E' ++ fi ++ ;; ++ esac + ;; + + os2*) +@@ -4339,9 +4359,23 @@ newsos6) + + 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 ++ 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/textproc/libxml/patches/patch-ltconfig b/textproc/libxml/patches/patch-ltconfig deleted file mode 100644 index 3fdb20da988..00000000000 --- a/textproc/libxml/patches/patch-ltconfig +++ /dev/null @@ -1,51 +0,0 @@ ---- ltconfig.orig Fri Jan 5 02:13:13 2001 -+++ ltconfig Sun Feb 4 19:25:53 2001 -@@ -1105,6 +1105,9 @@ - with_gnu_ld=no - fi - ;; -+openbsd*) -+ with_gnu_ld=no -+ ;; - - esac - -@@ -1396,10 +1399,21 @@ - ;; - - 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_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*) -@@ -1997,13 +2011,10 @@ - - openbsd*) - version_type=sunos -- if test "$with_gnu_ld" = yes; then -- need_lib_prefix=no -- need_version=no -- fi - library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - shlibpath_var=LD_LIBRARY_PATH -+ deplibs_check_method='pass_all' - ;; - - os2*) diff --git a/textproc/libxml/patches/patch-ltmain.sh b/textproc/libxml/patches/patch-ltmain.sh index fab58dc26e8..df32eccace5 100644 --- a/textproc/libxml/patches/patch-ltmain.sh +++ b/textproc/libxml/patches/patch-ltmain.sh @@ -1,6 +1,24 @@ ---- ltmain.sh.orig Fri Aug 17 21:15:18 2001 -+++ ltmain.sh Fri Aug 17 21:20:01 2001 -@@ -1037,6 +1037,10 @@ +--- ltmain.sh.orig Thu Aug 23 19:24:25 2001 ++++ ltmain.sh Wed Sep 5 15:11:27 2001 +@@ -1031,12 +1031,28 @@ compiler." + # These systems don't actually have a C library (as such) + test "X$arg" = "X-lc" && continue + ;; ++ *-*-openbsd*) ++ # Do not include libc due to us having libc/libc_r. ++ test "X$arg" = "X-lc" && continue ++ ;; ++ esac ++ fi ++ if test "X$arg" = "X-lc_r"; then ++ case $host in ++ *-*-openbsd*) ++ # Do not include libc_r directly, use -pthread flag. ++ continue ++ ;; + esac + fi + deplibs="$deplibs $arg" continue ;; @@ -11,7 +29,7 @@ -module) module=yes continue -@@ -2401,6 +2405,9 @@ +@@ -2401,6 +2417,9 @@ compiler." *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos*) # these systems don't actually have a c library (as such)! ;; @@ -21,7 +39,7 @@ *-*-rhapsody* | *-*-darwin1.[012]) # Rhapsody C library is in the System framework deplibs="$deplibs -framework System" -@@ -4412,40 +4419,6 @@ +@@ -4412,40 +4431,6 @@ relink_command=\"$relink_command\"" # Exit here if they wanted silent mode. test "$show" = ":" && exit 0