kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix configure script to not use "-Lyes/lib" when tcp_wrapper support

Browse source 
is configured in.

Work around the fact that our libtool doesn't seem to grok "-L dir" syntax.
This commit is contained in:
bad 2001-03-26 13:43:50 +00:00
parent c5025b090f
commit a236e650ca
2 changed files with 48 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
databases/mysql-server/patches/patch-ae
View file

@ -1,22 +1,25 @@
$NetBSD: patch-ae,v 1.1 2001/01/10 06:03:14 briggs Exp $
$NetBSD: patch-ae,v 1.2 2001/03/26 13:43:50 bad Exp $
*** mit-pthreads/config/config.guess.orig Thu Dec 30 19:15:51 1999
--- mit-pthreads/config/config.guess Tue Jan 9 22:43:12 2001
***************
*** 295,301 ****
echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
exit 0 ;;
*:NetBSD:*:*)
! echo ${UNAME_MACHINE}-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
exit 0 ;;
*:OpenBSD:*:*)
echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
--- 295,302 ----
echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
exit 0 ;;
*:NetBSD:*:*)
! UNAME_PROCESSOR=`uname -p 2>/dev/null` || UNAME_PROCESSOR=$UNAME_MACHINE
! echo ${UNAME_PROCESSOR}-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
exit 0 ;;
*:OpenBSD:*:*)
echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
--- configure.in.orig Fri Mar 16 01:51:51 2001
+++ configure.in Sat Mar 24 02:44:15 2001
@@ -581,7 +581,10 @@
AC_MSG_RESULT(yes)
AC_DEFINE(LIBWRAP)
AC_DEFINE(HAVE_LIBWRAP)
- WRAPLIBS="-L$with_libwrap/lib -lwrap",
+ if test "$with_libwrap" != "yes"; then
+ WRAPLIBS="-L${with_libwrap}/lib"
+ fi
+ WRAPLIBS="${WRAPLIBS} -lwrap",
AC_MSG_RESULT(no)
CPPFLAGS=${_cppflags} LDFLAGS=${_ldflags}),
CPPFLAGS=${_cppflags} LDFLAGS=${_ldflags})
@@ -1951,7 +1954,7 @@
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="-L\$(top_srcdir)/mit-pthreads/obj/ -lpthread"
AC_SUBST(MT_LD_ADD)
LIBS="$MT_LD_ADD $LIBS"
echo ""

42
databases/mysql-server/patches/patch-af
View file

@ -1,19 +1,25 @@
$NetBSD: patch-af,v 1.1 2001/01/10 06:03:14 briggs Exp $
$NetBSD: patch-af,v 1.2 2001/03/26 13:43:50 bad Exp $
*** mit-pthreads/config/configure.orig Thu Dec 30 19:15:51 1999
--- mit-pthreads/config/configure Tue Jan 9 22:41:32 2001
***************
*** 1211,1216 ****
--- 1211,1222 ----
# hpux-9.03.mk seems to be missing; what should this be?
except="fork"
;;
+ powerpc-*-netbsd1.*)
+ name=powerpc-netbsd
+ sysincludes=netbsd-1.1
+ except="fork lseek ftruncate pipe fstat"
+ available_syscalls="sigprocmask sigaction sigsuspend"
+ ;;
sparc-*-sunos4.1.3* | sparc-*-sunos4.1.4*)
name=sparc-sunos-4.1.3
sysincludes=sunos-4.1.3
--- configure.orig Fri Mar 16 01:52:05 2001
+++ configure Sat Mar 24 02:42:32 2001
@@ -5004,7 +5004,10 @@
#define HAVE_LIBWRAP 1
EOF
- WRAPLIBS="-L$with_libwrap/lib -lwrap"
+ if test "$with_libwrap" != "yes"; then
+ WRAPLIBS="-L${with_libwrap}/lib"
+ fi
+ WRAPLIBS="${WRAPLIBS} -lwrap"
else
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
@@ -10466,7 +10469,7 @@
MT_INCLUDES="-I\$(top_srcdir)/mit-pthreads/include"
- MT_LD_ADD="-L \$(top_srcdir)/mit-pthreads/obj/ -lpthread"
+ MT_LD_ADD="-L\$(top_srcdir)/mit-pthreads/obj/ -lpthread"
LIBS="$MT_LD_ADD $LIBS"
echo ""