diff --git a/x11/gtkglarea/patches/patch-ltconfig b/x11/gtkglarea/patches/patch-ltconfig index dcd5c92b6d9..dd3b881727a 100644 --- a/x11/gtkglarea/patches/patch-ltconfig +++ b/x11/gtkglarea/patches/patch-ltconfig @@ -1,6 +1,47 @@ ---- ltconfig.orig Wed Mar 15 09:39:43 2000 -+++ ltconfig Wed Mar 15 09:40:47 2000 -@@ -1962,6 +1962,7 @@ +--- ltconfig.orig Thu Feb 17 13:42:54 2000 ++++ ltconfig Tue Feb 20 12:31:19 2001 +@@ -1105,6 +1105,9 @@ cygwin* | mingw*) + with_gnu_ld=no + fi + ;; ++openbsd*) ++ with_gnu_ld=no ++ ;; + + esac + +@@ -1391,10 +1394,21 @@ else + ;; + + 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*) +@@ -1955,13 +1969,10 @@ netbsd*) + + 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 diff --git a/x11/gtkglarea/patches/patch-ltmain.sh b/x11/gtkglarea/patches/patch-ltmain.sh index 30d6fa6dcc8..40425d2d455 100644 --- a/x11/gtkglarea/patches/patch-ltmain.sh +++ b/x11/gtkglarea/patches/patch-ltmain.sh @@ -1,6 +1,46 @@ ---- ltmain.sh.orig Wed Mar 15 09:37:31 2000 -+++ ltmain.sh Wed Mar 15 09:37:51 2000 -@@ -3522,40 +3522,6 @@ +--- ltmain.sh.orig Thu Feb 17 13:42:54 2000 ++++ ltmain.sh Tue Feb 20 12:33:12 2001 +@@ -1073,7 +1073,18 @@ 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 + *-*-cygwin* | *-*-beos*) +@@ -1085,6 +1096,10 @@ compiler." + deplibs="$deplibs $arg" + ;; + ++ -?thread) ++ deplibs="$deplibs $arg" ++ ;; ++ + -module) + module=yes + continue +@@ -1789,6 +1804,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 +3540,6 @@ libdir='$install_libdir'\ # Exit here if they wanted silent mode. test "$show" = : && exit 0