From 23a006c3175ab43e058fa1a805fcd7a2d04b20ab Mon Sep 17 00:00:00 2001 From: pvalchev Date: Thu, 6 Sep 2001 23:19:24 +0000 Subject: [PATCH] make this build on elf --- print/freetype/patches/patch-ltconfig | 69 +++++++++++++++++++-------- 1 file changed, 49 insertions(+), 20 deletions(-) diff --git a/print/freetype/patches/patch-ltconfig b/print/freetype/patches/patch-ltconfig index 95456c61ceb..cb609cbe651 100644 --- a/print/freetype/patches/patch-ltconfig +++ b/print/freetype/patches/patch-ltconfig @@ -1,17 +1,34 @@ -$OpenBSD: patch-ltconfig,v 1.1 2001/02/19 20:04:10 danh Exp $ ---- ltconfig.orig Thu Jul 15 20:56:06 1999 -+++ ltconfig Mon Feb 19 15:01:43 2001 -@@ -1105,6 +1105,9 @@ cygwin* | mingw*) +$OpenBSD: patch-ltconfig,v 1.2 2001/09/06 23:19:24 pvalchev Exp $ +--- ltconfig.orig Sat Oct 16 01:02:23 1999 ++++ ltconfig Wed Sep 5 15:27:25 2001 +@@ -501,7 +501,14 @@ fi + + 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 @@ cygwin* | mingw*) with_gnu_ld=no fi ;; +- +openbsd*) + with_gnu_ld=no + ;; - esac -@@ -1391,10 +1394,21 @@ else + ld_shlibs=yes +@@ -1391,10 +1400,21 @@ else ;; openbsd*) @@ -21,32 +38,44 @@ $OpenBSD: patch-ltconfig,v 1.1 2001/02/19 20:04:10 danh Exp $ 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='$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 ++ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linkopts' ++ 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*) -@@ -1955,13 +1969,10 @@ netbsd*) +@@ -1955,9 +1975,23 @@ netbsd*) openbsd*) version_type=sunos - if test "$with_gnu_ld" = yes; then - need_lib_prefix=no - need_version=no -- fi ++ 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' - shlibpath_var=LD_LIBRARY_PATH -+ deplibs_check_method='pass_all' - ;; - - os2*)