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
a066832c
Commit
a066832c
authored
23 years ago
by
tim@threads.polyesthetic.msg
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
SCO portability fixes and cleanup.
parent
faeb9896
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
19 additions
and
13 deletions
+19
-13
configure.in
configure.in
+16
-11
ltconfig
ltconfig
+2
-2
ltmain.sh
ltmain.sh
+1
-0
No files found.
configure.in
View file @
a066832c
...
...
@@ -253,7 +253,7 @@ case "$target_os" in
;;
esac
;;
sysv5uw7
*
)
LIBS
=
"-lsocket -lnsl
$LIBS
"
sysv5uw7
*
)
if
test
"
$GCC
"
!=
"yes"
;
then
# We are using built-in inline function
CFLAGS
=
"
$CFLAGS
-Kalloca"
...
...
@@ -631,8 +631,6 @@ then
fi
# We make a special variable for client library's to avoid including
# thread libs in the client.
LIBS_AFTER_SOCKET
=
$LIBS
LIBS
=
"
$LIBS_BEFORE_SOCKET
$LIBS_SOCKET
$LIBS_AFTER_SOCKET
"
NON_THREADED_CLIENT_LIBS
=
"
$LIBS
"
AC_MSG_CHECKING
([
for
int8]
)
...
...
@@ -824,6 +822,13 @@ Reference Manual.])
fi
fi
fi
dnl This is needed because
-lsocket
has to come after the thread
dnl library on SCO.
AC_DEFUN
([
MYSQL_REMOVE_SOCKET_FROM_LIBS_HACK],
[
LIBS
=
`
echo
"
$LIBS
"
|
sed
-e
's/ -lsocket / /g'
`
])
# Hack for SCO UNIX
if
test
"
$with_named_thread
"
=
"no"
then
...
...
@@ -832,7 +837,7 @@ then
then
if
test
-f
/usr/lib/libgthreads.a
-o
-f
/usr/lib/libgthreads.so
then
LIBS
=
"
$LIBS_BEFORE_SOCKET
$LIBS_AFTER_SOCKET
"
MYSQL_REMOVE_SOCKET_FROM_LIBS_HACK
with_named_thread
=
"-lgthreads -lsocket -lgthreads"
# sched.h conflicts with fsu-threads
touch
./include/sched.h
...
...
@@ -847,7 +852,7 @@ then
AC_MSG_RESULT
(
"yes"
)
elif
test
-f
/usr/local/lib/libpthread.a
-o
-f
/usr/local/lib/libpthread.so
then
LIBS
=
"
$LIBS_BEFORE_SOCKET
$LIBS_AFTER_SOCKET
"
MYSQL_REMOVE_SOCKET_FROM_LIBS_HACK
with_named_thread
=
"-lpthread -lsocket"
# sched.h conflicts with fsu-threads
# touch ./include/sched.h
...
...
@@ -871,12 +876,12 @@ then
then
if
test
-f
/usr/lib/libthread.so
-o
-f
/usr/lib/libthreadT.so
then
LIBS
=
"
$LIBS_BEFORE_SOCKET
$LIBS_AFTER_SOCKET
"
MYSQL_REMOVE_SOCKET_FROM_LIBS_HACK
if
expr
"
$CC
"
:
".*gcc.*"
then
with_named_thread
=
"-pthread -l
socket -l
nsl"
with_named_thread
=
"-pthread -lnsl"
else
with_named_thread
=
"-Kthread -l
socket -l
nsl"
with_named_thread
=
"-Kthread -lnsl"
fi
if
expr
"
$SYSTEM_TYPE
"
:
".*unixware7.0.0"
>
/dev/null
then
...
...
@@ -917,8 +922,8 @@ then
then
if
test
-f
/usr/lib/libthread.so
-o
-f
/usr/lib/libthreadT.so
then
LIBS
=
"
$LIBS_BEFORE_SOCKET
$LIBS_AFTER_SOCKET
"
with_named_thread
=
"-Kthread -l
socket -l
nsl"
MYSQL_REMOVE_SOCKET_FROM_LIBS_HACK
with_named_thread
=
"-Kthread -lnsl"
if
expr
"
$SYSTEM_TYPE
"
:
".*unixware7.0.0"
>
/dev/null
then
AC_DEFINE
(
HAVE_UNIXWARE7_THREADS
)
...
...
@@ -949,7 +954,7 @@ then
AC_MSG_CHECKING
(
"Siemens threads"
)
if
test
-f
/usr/lib/libxnet.so
-a
"
$SYSTEM_TYPE
"
=
"sni-sysv4"
then
LIBS
=
"
$LIBS_BEFORE_SOCKET
-lxnet
$LIBS_AFTER_SOCKET
"
LIBS
=
"
-lxnet
$LIBS
"
NON_THREADED_CLIENT_LIBS
=
"
$NON_THREADED_CLIENT_LIBS
-lxnet"
with_named_thread
=
"-Kthread
$LDFLAGS
-lxnet"
LD_FLAGS
=
""
...
...
This diff is collapsed.
Click to expand it.
ltconfig
View file @
a066832c
...
...
@@ -1500,7 +1500,7 @@ else
no_undefined_flag
=
' -z text'
# $CC -shared without GNU ld will not create a library from C++
# object files and a static libstdc++, better avoid it by now
archive_cmds
=
'$
LD
-G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linkopts'
archive_cmds
=
'$
UW7_compile_command
-G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linkopts'
archive_expsym_cmds
=
'$echo "{ global:" > $lib.exp~cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linkopts~$rm $lib.exp'
hardcode_libdir_flag_spec
=
...
...
@@ -1540,7 +1540,7 @@ else
;;
unixware7
*
)
archive_cmds
=
'$
LD
-G -h $soname -o $lib $libobjs $deplibs $linkopts'
archive_cmds
=
'$
UW7_compile_command
-G -h $soname -o $lib $libobjs $deplibs $linkopts'
runpath_var
=
'LD_RUN_PATH'
hardcode_shlibpath_var
=
no
;;
...
...
This diff is collapsed.
Click to expand it.
ltmain.sh
View file @
a066832c
...
...
@@ -809,6 +809,7 @@ compiler."
;;
esac
compile_command
=
"
$nonopt
"
UW7_compile_command
=
"
$nonopt
"
finalize_command
=
"
$nonopt
"
compile_rpath
=
...
...
This diff is collapsed.
Click to expand it.
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