bsd.pkg.mk rev. 1.758 started to always set LIBS in CONFIGURE_ENV.

Fix the invocation of the mit-pthreads configure script to not add
the non-existant pthreads library to LIBS so that the compiler doesn't bomb
out.

Fixes pkg/13277.
This commit is contained in:
bad 2001-07-06 15:27:17 +00:00
parent 39f78f4b8e
commit 7a070fead6
3 changed files with 31 additions and 13 deletions

View file

@ -1,4 +1,4 @@
$NetBSD: distinfo,v 1.3 2001/05/02 08:22:30 jlam Exp $
$NetBSD: distinfo,v 1.4 2001/07/06 15:27:17 bad Exp $
SHA1 (mysql-3.23.35.tar.gz) = c1532aa954d613d0a4ebdae046ae23427e4ee327
Size (mysql-3.23.35.tar.gz) = 10929885 bytes
@ -6,5 +6,5 @@ SHA1 (patch-aa) = 05c56d81e17893dd267fcd5f68d8c378f024a06f
SHA1 (patch-ab) = 4f10917780d73cb4a58127b27a5d8c1c9f63e0d3
SHA1 (patch-ac) = 9ac4beb4f53cc4d4fc4ec52cf30716c8269face8
SHA1 (patch-ad) = 1aecfee152d303b3d65f3866032d2a6d49538f46
SHA1 (patch-ae) = 46fa106d1f308884594a5479ad16ff58ee9057ba
SHA1 (patch-af) = c8b613527e92c4a9c85992c135dd35e330580d23
SHA1 (patch-ae) = ae05bb8c369b57b110e2be9c9d85feb23cb0b918
SHA1 (patch-af) = dd4b7694d0d282acbefb5a0039cf66e4dc40d3a6

View file

@ -1,7 +1,7 @@
$NetBSD: patch-ae,v 1.4 2001/05/02 08:22:31 jlam Exp $
$NetBSD: patch-ae,v 1.5 2001/07/06 15:27:18 bad Exp $
--- configure.in.orig Thu Mar 15 19:51:51 2001
+++ configure.in
--- configure.in.orig Fri Mar 16 01:51:51 2001
+++ configure.in Fri Jul 6 16:37:36 2001
@@ -581,7 +581,10 @@
AC_MSG_RESULT(yes)
AC_DEFINE(LIBWRAP)
@ -27,12 +27,21 @@ $NetBSD: patch-ae,v 1.4 2001/05/02 08:22:31 jlam Exp $
fi
AC_SUBST(readline_dir)
AC_SUBST(readline_link)
@@ -1951,7 +1958,7 @@
@@ -1951,15 +1958,15 @@
AC_DEFINE(HAVE_mit_thread)
MT_INCLUDES="-I\$(top_srcdir)/mit-pthreads/include"
AC_SUBST(MT_INCLUDES)
- MT_LD_ADD="-L \$(top_srcdir)/mit-pthreads/obj/ -lpthread"
+ MT_LD_ADD="\$(top_srcdir)/mit-pthreads/obj/libpthread.a"
AC_SUBST(MT_LD_ADD)
LIBS="$MT_LD_ADD $LIBS"
- LIBS="$MT_LD_ADD $LIBS"
echo ""
echo "Configuring MIT Pthreads"
# We will never install so installation paths are not needed.
(cd mit-pthreads; sh ./configure)
echo "End of MIT Pthreads configuration"
echo ""
+ LIBS="$MT_LD_ADD $LIBS"
fi
fi
AC_SUBST(sql_server_dirs)

View file

@ -1,7 +1,7 @@
$NetBSD: patch-af,v 1.4 2001/05/02 08:22:31 jlam Exp $
$NetBSD: patch-af,v 1.5 2001/07/06 15:27:18 bad Exp $
--- configure.orig Thu Mar 15 19:52:05 2001
+++ configure
--- configure.orig Fri Mar 16 01:52:05 2001
+++ configure Fri Jul 6 16:37:36 2001
@@ -5004,7 +5004,10 @@
#define HAVE_LIBWRAP 1
EOF
@ -27,12 +27,21 @@ $NetBSD: patch-af,v 1.4 2001/05/02 08:22:31 jlam Exp $
fi
@@ -10466,7 +10473,7 @@
@@ -10466,15 +10473,15 @@
MT_INCLUDES="-I\$(top_srcdir)/mit-pthreads/include"
- MT_LD_ADD="-L \$(top_srcdir)/mit-pthreads/obj/ -lpthread"
+ MT_LD_ADD="\$(top_srcdir)/mit-pthreads/obj/libpthread.a"
LIBS="$MT_LD_ADD $LIBS"
- LIBS="$MT_LD_ADD $LIBS"
echo ""
echo "Configuring MIT Pthreads"
# We will never install so installation paths are not needed.
(cd mit-pthreads; sh ./configure)
echo "End of MIT Pthreads configuration"
echo ""
+ LIBS="$MT_LD_ADD $LIBS"
fi
fi