diff options
Diffstat (limited to 'databases/postgresql/patches/patch-ab')
-rw-r--r-- | databases/postgresql/patches/patch-ab | 43 |
1 files changed, 34 insertions, 9 deletions
diff --git a/databases/postgresql/patches/patch-ab b/databases/postgresql/patches/patch-ab index 3d8a389c9bd..69e25287260 100644 --- a/databases/postgresql/patches/patch-ab +++ b/databases/postgresql/patches/patch-ab @@ -1,13 +1,38 @@ -$NetBSD: patch-ab,v 1.12 2001/07/27 17:52:33 jlam Exp $ +$NetBSD: patch-ab,v 1.13 2002/04/04 07:48:24 jlam Exp $ ---- config/programs.m4.orig Sat Feb 10 14:31:42 2001 +--- config/programs.m4.orig Tue Aug 28 10:59:11 2001 +++ config/programs.m4 -@@ -85,7 +85,7 @@ - for pgac_rllib in -lreadline -ledit ; do +@@ -80,6 +80,14 @@ + [AC_REQUIRE([AC_CANONICAL_HOST]) + AC_MSG_CHECKING([for readline]) + ++case $host_os in netbsd* | openbsd* ) ++ if echo __ELF__ | $CPP - 2>/dev/null | grep __ELF__ >/dev/null; then ++ objformat=a.out ++ else ++ objformat=ELF ++ fi ++esac ++ + AC_CACHE_VAL([pgac_cv_check_readline], + [pgac_cv_check_readline=no + for pgac_lib in "" " -ltermcap" " -lncurses" " -lcurses" ; do +@@ -87,12 +95,14 @@ pgac_save_LIBS=$LIBS LIBS="${pgac_rllib}${pgac_lib} $LIBS" -- AC_TRY_LINK_FUNC([readline], [pgac_cv_check_readline="${pgac_rllib}${pgac_lib}"; break 2]) -+ AC_TRY_LINK_FUNC([readline], AC_TRY_RUN([int main() { return 0; }], [pgac_cv_check_readline="${pgac_rllib}${pgac_lib}"; break 2])) - LIBS=$pgac_save_LIBS - done - done + AC_TRY_LINK_FUNC([readline], [[ +- # NetBSD and OpenBSD have a broken linker that does not ++ # NetBSD and OpenBSD have a broken a.out linker that does not + # recognize dependent libraries + case $host_os in netbsd* | openbsd* ) +- case $pgac_lib in +- *curses*) ;; +- *) pgac_lib=" -lcurses" ;; ++ case $objformat in a.out ) ++ case $pgac_lib in ++ *curses*) ;; ++ *) pgac_lib=" -lcurses" ;; ++ esac + esac + esac + |