Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
af315a60
Commit
af315a60
authored
Mar 29, 2010
by
Jonathan Perkin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix environment setup.
Don't create empty ChangeLog.
parent
71785753
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
20 deletions
+12
-20
support-files/mysql.spec.sh
support-files/mysql.spec.sh
+12
-20
No files found.
support-files/mysql.spec.sh
View file @
af315a60
...
...
@@ -337,23 +337,18 @@ client/server version.
# Be strict about variables, bail at earliest opportunity, etc.
set
-eu
# Use specific MYSQL_BUILD_* setup if requested
${
MYSQL_BUILD_PATH
:+PATH
=
"
${
MYSQL_BUILD_PATH
}
"
}
${
MYSQL_BUILD_CC
:+CC
=
"
${
MYSQL_BUILD_CC
}
"
}
${
MYSQL_BUILD_CC
:+CC
=
"
${
MYSQL_BUILD_CC
}
"
}
${
MYSQL_BUILD_CXX
:+CXX
=
"
${
MYSQL_BUILD_CXX
}
"
}
${
MYSQL_BUILD_CFLAGS
:+CFLAGS
=
"
${
MYSQL_BUILD_CFLAGS
}
"
}
${
MYSQL_BUILD_CXXFLAGS
:+CXXFLAGS
=
"
${
MYSQL_BUILD_CXXFLAGS
}
"
}
${
MYSQL_BUILD_LDFLAGS
:+LDFLAGS
=
"
${
MYSQL_BUILD_LDFLAGS
}
"
}
${
MYSQL_BUILD_CMAKE
:+CMAKE
=
"
${
MYSQL_BUILD_CMAKE
}
"
}
# Set defaults. $RPM_OPT_FLAGS should be part of RPM environment
:
${
CC
:
=
"gcc"
}
:
${
CXX
:
=
"g++"
}
:
${
CFLAGS
:
=
"
${
RPM_OPT_FLAGS
}
"
}
:
${
CXXFLAGS
:
=
"
${
RPM_OPT_FLAGS
}
-felide-constructors -fno-exceptions -fno-rtti"
}
:
${
LDFLAGS
:
=
""
}
:
${
CMAKE
:
=
"cmake"
}
#
# Set environment in order of preference, MYSQL_BUILD_* first, then
# variable name, finally a default. RPM_OPT_FLAGS is assumed to be
# a part of the default rpm build environment.
#
PATH
=
${
MYSQL_BUILD_PATH
:-
$PATH
}
CC
=
${
MYSQL_BUILD_CC
:-${
CC
:-
gcc
}}
CXX
=
${
MYSQL_BUILD_CXX
:-${
CXX
:-
g
++
}}
CFLAGS
=
${
MYSQL_BUILD_CFLAGS
:-${
CFLAGS
:-
$RPM_OPT_FLAGS
}}
CXXFLAGS
=
${
MYSQL_BUILD_CXXFLAGS
:-${
CXXFLAGS
:-
$RPM_OPT_FLAGS
-felide-constructors -fno-exceptions -fno-rtti
}}
LDFLAGS
=
${
MYSQL_BUILD_LDFLAGS
:-${
LDFLAGS
:-}}
CMAKE
=
${
MYSQL_BUILD_CMAKE
:-${
CMAKE
:-
cmake
}}
# Build debug mysqld and libmysqld.a
mkdir
debug
...
...
@@ -464,9 +459,6 @@ touch $RBR%{_sysconfdir}/my.cnf
install
-m
644
"%{malloc_lib_source}"
"
$RBR
%{_libdir}/mysql/%{malloc_lib_target}"
%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
##############################################################################
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment