Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
d8d55a57
Commit
d8d55a57
authored
Aug 09, 2010
by
Jonathan Perkin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Apply wlad's fix for bug#55215
parent
81906cdf
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
31 additions
and
37 deletions
+31
-37
.bzr-mysql/default.conf
.bzr-mysql/default.conf
+1
-1
scripts/CMakeLists.txt
scripts/CMakeLists.txt
+29
-35
scripts/mysql_config.sh
scripts/mysql_config.sh
+1
-1
No files found.
.bzr-mysql/default.conf
View file @
d8d55a57
[
MYSQL
]
[
MYSQL
]
post_commit_to
=
"commits@lists.mysql.com"
post_commit_to
=
"commits@lists.mysql.com"
post_push_to
=
"commits@lists.mysql.com"
post_push_to
=
"commits@lists.mysql.com"
tree_name
=
"mysql-5.5"
tree_name
=
"mysql-5.5
-itch
"
scripts/CMakeLists.txt
View file @
d8d55a57
# Copyright (C) 2006 MySQL AB
#
#
# This program is free software; you can redistribute it and/or modify
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# it under the terms of the GNU General Public License as published by
...
@@ -251,43 +250,38 @@ IF(POLICY CMP0007)
...
@@ -251,43 +250,38 @@ IF(POLICY CMP0007)
CMAKE_POLICY
(
SET CMP0007 OLD
)
CMAKE_POLICY
(
SET CMP0007 OLD
)
ENDIF
()
ENDIF
()
LIST
(
REMOVE_ITEM mysqlclient_LIB_DEPENDS
""
)
# Extract dependencies using CMake's internal ${target}_LIB_DEPENDS variable
LIST
(
REMOVE_DUPLICATES mysqlclient_LIB_DEPENDS
)
# returned string in ${var} is can be passed to linker's command line
FOREACH
(
lib
${
mysqlclient_LIB_DEPENDS
}
)
MACRO
(
EXTRACT_LINK_LIBRARIES target var
)
LIST
(
REMOVE_ITEM
${
target
}
_LIB_DEPENDS
""
)
LIST
(
REMOVE_DUPLICATES
${
target
}
_LIB_DEPENDS
)
FOREACH
(
lib
${${
target
}
_LIB_DEPENDS
}
)
# Filter out "general", it is not a library, just CMake hint
# Filter out "general", it is not a library, just CMake hint
IF
(
NOT lib STREQUAL
"general"
AND NOT CLIENT_LIBS MATCHES
"-l
${
lib
}
"
)
# Also, remove duplicates
IF
(
NOT lib STREQUAL
"general"
AND NOT
${
var
}
MATCHES
"-l
${
lib
}
"
)
IF
(
lib MATCHES
"^
\\
-l"
)
IF
(
lib MATCHES
"^
\\
-l"
)
SET
(
CLIENT_LIBS
"
${
CLIENT_LIBS
}
${
lib
}
"
)
SET
(
${
var
}
"
${${
var
}
}
${
lib
}
"
)
ELSEIF
(
lib MATCHES
"^/"
)
ELSEIF
(
lib MATCHES
"^/"
)
# Full path, convert to just filename, strip "lib" prefix and extension
# Full path, convert to just filename, strip "lib" prefix and extension
GET_FILENAME_COMPONENT
(
lib
"
${
lib
}
"
NAME_WE
)
GET_FILENAME_COMPONENT
(
lib
"
${
lib
}
"
NAME_WE
)
STRING
(
REGEX REPLACE
"^lib"
""
lib
"
${
lib
}
"
)
STRING
(
REGEX REPLACE
"^lib"
""
lib
"
${
lib
}
"
)
SET
(
CLIENT_LIBS
"
${
CLIENT_LIBS
}
-l
${
lib
}
"
)
SET
(
${
var
}
"
${${
var
}
}
-l
${
lib
}
"
)
ELSE
()
ELSE
()
SET
(
CLIENT_LIBS
"
${
CLIENT_LIBS
}
-l
${
lib
}
"
)
SET
(
${
var
}
"
${${
var
}
}
-l
${
lib
}
"
)
ENDIF
()
ENDIF
()
ENDIF
()
ENDIF
()
ENDFOREACH
()
ENDFOREACH
()
IF
(
MSVC
)
STRING
(
REPLACE
"-l"
""
${
var
}
"
${${
var
}}
"
)
IF
(
LIBDL AND NOT LIBDL MATCHES
"-l"
)
ENDIF
()
SET
(
LIBDL
"-l
${
LIBDL
}
"
)
ENDMACRO
()
ENDIF
()
IF
(
LIBWRAP
)
SET
(
WRAPLIBS
"-lwrap"
)
ENDIF
()
SET
(
LIBS
"
${
CLIENT_LIBS
}
"
)
EXTRACT_LINK_LIBRARIES
(
mysqlclient CLIENT_LIBS
)
EXTRACT_LINK_LIBRARIES
(
mysqlserver LIBS
)
IF
(
LIBCRYPT
)
# mysql_config evaluates ${LIBDL}, we want to avoid it
SET
(
LIBS
"
${
LIBS
}
-l
${
LIBCRYPT
}
"
)
# as our CLIENT_LIBS and LIBS are already correct
ENDIF
()
SET
(
LIBDL
)
IF
(
MSVC
)
STRING
(
REPLACE
"-l"
""
CLIENT_LIBS
"
${
CLIENT_LIBS
}
"
)
STRING
(
REPLACE
"-l"
""
LIBS
"
${
LIBS
}
"
)
ENDIF
()
SET
(
NON_THREADED_LIBS
${
CLIENT_LIBS
}
)
SET
(
NON_THREADED_LIBS
${
CLIENT_LIBS
}
)
SET
(
mysql_config_COMPONENT COMPONENT Development
)
SET
(
mysql_config_COMPONENT COMPONENT Development
)
...
...
scripts/mysql_config.sh
View file @
d8d55a57
...
@@ -108,7 +108,7 @@ fi
...
@@ -108,7 +108,7 @@ fi
# We intentionally add a space to the beginning and end of lib strings, simplifies replace later
# We intentionally add a space to the beginning and end of lib strings, simplifies replace later
libs
=
"
$ldflags
-L
$pkglibdir
-lmysqlclient @ZLIB_DEPS@ @NON_THREADED_LIBS@"
libs
=
"
$ldflags
-L
$pkglibdir
-lmysqlclient @ZLIB_DEPS@ @NON_THREADED_LIBS@"
libs
=
"
$libs
@openssl_libs@ @STATIC_NSS_FLAGS@ "
libs
=
"
$libs
@openssl_libs@ @STATIC_NSS_FLAGS@ "
libs_r
=
"
$ldflags
-L
$pkglibdir
-lmysqlclient_r @ZLIB_DEPS@ @LIBS@ @openssl_libs@ "
libs_r
=
"
$ldflags
-L
$pkglibdir
-lmysqlclient_r @ZLIB_DEPS@ @
CLIENT_
LIBS@ @openssl_libs@ "
embedded_libs
=
"
$ldflags
-L
$pkglibdir
-lmysqld @LIBDL@ @ZLIB_DEPS@ @LIBS@ @WRAPLIBS@ @openssl_libs@ "
embedded_libs
=
"
$ldflags
-L
$pkglibdir
-lmysqld @LIBDL@ @ZLIB_DEPS@ @LIBS@ @WRAPLIBS@ @openssl_libs@ "
if
[
-r
"
$pkglibdir
/libmygcc.a"
]
;
then
if
[
-r
"
$pkglibdir
/libmygcc.a"
]
;
then
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment