Merge lp:~ignacio-nin/percona-server/5.5-bug1133266 into lp:percona-server/5.5

Proposed by Ignacio Nin
Status: Merged
Approved by: Laurynas Biveinis
Approved revision: 500
Merged at revision: 534
Proposed branch: lp:~ignacio-nin/percona-server/5.5-bug1133266
Merge into: lp:percona-server/5.5
Diff against target: 139 lines (+36/-10)
4 files modified
build/build-binary.sh (+12/-4)
build/build-dpkg.sh (+13/-3)
build/build-rpm.sh (+9/-1)
build/percona-server.spec (+2/-2)
To merge this branch: bzr merge lp:~ignacio-nin/percona-server/5.5-bug1133266
Reviewer Review Type Date Requested Status
Laurynas Biveinis (community) Approve
Review via email: mp+167636@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Laurynas Biveinis (laurynas-biveinis) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'build/build-binary.sh'
--- build/build-binary.sh 2013-05-30 19:16:16 +0000
+++ build/build-binary.sh 2013-06-05 20:52:33 +0000
@@ -99,6 +99,14 @@
99SOURCEDIR="$(cd $(dirname "$0"); cd ..; pwd)"99SOURCEDIR="$(cd $(dirname "$0"); cd ..; pwd)"
100test -e "$SOURCEDIR/Makefile" || exit 2100test -e "$SOURCEDIR/Makefile" || exit 2
101101
102# The number of processors is a good default for -j
103if test -e "/proc/cpuinfo"
104then
105 PROCESSORS="$(grep -c ^processor /proc/cpuinfo)"
106else
107 PROCESSORS=4
108fi
109
102# Extract version from the Makefile110# Extract version from the Makefile
103MYSQL_VERSION="$(grep ^MYSQL_VERSION= "$SOURCEDIR/Makefile" \111MYSQL_VERSION="$(grep ^MYSQL_VERSION= "$SOURCEDIR/Makefile" \
104 | cut -d = -f 2)"112 | cut -d = -f 2)"
@@ -118,7 +126,7 @@
118export CXX=${CXX:-gcc}126export CXX=${CXX:-gcc}
119export CFLAGS="-fPIC -Wall -O3 -g -static-libgcc -fno-omit-frame-pointer -DPERCONA_INNODB_VERSION=$PERCONA_SERVER_VERSION $TARGET_CFLAGS ${CFLAGS:-}"127export CFLAGS="-fPIC -Wall -O3 -g -static-libgcc -fno-omit-frame-pointer -DPERCONA_INNODB_VERSION=$PERCONA_SERVER_VERSION $TARGET_CFLAGS ${CFLAGS:-}"
120export CXXFLAGS="-O2 -fno-omit-frame-pointer -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fno-exceptions -DPERCONA_INNODB_VERSION=$PERCONA_SERVER_VERSION $TARGET_CFLAGS ${CXXFLAGS:-}"128export CXXFLAGS="-O2 -fno-omit-frame-pointer -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fno-exceptions -DPERCONA_INNODB_VERSION=$PERCONA_SERVER_VERSION $TARGET_CFLAGS ${CXXFLAGS:-}"
121export MAKE_JFLAG=-j4129export MAKE_JFLAG="${MAKE_JFLAG:--j$PROCESSORS}"
122130
123# Create a temporary working directory131# Create a temporary working directory
124INSTALLDIR="$(cd "$WORKDIR" && TMPDIR="$WORKDIR_ABS" mktemp -d percona-build.XXXXXX)"132INSTALLDIR="$(cd "$WORKDIR" && TMPDIR="$WORKDIR_ABS" mktemp -d percona-build.XXXXXX)"
@@ -168,7 +176,7 @@
168 --with-mysql-plugindir="/usr/local/$PRODUCT_FULL/lib/mysql/plugin" \176 --with-mysql-plugindir="/usr/local/$PRODUCT_FULL/lib/mysql/plugin" \
169 --libdir="/usr/local/$PRODUCT_FULL/lib/mysql/plugin" \177 --libdir="/usr/local/$PRODUCT_FULL/lib/mysql/plugin" \
170 --prefix="/usr/local/$PRODUCT_FULL"178 --prefix="/usr/local/$PRODUCT_FULL"
171 make179 make $MAKE_JFLAG
172 make DESTDIR="$INSTALLDIR" install180 make DESTDIR="$INSTALLDIR" install
173181
174 )182 )
@@ -178,7 +186,7 @@
178 cd "UDF"186 cd "UDF"
179 CXX=${UDF_CXX:-g++} ./configure --includedir="$SOURCEDIR/$PRODUCT/include" \187 CXX=${UDF_CXX:-g++} ./configure --includedir="$SOURCEDIR/$PRODUCT/include" \
180 --libdir="/usr/local/$PRODUCT_FULL/mysql/plugin"188 --libdir="/usr/local/$PRODUCT_FULL/mysql/plugin"
181 make189 make $MAKE_JFLAG
182 make DESTDIR="$INSTALLDIR" install190 make DESTDIR="$INSTALLDIR" install
183191
184 )192 )
@@ -191,7 +199,7 @@
191199
192 ./configure --prefix="/usr/local/$PRODUCT_FULL/" \200 ./configure --prefix="/usr/local/$PRODUCT_FULL/" \
193 --libdir="/usr/local/$PRODUCT_FULL/lib/mysql/"201 --libdir="/usr/local/$PRODUCT_FULL/lib/mysql/"
194 make202 make $MAKE_JFLAG
195 make DESTDIR="$INSTALLDIR" install_lib_shared203 make DESTDIR="$INSTALLDIR" install_lib_shared
196204
197 # Copy COPYING file205 # Copy COPYING file
198206
=== modified file 'build/build-dpkg.sh'
--- build/build-dpkg.sh 2013-06-01 15:04:43 +0000
+++ build/build-dpkg.sh 2013-06-05 20:52:33 +0000
@@ -69,6 +69,14 @@
69SOURCEDIR="$(cd $(dirname "$0"); cd ..; pwd)"69SOURCEDIR="$(cd $(dirname "$0"); cd ..; pwd)"
70test -e "$SOURCEDIR/Makefile" || exit 270test -e "$SOURCEDIR/Makefile" || exit 2
7171
72# The number of processors is a good default for -j
73if test -e "/proc/cpuinfo"
74then
75 PROCESSORS="$(grep -c ^processor /proc/cpuinfo)"
76else
77 PROCESSORS=4
78fi
79
72# Extract version from the Makefile80# Extract version from the Makefile
73MYSQL_VERSION="$(grep ^MYSQL_VERSION= "$SOURCEDIR/Makefile" \81MYSQL_VERSION="$(grep ^MYSQL_VERSION= "$SOURCEDIR/Makefile" \
74 | cut -d = -f 2)"82 | cut -d = -f 2)"
@@ -82,11 +90,13 @@
82export DEB_BUILD_OPTIONS='debug'90export DEB_BUILD_OPTIONS='debug'
8391
84# Compilation flags92# Compilation flags
85export CC=${CC:-gcc}93export CC="${CC:-gcc}"
86export CXX=${CXX:-gcc}94export CXX="${CXX:-gcc}"
95export HS_CXX=${HS_CXX:-g++}
96export UDF_CXX=${UDF_CXX:-g++}
87export CFLAGS="-fPIC -Wall -O3 -g -static-libgcc -fno-omit-frame-pointer -DPERCONA_INNODB_VERSION=$PERCONA_SERVER_VERSION ${CFLAGS:-}"97export CFLAGS="-fPIC -Wall -O3 -g -static-libgcc -fno-omit-frame-pointer -DPERCONA_INNODB_VERSION=$PERCONA_SERVER_VERSION ${CFLAGS:-}"
88export CXXFLAGS="-O2 -fno-omit-frame-pointer -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fno-exceptions -DPERCONA_INNODB_VERSION=$PERCONA_SERVER_VERSION ${CXXFLAGS:-}"98export CXXFLAGS="-O2 -fno-omit-frame-pointer -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fno-exceptions -DPERCONA_INNODB_VERSION=$PERCONA_SERVER_VERSION ${CXXFLAGS:-}"
89export MAKE_JFLAG=-j499export MAKE_JFLAG="${MAKE_JFLAG:--j$PROCESSORS}"
90100
91# Prepare sources101# Prepare sources
92(102(
93103
=== modified file 'build/build-rpm.sh'
--- build/build-rpm.sh 2013-05-30 19:16:16 +0000
+++ build/build-rpm.sh 2013-06-05 20:52:33 +0000
@@ -98,6 +98,14 @@
98SOURCEDIR="$(cd $(dirname "$0"); cd ..; pwd)"98SOURCEDIR="$(cd $(dirname "$0"); cd ..; pwd)"
99test -e "$SOURCEDIR/Makefile" || exit 299test -e "$SOURCEDIR/Makefile" || exit 2
100100
101# The number of processors is a good default for -j
102if test -e "/proc/cpuinfo"
103then
104 PROCESSORS="$(grep -c ^processor /proc/cpuinfo)"
105else
106 PROCESSORS=4
107fi
108
101# Extract version from the Makefile109# Extract version from the Makefile
102MYSQL_VERSION="$(grep ^MYSQL_VERSION= "$SOURCEDIR/Makefile" \110MYSQL_VERSION="$(grep ^MYSQL_VERSION= "$SOURCEDIR/Makefile" \
103 | cut -d = -f 2)"111 | cut -d = -f 2)"
@@ -117,7 +125,7 @@
117export UDF_CXX=${UDF_CXX:-g++}125export UDF_CXX=${UDF_CXX:-g++}
118export CFLAGS="-fPIC -Wall -O3 -g -static-libgcc -fno-omit-frame-pointer -DPERCONA_INNODB_VERSION=$PERCONA_SERVER_VERSION $TARGET_CFLAGS ${CFLAGS:-}"126export CFLAGS="-fPIC -Wall -O3 -g -static-libgcc -fno-omit-frame-pointer -DPERCONA_INNODB_VERSION=$PERCONA_SERVER_VERSION $TARGET_CFLAGS ${CFLAGS:-}"
119export CXXFLAGS="-O2 -fno-omit-frame-pointer -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fno-exceptions -DPERCONA_INNODB_VERSION=$PERCONA_SERVER_VERSION $TARGET_CFLAGS ${CXXFLAGS:-}"127export CXXFLAGS="-O2 -fno-omit-frame-pointer -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fno-exceptions -DPERCONA_INNODB_VERSION=$PERCONA_SERVER_VERSION $TARGET_CFLAGS ${CXXFLAGS:-}"
120export MAKE_JFLAG=-j4128export MAKE_JFLAG="${MAKE_JFLAG:--j$PROCESSORS}"
121129
122# Create directories for rpmbuild if these don't exist130# Create directories for rpmbuild if these don't exist
123(cd "$WORKDIR" && mkdir -p BUILD RPMS SOURCES SPECS SRPMS)131(cd "$WORKDIR" && mkdir -p BUILD RPMS SOURCES SPECS SRPMS)
124132
=== modified file 'build/percona-server.spec'
--- build/percona-server.spec 2013-06-01 15:04:43 +0000
+++ build/percona-server.spec 2013-06-05 20:52:33 +0000
@@ -349,7 +349,7 @@
349 --with-mysql-plugindir=%{_libdir}/mysql/plugin \349 --with-mysql-plugindir=%{_libdir}/mysql/plugin \
350 --libdir=%{_libdir} \350 --libdir=%{_libdir} \
351 --prefix=%{_prefix}351 --prefix=%{_prefix}
352 make352 make ${MAKE_JFLAG}
353 cd -353 cd -
354}354}
355355
@@ -359,7 +359,7 @@
359 CXXFLAGS="$CXXFLAGS -I$RPM_BUILD_DIR/%{src_dir}/release/include" \359 CXXFLAGS="$CXXFLAGS -I$RPM_BUILD_DIR/%{src_dir}/release/include" \
360 ./configure --includedir=$RPM_BUILD_DIR/%{src_dir}/include \360 ./configure --includedir=$RPM_BUILD_DIR/%{src_dir}/include \
361 --libdir=%{_libdir}/mysql/plugin361 --libdir=%{_libdir}/mysql/plugin
362 make all362 make ${MAKE_JFLAG} all
363 cd -363 cd -
364}364}
365365

Subscribers

People subscribed via source and target branches