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

Pass DEB_BUILD_ARCH to CMake options to enhance buils on some platforms 

Clean up unused dpkg-architecture definitions.
parent e94e8ae3
Hide whitespace changes
Inline Side-by-side
debian/changelog
View file @ 7634d3d0
...@@ -2,6 +2,7 @@ mariadb-10.0 (10.0.21-2) UNRELEASED; urgency=low ...@@ -2,6 +2,7 @@ mariadb-10.0 (10.0.21-2) UNRELEASED; urgency=low
* Update gdb.conf to have tags signed by default * Update gdb.conf to have tags signed by default
* Add CVE IDs to previous changelog entries * Add CVE IDs to previous changelog entries
* Pass DEB_BUILD_ARCH to CMake options to enhance buils on some platforms
-- Otto Kekäläinen <otto@seravo.fi> Wed, 26 Aug 2015 18:20:54 +0300 -- Otto Kekäläinen <otto@seravo.fi> Wed, 26 Aug 2015 18:20:54 +0300
......
debian/rules
View file @ 7634d3d0
...@@ -11,9 +11,9 @@ include /usr/share/dpkg/buildflags.mk ...@@ -11,9 +11,9 @@ include /usr/share/dpkg/buildflags.mk
ARCH := $(shell dpkg-architecture -qDEB_BUILD_ARCH) ARCH := $(shell dpkg-architecture -qDEB_BUILD_ARCH)
ARCH_OS := $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS) ARCH_OS := $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)
BUILDDIR := builddir BUILDDIR := builddir
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_SYSTEM) DEB_BUILD_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_SYSTEM)
DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
DEBVERSION := $(shell dpkg-parsechangelog | awk '/^Version: / { print $$2 }' | sed 's/^.*-//' ) DEBVERSION := $(shell dpkg-parsechangelog | awk '/^Version: / { print $$2 }' | sed 's/^.*-//' )
DEB_SOURCE_PACKAGE ?= $(strip $(shell egrep '^Source: ' debian/control | cut -f 2 -d ':')) DEB_SOURCE_PACKAGE ?= $(strip $(shell egrep '^Source: ' debian/control | cut -f 2 -d ':'))
DEB_VERSION ?= $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ') DEB_VERSION ?= $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ')
...@@ -99,6 +99,7 @@ override_dh_auto_configure: ...@@ -99,6 +99,7 @@ override_dh_auto_configure:
-DCOMPILATION_COMMENT="$(DISTRIBUTION) $(RELEASE)" \ -DCOMPILATION_COMMENT="$(DISTRIBUTION) $(RELEASE)" \
-DMYSQL_SERVER_SUFFIX="-$(DEBVERSION)" \ -DMYSQL_SERVER_SUFFIX="-$(DEBVERSION)" \
-DSYSTEM_TYPE="debian-$(DEB_BUILD_GNU_SYSTEM)" \ -DSYSTEM_TYPE="debian-$(DEB_BUILD_GNU_SYSTEM)" \
-DCMAKE_SYSTEM_PROCESSOR=$(DEB_BUILD_ARCH) \
-DBUILD_CONFIG=mysql_release \ -DBUILD_CONFIG=mysql_release \
-DINSTALL_LIBDIR=lib/$(DEB_HOST_MULTIARCH) \ -DINSTALL_LIBDIR=lib/$(DEB_HOST_MULTIARCH) \
-DINSTALL_PLUGINDIR=lib/mysql/plugin \ -DINSTALL_PLUGINDIR=lib/mysql/plugin \
......
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