diff options
| author | ale <ale@FreeBSD.org> | 2010-12-28 14:49:39 +0800 |
|---|---|---|
| committer | ale <ale@FreeBSD.org> | 2010-12-28 14:49:39 +0800 |
| commit | 832ca53750d06afcecfc041a2226bbbf83e0e06f (patch) | |
| tree | d14e7c9639a76e3e97c12f35289d7bca100167cd /databases | |
| parent | 30908e9d1e1db31e4beef6eed66b61e73a26f09d (diff) | |
| download | freebsd-ports-gnome-832ca53750d06afcecfc041a2226bbbf83e0e06f.tar.gz freebsd-ports-gnome-832ca53750d06afcecfc041a2226bbbf83e0e06f.tar.zst freebsd-ports-gnome-832ca53750d06afcecfc041a2226bbbf83e0e06f.zip | |
Normalize cmake parameters and fix WITH_FAST_MUTEXES.
PR: ports/153472
Submitted by: Oleg Sidorkin <OSidorkin@gmail.com>
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/mysql55-client/Makefile | 2 | ||||
| -rw-r--r-- | databases/mysql55-server/Makefile | 8 | ||||
| -rw-r--r-- | databases/percona55-client/Makefile | 2 | ||||
| -rw-r--r-- | databases/percona55-server/Makefile | 8 |
4 files changed, 10 insertions, 10 deletions
diff --git a/databases/mysql55-client/Makefile b/databases/mysql55-client/Makefile index 32f9ee0dfbeb..e91e7e1b36e7 100644 --- a/databases/mysql55-client/Makefile +++ b/databases/mysql55-client/Makefile @@ -20,7 +20,7 @@ LATEST_LINK= mysql55-client CONFLICTS= mysql-client-[34].* mysql-client-5.[0-46-9].* -CMAKE_ARGS= -DWITHOUT_SERVER="ON" +CMAKE_ARGS= -DWITHOUT_SERVER=1 USE_LDCONFIG= yes diff --git a/databases/mysql55-server/Makefile b/databases/mysql55-server/Makefile index 11f1bb6982dc..b085577c424e 100644 --- a/databases/mysql55-server/Makefile +++ b/databases/mysql55-server/Makefile @@ -38,9 +38,9 @@ CMAKE_ARGS+= -DINSTALL_DOCDIR="share/doc/mysql" \ -DINSTALL_SHAREDIR="share" \ -DINSTALL_SQLBENCHDIR="share/mysql" \ -DINSTALL_SUPPORTFILESDIR="share/mysql" \ - -DCMAKE_THREAD_LIBS:STRING="" \ - -DCMAKE_USE_PTHREADS:BOOL=ON \ - -DCMAKE_EXE_LINKER_FLAGS:STRING="${PTHREAD_LIBS}" + -DCMAKE_THREAD_LIBS="" \ + -DCMAKE_USE_PTHREADS=1 \ + -DCMAKE_EXE_LINKER_FLAGS="${PTHREAD_LIBS}" .ifdef USE_MYSQL .error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again. @@ -52,7 +52,7 @@ CMAKE_ARGS+= -DINSTALL_DOCDIR="share/doc/mysql" \ CMAKE_ARGS+= -DWITH_SSL=bundled .endif .if defined(WITH_FASTMTX) -CMAKE_ARGS+= -DWITH_FAST_MUTEXES +CMAKE_ARGS+= -DWITH_FAST_MUTEXES=1 .endif # MySQL-Server part diff --git a/databases/percona55-client/Makefile b/databases/percona55-client/Makefile index 32f9ee0dfbeb..e91e7e1b36e7 100644 --- a/databases/percona55-client/Makefile +++ b/databases/percona55-client/Makefile @@ -20,7 +20,7 @@ LATEST_LINK= mysql55-client CONFLICTS= mysql-client-[34].* mysql-client-5.[0-46-9].* -CMAKE_ARGS= -DWITHOUT_SERVER="ON" +CMAKE_ARGS= -DWITHOUT_SERVER=1 USE_LDCONFIG= yes diff --git a/databases/percona55-server/Makefile b/databases/percona55-server/Makefile index 11f1bb6982dc..b085577c424e 100644 --- a/databases/percona55-server/Makefile +++ b/databases/percona55-server/Makefile @@ -38,9 +38,9 @@ CMAKE_ARGS+= -DINSTALL_DOCDIR="share/doc/mysql" \ -DINSTALL_SHAREDIR="share" \ -DINSTALL_SQLBENCHDIR="share/mysql" \ -DINSTALL_SUPPORTFILESDIR="share/mysql" \ - -DCMAKE_THREAD_LIBS:STRING="" \ - -DCMAKE_USE_PTHREADS:BOOL=ON \ - -DCMAKE_EXE_LINKER_FLAGS:STRING="${PTHREAD_LIBS}" + -DCMAKE_THREAD_LIBS="" \ + -DCMAKE_USE_PTHREADS=1 \ + -DCMAKE_EXE_LINKER_FLAGS="${PTHREAD_LIBS}" .ifdef USE_MYSQL .error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again. @@ -52,7 +52,7 @@ CMAKE_ARGS+= -DINSTALL_DOCDIR="share/doc/mysql" \ CMAKE_ARGS+= -DWITH_SSL=bundled .endif .if defined(WITH_FASTMTX) -CMAKE_ARGS+= -DWITH_FAST_MUTEXES +CMAKE_ARGS+= -DWITH_FAST_MUTEXES=1 .endif # MySQL-Server part |