cons: Enable shared linking of mysqlclient lib to root4stat

An alternative solution to the issue described in PR #343

Author: plexoos

asps/rexe/Conscript

@@ -79,9 +79,7 @@ if ($FC =~ /^pgf/) {
 }
 $LIBS .= " -lgeant321 -lgcalor"; 
 $LIBS  .= " " . $env->{CERNLIBS};
-$LIBS  .= $env->{LDALL};
 $LIBS  .= " " . $env->{Packages}->{MYSQL}->{LIBS};
-$LIBS  .= $env->{LDNONE};
 $LIBS  .= " " . $FLIBS . " " . $env->{CLIBS};#   " " . $env->{SYSLIBS} ;
 if ($STAR_SYS =~ /^sun4x_5.$/) {
     if ($LIBPATH) { $LIBPATH .= $main::PATH_SEPARATOR; }

docker/Dockerfile.root5

@@ -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 \

docker/Dockerfile.root6

@@ -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 \