summaryrefslogtreecommitdiff
path: root/databases/mysql-server
diff options
context:
space:
mode:
authorbad <bad@pkgsrc.org>2001-03-26 13:43:50 +0000
committerbad <bad@pkgsrc.org>2001-03-26 13:43:50 +0000
commita236e650caf854dcee5d28a5836d707e5c92735b (patch)
tree57c79bb333e68ba270b7141ffdacd56fdafe4112 /databases/mysql-server
parentc5025b090f1d606f6cfa950666d5dbb1478fdad0 (diff)
downloadpkgsrc-a236e650caf854dcee5d28a5836d707e5c92735b.tar.gz
Fix configure script to not use "-Lyes/lib" when tcp_wrapper support
is configured in. Work around the fact that our libtool doesn't seem to grok "-L dir" syntax.
Diffstat (limited to 'databases/mysql-server')
-rw-r--r--databases/mysql-server/patches/patch-ae45
-rw-r--r--databases/mysql-server/patches/patch-af42
2 files changed, 48 insertions, 39 deletions
diff --git a/databases/mysql-server/patches/patch-ae b/databases/mysql-server/patches/patch-ae
index 79c02fb73bb..988f5ae65a2 100644
--- a/databases/mysql-server/patches/patch-ae
+++ b/databases/mysql-server/patches/patch-ae
@@ -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 ""
diff --git a/databases/mysql-server/patches/patch-af b/databases/mysql-server/patches/patch-af
index f5f2469916d..b3f00328a0e 100644
--- a/databases/mysql-server/patches/patch-af
+++ b/databases/mysql-server/patches/patch-af
@@ -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 ""