diff options
author | ale <ale@FreeBSD.org> | 2009-07-22 20:16:57 +0800 |
---|---|---|
committer | ale <ale@FreeBSD.org> | 2009-07-22 20:16:57 +0800 |
commit | fdd8b5f44bc9927405887b994da1f39871b34ae9 (patch) | |
tree | 9f894afe14e385ebfbb0e896399c943238e01cb4 /databases/mysql55-server | |
parent | f85d04ab4f5c1748bb98187b35533ca03e454ee1 (diff) | |
download | freebsd-ports-gnome-fdd8b5f44bc9927405887b994da1f39871b34ae9.tar.gz freebsd-ports-gnome-fdd8b5f44bc9927405887b994da1f39871b34ae9.tar.zst freebsd-ports-gnome-fdd8b5f44bc9927405887b994da1f39871b34ae9.zip |
Fix --enable-dtrace logic and use bundled libtool.
Reported by: many
Diffstat (limited to 'databases/mysql55-server')
-rw-r--r-- | databases/mysql55-server/Makefile | 2 | ||||
-rw-r--r-- | databases/mysql55-server/files/patch-configure | 18 |
2 files changed, 10 insertions, 10 deletions
diff --git a/databases/mysql55-server/Makefile b/databases/mysql55-server/Makefile index fd5ad26d711c..c0710426d050 100644 --- a/databases/mysql55-server/Makefile +++ b/databases/mysql55-server/Makefile @@ -18,7 +18,7 @@ MAINTAINER= ale@FreeBSD.org COMMENT?= Multithreaded SQL database (server) SLAVEDIRS= databases/mysql54-client databases/mysql54-scripts -USE_AUTOTOOLS= libtool:15 +GNU_CONFIGURE= yes USE_GMAKE= yes MAKE_JOBS_SAFE= yes diff --git a/databases/mysql55-server/files/patch-configure b/databases/mysql55-server/files/patch-configure index abfacbb91222..2bd3f24144e6 100644 --- a/databases/mysql55-server/files/patch-configure +++ b/databases/mysql55-server/files/patch-configure @@ -1,15 +1,15 @@ ---- configure.orig Sat May 26 12:22:14 2007 -+++ configure Fri Jun 1 07:53:46 2007 -@@ -20394,8 +20394,6 @@ - # This can be used to rebuild libtool when needed - LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" +--- configure.orig 2009-07-22 12:42:18.000000000 +0200 ++++ configure 2009-07-22 12:41:05.000000000 +0200 +@@ -4000,7 +4000,7 @@ --# Always use our own libtool. --LIBTOOL='$(SHELL) $(top_builddir)/libtool' + else - # Prevent multiple expansion +- ENABLE_DTRACE="yes" ++ ENABLE_DTRACE="no" -@@ -26935,8 +26933,8 @@ + + fi +@@ -24613,8 +24613,8 @@ # Some system specific hacks # |