Skip to content

Fix static linking of mysql library to root4star #343

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
plexoos wants to merge 4 commits into from
Closed

Fix static linking of mysql library to root4star #343

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e277a55
Fix static linking of mysql library to root4star
plexoos May 4, 2022
36c16f0
Link mysqlclient to root4star dynamically when requested
plexoos May 5, 2022
72634b1
Revert "Link mysqlclient to root4star dynamically when requested"
plexoos May 5, 2022
4077c47
Add dummy definition needed by static mysqlclient lib
plexoos May 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion asps/rexe/Conscript
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ if ($FC =~ /^pgf/) {
$LIBS .= " -lgeant321 -lgcalor";
$LIBS .= " " . $env->{CERNLIBS};
$LIBS .= $env->{LDALL};
$LIBS .= " " . $env->{Packages}->{MYSQL}->{LIBS};
$LIBS .= " " . $env->{Packages}->{MYSQL}->{LIB};
$LIBS .= $env->{LDNONE};
$LIBS .= " " . $FLIBS . " " . $env->{CLIBS};# " " . $env->{SYSLIBS} ;
if ($STAR_SYS =~ /^sun4x_5.$/) {
Expand Down
6 changes: 6 additions & 0 deletions asps/rexe/MAIN_rmain.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,12 @@ extern "C" {
strncpy(args,Margv[*k],i); memset (args+i,' ',n-i); return 0;
}
}

// A dummy global definition to satisfy the linker when linking mysqlclient library statically with --whole-archive
// /opt/software/linux-scientific7-x86_64/gcc-4.8.5/mysql-5.7.27-pfyt3fwtkubcc5eazmoqfick3lgp67mf/lib/libmysqlclient.a(posix_timers.c.o): In function `my_timer_initialize':
// (.text+0x140): undefined reference to `key_thread_timer_notifier'
unsigned int key_thread_timer_notifier = 0;
Copy link
Copy Markdown
Member

@veprbl veprbl May 5, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would be nice to find this symbol. Maybe try:

find /opt -name "*.a" -exec nm {} \; | grep key_thread_timer_notifier

Copy link
Copy Markdown
Member Author

@plexoos plexoos May 5, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think I saw it defined in libmysqld.a

Copy link
Copy Markdown
Member

@veprbl veprbl May 6, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But you only see this issue after we strip the -lpthread -lz -lm -lssl -lcrypto -ldl?

Copy link
Copy Markdown
Member

@veprbl veprbl May 6, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

... or when we strip -L$pkglibdir?


//______________________________________________________________________________
int main(int argcp, char **argv)
{
Expand Down
18 changes: 0 additions & 18 deletions docker/Dockerfile.root5
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,24 +102,6 @@ FROM base-stage AS build-stage

COPY . /star-sw

# XXX TEMP XXX: Don't force mysql static libraries to be linked into root4star
RUN cd /star-sw \
&& cat > root4star_cons.patch <<<$'\
diff --git a/asps/rexe/Conscript b/asps/rexe/Conscript \n\
--- a/asps/rexe/Conscript \n\
+++ b/asps/rexe/Conscript \n\
@@ -79,9 +79,7 @@ \n\
} \n\
$LIBS .= " -lgeant321 -lgcalor"; \n\
$LIBS .= " " . $env->{CERNLIBS};\n\
-$LIBS .= $env->{LDALL};\n\
$LIBS .= " " . $env->{Packages}->{MYSQL}->{LIBS};\n\
-$LIBS .= $env->{LDNONE};\n\
$LIBS .= " " . $FLIBS . " " . $env->{CLIBS};# " " . $env->{SYSLIBS} ;\n\
if ($STAR_SYS =~ /^sun4x_5.$/) {\n\
if ($LIBPATH) { $LIBPATH .= $main::PATH_SEPARATOR; }\n' \
&& patch -p1 < root4star_cons.patch

RUN source /etc/profile \
&& cd /star-sw \
&& cons \
Expand Down
18 changes: 0 additions & 18 deletions docker/Dockerfile.root6
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,24 +104,6 @@ FROM base-stage AS build-stage

COPY . /star-sw

# XXX TEMP XXX: Don't force mysql static libraries to be linked into root4star
RUN cd /star-sw \
&& cat > root4star_cons.patch <<<$'\
diff --git a/asps/rexe/Conscript b/asps/rexe/Conscript \n\
--- a/asps/rexe/Conscript \n\
+++ b/asps/rexe/Conscript \n\
@@ -79,9 +79,7 @@ \n\
} \n\
$LIBS .= " -lgeant321 -lgcalor"; \n\
$LIBS .= " " . $env->{CERNLIBS};\n\
-$LIBS .= $env->{LDALL};\n\
$LIBS .= " " . $env->{Packages}->{MYSQL}->{LIBS};\n\
-$LIBS .= $env->{LDNONE};\n\
$LIBS .= " " . $FLIBS . " " . $env->{CLIBS};# " " . $env->{SYSLIBS} ;\n\
if ($STAR_SYS =~ /^sun4x_5.$/) {\n\
if ($LIBPATH) { $LIBPATH .= $main::PATH_SEPARATOR; }\n' \
&& patch -p1 < root4star_cons.patch

RUN source /etc/profile \
# Override default Vc version
&& export Vc_DIR=/opt/software/linux-scientific7-x86_64/gcc-4.8.5/vc_-0.7.4-gqbhzu2x5u2dbe5tafxnl36xj5qbwov4 \
Expand Down
3 changes: 2 additions & 1 deletion mgr/ConsDefs.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1259,7 +1259,8 @@
'MYSQL' => {
'LIBDIR'=> $MYSQLLIBDIR,
'INCDIR'=> $MYSQLINCDIR,
'LIBS' => $MYSQLLIB
'LIBS' => $MYSQLLIB,
'LIB' => "-lmysqlclient"
},
'QT' => {
'QT_VERSION' => $QT_VERSION,
Expand Down
⚡