patch-libgo_configure 2.4 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273747576777879
  1. $OpenBSD: patch-libgo_configure,v 1.5 2012/04/06 07:50:32 pascal Exp $
  2. --- libgo/configure.orig Mon Feb 21 05:17:20 2011
  3. +++ libgo/configure Wed Apr 4 23:09:24 2012
  4. @@ -644,6 +644,8 @@ LIBGO_IS_LINUX_FALSE
  5. LIBGO_IS_LINUX_TRUE
  6. LIBGO_IS_FREEBSD_FALSE
  7. LIBGO_IS_FREEBSD_TRUE
  8. +LIBGO_IS_OPENBSD_FALSE
  9. +LIBGO_IS_OPENBSD_TRUE
  10. LIBGO_IS_DARWIN_FALSE
  11. LIBGO_IS_DARWIN_TRUE
  12. LIBFFIINCS
  13. @@ -10320,7 +10322,7 @@ openbsd*)
  14. *) need_version=no ;;
  15. esac
  16. library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
  17. - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
  18. + #finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
  19. shlibpath_var=LD_LIBRARY_PATH
  20. if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
  21. case $host_os in
  22. @@ -13213,6 +13215,7 @@ fi
  23. is_darwin=no
  24. is_freebsd=no
  25. +is_openbsd=no
  26. is_linux=no
  27. is_rtems=no
  28. is_solaris=no
  29. @@ -13220,6 +13223,7 @@ GOOS=unknown
  30. case ${host} in
  31. *-*-darwin*) is_darwin=yes; GOOS=darwin ;;
  32. *-*-freebsd*) is_freebsd=yes; GOOS=freebsd ;;
  33. + *-*-openbsd*) is_openbsd=yes; GOOS=openbsd ;;
  34. *-*-linux*) is_linux=yes; GOOS=linux ;;
  35. *-*-rtems*) is_rtems=yes; GOOS=rtems ;;
  36. *-*-solaris2*) is_solaris=yes; GOOS=solaris ;;
  37. @@ -13240,6 +13244,14 @@ else
  38. LIBGO_IS_FREEBSD_FALSE=
  39. fi
  40. + if test $is_openbsd = yes; then
  41. + LIBGO_IS_OPENBSD_TRUE=
  42. + LIBGO_IS_OPENBSD_FALSE='#'
  43. +else
  44. + LIBGO_IS_OPENBSD_TRUE='#'
  45. + LIBGO_IS_OPENBSD_FALSE=
  46. +fi
  47. +
  48. if test $is_linux = yes; then
  49. LIBGO_IS_LINUX_TRUE=
  50. LIBGO_IS_LINUX_FALSE='#'
  51. @@ -13706,13 +13718,13 @@ fi
  52. PTHREAD_LIBS=
  53. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthread" >&5
  54. -$as_echo_n "checking for pthread_create in -lpthread... " >&6; }
  55. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -pthread" >&5
  56. +$as_echo_n "checking for pthread_create in -pthread... " >&6; }
  57. if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then :
  58. $as_echo_n "(cached) " >&6
  59. else
  60. ac_check_lib_save_LIBS=$LIBS
  61. -LIBS="-lpthread $LIBS"
  62. +LIBS="-pthread $LIBS"
  63. cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  64. /* end confdefs.h. */
  65. @@ -13743,7 +13755,7 @@ fi
  66. { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_create" >&5
  67. $as_echo "$ac_cv_lib_pthread_pthread_create" >&6; }
  68. if test "x$ac_cv_lib_pthread_pthread_create" = x""yes; then :
  69. - PTHREAD_LIBS=-lpthread
  70. + PTHREAD_LIBS=-pthread
  71. fi