Remove no-longer-accepted configure arguments; add CFLAGS/LDFLAGS to link
test so that it works when CFLAGS is different from platform default (eg ppc64 vs ppc)
This commit is contained in:
parent
a7a5ccf313
commit
01fe2f40c5
@ -197,15 +197,12 @@ export CFLAGS CXXFLAGS
|
|||||||
--with-ssl=/usr \
|
--with-ssl=/usr \
|
||||||
--without-debug \
|
--without-debug \
|
||||||
--enable-shared \
|
--enable-shared \
|
||||||
--with-bench \
|
|
||||||
--with-embedded-server \
|
--with-embedded-server \
|
||||||
--localstatedir=/var/lib/mysql \
|
--localstatedir=/var/lib/mysql \
|
||||||
--with-unix-socket-path=/var/lib/mysql/mysql.sock \
|
--with-unix-socket-path=/var/lib/mysql/mysql.sock \
|
||||||
--with-mysqld-user="mysql" \
|
--with-mysqld-user="mysql" \
|
||||||
--with-extra-charsets=all \
|
--with-extra-charsets=all \
|
||||||
--with-big-tables \
|
--with-big-tables \
|
||||||
--with-innodb \
|
|
||||||
--with-ndbcluster \
|
|
||||||
--enable-local-infile \
|
--enable-local-infile \
|
||||||
--enable-largefile \
|
--enable-largefile \
|
||||||
--enable-thread-safe-client \
|
--enable-thread-safe-client \
|
||||||
@ -222,12 +219,13 @@ make %{?_smp_mflags}
|
|||||||
mkdir libmysqld/work
|
mkdir libmysqld/work
|
||||||
cd libmysqld/work
|
cd libmysqld/work
|
||||||
ar -x ../libmysqld.a
|
ar -x ../libmysqld.a
|
||||||
gcc -shared -Wl,-soname,libmysqld.so.0 -o libmysqld.so.0.0.1 *.o \
|
gcc $CFLAGS $LDFLAGS -shared -Wl,-soname,libmysqld.so.0 -o libmysqld.so.0.0.1 \
|
||||||
|
*.o \
|
||||||
-lpthread -lcrypt -lnsl -lssl -lcrypto -lz -lrt -lstdc++ -lm -lc
|
-lpthread -lcrypt -lnsl -lssl -lcrypto -lz -lrt -lstdc++ -lm -lc
|
||||||
# this is to check that we built a complete library
|
# this is to check that we built a complete library
|
||||||
cp %{SOURCE9} .
|
cp %{SOURCE9} .
|
||||||
ln -s libmysqld.so.0.0.1 libmysqld.so.0
|
ln -s libmysqld.so.0.0.1 libmysqld.so.0
|
||||||
gcc -I../../include mysql-embedded-check.c libmysqld.so.0
|
gcc -I../../include $CFLAGS mysql-embedded-check.c libmysqld.so.0
|
||||||
LD_LIBRARY_PATH=. ldd ./a.out
|
LD_LIBRARY_PATH=. ldd ./a.out
|
||||||
cd ../..
|
cd ../..
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user