Skip to content
GitLab
Commit 5811b944 authored by Otto Kekäläinen's avatar Otto Kekäläinen
Browse files

Removed CFLAGS and CXXFLAGS as suggested by Lars Tangvald

parent 33353b1f
Hide whitespace changes
Inline Side-by-side
debian/changelog
View file @ 5811b944
...@@ -18,6 +18,8 @@ mariadb-10.0 (10.0.23-2) UNRELEASED; urgency=low ...@@ -18,6 +18,8 @@ mariadb-10.0 (10.0.23-2) UNRELEASED; urgency=low
fixes #677222 in MariaDB packages. fixes #677222 in MariaDB packages.
* Rename and install Apport hook correctly * Rename and install Apport hook correctly
* Remove Taocrypt workaround fixed upstream long since #627208 * Remove Taocrypt workaround fixed upstream long since #627208
* Removed CFLAGS and CXXFLAGS as suggested by Lars Tangvald and also done
in mysql-5.6 packaging commit id 16a64e810e28f1d0b66ede274cd4c2b1a425fecb
-- Otto Kekäläinen <otto@seravo.fi> Mon, 28 Dec 2015 09:51:36 +0200 -- Otto Kekäläinen <otto@seravo.fi> Mon, 28 Dec 2015 09:51:36 +0200
......
debian/rules
View file @ 5811b944
...@@ -68,9 +68,7 @@ override_dh_auto_configure: ...@@ -68,9 +68,7 @@ override_dh_auto_configure:
mkdir -p $(BUILDDIR) && cd $(BUILDDIR) && \ mkdir -p $(BUILDDIR) && cd $(BUILDDIR) && \
sh -c 'PATH=$${MYSQL_BUILD_PATH:-"/usr/local/bin:/usr/bin:/bin"} \ sh -c 'PATH=$${MYSQL_BUILD_PATH:-"/usr/local/bin:/usr/bin:/bin"} \
CC=${CC} \ CC=${CC} \
CFLAGS=$${MYSQL_BUILD_CFLAGS:-"-O3 -fno-strict-aliasing"} \
CXX=${CXX} \ CXX=${CXX} \
CXXFLAGS=$${MYSQL_BUILD_CXXFLAGS:-"-O3 -felide-constructors -fno-exceptions -fno-rtti -fno-strict-aliasing ${TAOCRYPT_OPT}"} \
cmake -DCMAKE_INSTALL_PREFIX=/usr \ cmake -DCMAKE_INSTALL_PREFIX=/usr \
$(CMAKEFLAGS) \ $(CMAKEFLAGS) \
-DWITH_SSL=bundled \ -DWITH_SSL=bundled \
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment