database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-09-02 09:41:40 +03:00
Code Activity

Fix environment setup.

Browse Source 
Don't create empty ChangeLog.
This commit is contained in:
Jonathan Perkin
2010-03-29 17:01:15 +02:00
parent 71785753b6
commit af315a60fa
1 changed files with 12 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
support-files/mysql.spec.sh
View File

@@ -337,23 +337,18 @@ client/server version.
# Be strict about variables, bail at earliest opportunity, etc. # Be strict about variables, bail at earliest opportunity, etc.
set -eu set -eu
# Use specific MYSQL_BUILD_* setup if requested #
${MYSQL_BUILD_PATH:+PATH="${MYSQL_BUILD_PATH}"} # Set environment in order of preference, MYSQL_BUILD_* first, then
${MYSQL_BUILD_CC:+CC="${MYSQL_BUILD_CC}"} # variable name, finally a default. RPM_OPT_FLAGS is assumed to be
${MYSQL_BUILD_CC:+CC="${MYSQL_BUILD_CC}"} # a part of the default rpm build environment.
${MYSQL_BUILD_CXX:+CXX="${MYSQL_BUILD_CXX}"} #
${MYSQL_BUILD_CFLAGS:+CFLAGS="${MYSQL_BUILD_CFLAGS}"} PATH=${MYSQL_BUILD_PATH:-$PATH}
${MYSQL_BUILD_CXXFLAGS:+CXXFLAGS="${MYSQL_BUILD_CXXFLAGS}"} CC=${MYSQL_BUILD_CC:-${CC:-gcc}}
${MYSQL_BUILD_LDFLAGS:+LDFLAGS="${MYSQL_BUILD_LDFLAGS}"} CXX=${MYSQL_BUILD_CXX:-${CXX:-g++}}
${MYSQL_BUILD_CMAKE:+CMAKE="${MYSQL_BUILD_CMAKE}"} CFLAGS=${MYSQL_BUILD_CFLAGS:-${CFLAGS:-$RPM_OPT_FLAGS}}
CXXFLAGS=${MYSQL_BUILD_CXXFLAGS:-${CXXFLAGS:-$RPM_OPT_FLAGS -felide-constructors -fno-exceptions -fno-rtti}}
# Set defaults. $RPM_OPT_FLAGS should be part of RPM environment LDFLAGS=${MYSQL_BUILD_LDFLAGS:-${LDFLAGS:-}}
: ${CC:="gcc"} CMAKE=${MYSQL_BUILD_CMAKE:-${CMAKE:-cmake}}
: ${CXX:="g++"}
: ${CFLAGS:="${RPM_OPT_FLAGS}"}
: ${CXXFLAGS:="${RPM_OPT_FLAGS} -felide-constructors -fno-exceptions -fno-rtti"}
: ${LDFLAGS:=""}
: ${CMAKE:="cmake"}
# Build debug mysqld and libmysqld.a # Build debug mysqld and libmysqld.a
mkdir debug mkdir debug
@@ -464,9 +459,6 @@ touch $RBR%{_sysconfdir}/my.cnf
install -m 644 "%{malloc_lib_source}" "$RBR%{_libdir}/mysql/%{malloc_lib_target}" install -m 644 "%{malloc_lib_source}" "$RBR%{_libdir}/mysql/%{malloc_lib_target}"
%endif %endif
# ChangeLog file is optional, create an empty one if it doesn't exist
[ -f $MBD/%{src_dir}/Docs/ChangeLog ] || >$MBD/%{src_dir}/Docs/ChangeLog
############################################################################## ##############################################################################
# Post processing actions, i.e. when installed # Post processing actions, i.e. when installed
############################################################################## ##############################################################################