sync libtool patches

devel/popt/patches/patch-ltconfig

@@ -1,6 +1,6 @@
---- ltconfig.orig	Sat May 27 07:15:00 2000
-+++ ltconfig	Sat Oct 21 13:46:37 2000
-@@ -1105,6 +1105,9 @@
+--- ltconfig.orig	Wed Sep 13 15:41:36 2000
++++ ltconfig	Tue Feb 20 13:57:37 2001
+@@ -1105,6 +1105,9 @@ cygwin* | mingw*)
      with_gnu_ld=no
    fi
    ;;
@@ -10,7 +10,7 @@
  
  esac
  
-@@ -1402,10 +1405,18 @@
+@@ -1402,10 +1405,21 @@ else
      ;;
  
    openbsd*)
@@ -19,19 +19,22 @@
      hardcode_direct=yes
      hardcode_shlibpath_var=no
 +    case "$host_os" in
-+      openbsd2.[01234567])
-+	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'
-+	hardcode_libdir_flag_spec='-R$libdir'
++      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'
++       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*)
-@@ -2021,13 +2032,10 @@
+@@ -2021,13 +2035,10 @@ netbsd*)
  
  openbsd*)
    version_type=sunos

devel/popt/patches/patch-ltmain.sh

@@ -1,6 +1,36 @@
 --- ltmain.sh.orig	Wed Sep 13 15:41:36 2000
-+++ ltmain.sh	Mon Dec  4 11:02:13 2000
-@@ -1799,6 +1799,9 @@
++++ ltmain.sh	Tue Feb 20 13:58:39 2001
+@@ -1079,7 +1079,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*)
+@@ -1091,6 +1102,10 @@ compiler."
+ 	deplibs="$deplibs $arg"
+ 	;;
+ 
++      -?thread)
++        deplibs="$deplibs $arg"
++        ;;
++
+       -module)
+ 	module=yes
+ 	continue
+@@ -1799,6 +1814,9 @@ compiler."
  	  # rhapsody is a little odd...
  	  deplibs="$deplibs -framework System"
  	  ;;
@@ -10,7 +40,7 @@
  	*)
  	  # Add libc to deplibs on all other systems.
  	  deplibs="$deplibs -lc"
-@@ -3571,40 +3574,6 @@
+@@ -3571,40 +3589,6 @@ libdir='$install_libdir'\
      # Exit here if they wanted silent mode.
      test "$show" = : && exit 0