[Commits] Rev 3230: Buildbot VMs have cmake in /usr/local/, so we need to include that in the path. in http://bazaar.launchpad.net/~maria-captains/maria/5.5

knielsen at knielsen-hq.org knielsen at knielsen-hq.org
Mon Jan 23 16:08:47 EET 2012


At http://bazaar.launchpad.net/~maria-captains/maria/5.5

------------------------------------------------------------
revno: 3230
revision-id: knielsen at knielsen-hq.org-20120123140846-yq2k29jj65tzpc4w
parent: knielsen at knielsen-hq.org-20120123112016-dihkvca7ylziiojl
committer: knielsen at knielsen-hq.org
branch nick: mariadb-5.5
timestamp: Mon 2012-01-23 15:08:46 +0100
message:
  Buildbot VMs have cmake in /usr/local/, so we need to include that in the path.
=== modified file 'debian/dist/Debian/rules'
--- a/debian/dist/Debian/rules	2012-01-23 11:20:16 +0000
+++ b/debian/dist/Debian/rules	2012-01-23 14:08:46 +0000
@@ -64,7 +64,7 @@ ifneq ($(ARCH_OS),hurd)
 endif
 
         ( test -d $(builddir) || mkdir $(builddir) ) && cd $(builddir) && \
-        sh -c 'PATH=$${MYSQL_BUILD_PATH:-"/bin:/usr/bin"} \
+        sh -c 'PATH=$${MYSQL_BUILD_PATH:-"/bin:/usr/bin:/usr/local/bin"} \
                         CC=$${MYSQL_BUILD_CC:-gcc} \
                         CFLAGS=$${MYSQL_BUILD_CFLAGS:-"-O2 -fno-omit-frame-pointer -g -pipe -Wall -Wno-uninitialized"} \
                         CXX=$${MYSQL_BUILD_CXX:-g++} \

=== modified file 'debian/dist/Ubuntu/rules'
--- a/debian/dist/Ubuntu/rules	2012-01-23 11:20:16 +0000
+++ b/debian/dist/Ubuntu/rules	2012-01-23 14:08:46 +0000
@@ -64,7 +64,7 @@ ifneq ($(ARCH_OS),hurd)
 endif
 
         ( test -d $(builddir) || mkdir $(builddir) ) && cd $(builddir) && \
-        sh -c 'PATH=$${MYSQL_BUILD_PATH:-"/bin:/usr/bin"} \
+        sh -c 'PATH=$${MYSQL_BUILD_PATH:-"/bin:/usr/bin:/usr/local/bin"} \
                         CC=$${MYSQL_BUILD_CC:-gcc} \
                         CFLAGS=$${MYSQL_BUILD_CFLAGS:-"-O2 -fno-omit-frame-pointer -g -pipe -Wall -Wno-uninitialized"} \
                         CXX=$${MYSQL_BUILD_CXX:-g++} \



More information about the commits mailing list