88a60c7ebc4e3f7ddca6c0dcebd05db84f58fd19 max Mon Feb 27 17:55:11 2023 +0100 fixing py2 mysql build problem on fedora 37, refs #30684 diff --git src/product/installer/browserSetup.sh src/product/installer/browserSetup.sh index 5b23283..36ddcf5 100644 --- src/product/installer/browserSetup.sh +++ src/product/installer/browserSetup.sh @@ -804,31 +804,31 @@ # So we install python2, the mysql libraries and fix up my_config.h manually # This is strange, but I was unable to find a different working solution. MariaDB simply does not have my_config.h else yum install -y python2 mysql-devel python2-devel wget gcc if [ -f /usr/include/mysql/my_config.h ]; then echo my_config.h found else wget https://raw.githubusercontent.com/paulfitz/mysql-connector-c/master/include/my_config.h -P /usr/include/mysql/ fi # this is very strange, but was necessary on Fedora https://github.com/DefectDojo/django-DefectDojo/issues/407 # somehow the mysql.h does not have the "reconnect" field anymore in Fedora if grep -q "bool reconnect;" /usr/include/mysql/mysql.h ; then echo /usr/include/mysql/mysql.h already has reconnect attribute else - sed '/st_mysql_options options;/a bool reconnect; // added by UCSC Genome browserSetup.sh script' /usr/include/mysql/mysql.h -i.bkp + sed '/st_mysql_options options;/a my_bool reconnect; // added by UCSC Genome browserSetup.sh script' /usr/include/mysql/mysql.h -i.bkp fi # fedora > 34 doesn't have any pip2 package anymore so install it now if ! type "pip2" > /dev/null; then wget https://bootstrap.pypa.io/pip/2.7/get-pip.py python2 get-pip.py mv /usr/bin/pip /usr/bin/pip2 fi pip2 install MySQL-python fi } # OSX specific setup of the installation