percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2025-10-15 14:50:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #741 from EvgeniyPatlan/release-v3.5.6

Browse Source 
ENG-7 fix build
This commit is contained in:
EvgeniyPatlan
2023-12-19 12:04:23 +01:00
committed by GitHub
parent 7175742407 a3a2f16c54
commit 8d7b70cc9c
3 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/deb/rules
View File

@@ -5,7 +5,7 @@ build: build-stamp
build-stamp: build-stamp:
dh_testdir dh_testdir
perl Makefile.PL INSTALLDIRS=vendor perl Makefile.PL INSTALLDIRS=vendor
$(MAKE) VERSION=3.5.6 $(MAKE)
touch build-stamp touch build-stamp
clean: clean:

3
config/rpm/percona-toolkit.spec
View File

@@ -40,11 +40,12 @@ visit http://www.percona.com/software/.
%build %build
%{__perl} Makefile.PL INSTALLDIRS=vendor < /dev/null %{__perl} Makefile.PL INSTALLDIRS=vendor < /dev/null
#sed -i '499d' Makefile #sed -i '499d' Makefile
make %{?_smp_mflags} VERSION=3.5.6 make %{?_smp_mflags}
%install %install
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
for file in $(diff -rq bin/ $RPM_BUILD_ROOT/usr/bin | awk '{print $NF}'); do cp bin/$file $RPM_BUILD_ROOT/usr/bin; done
find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
find $RPM_BUILD_ROOT -type f -name 'percona-toolkit.pod' -exec rm -f {} ';' find $RPM_BUILD_ROOT -type f -name 'percona-toolkit.pod' -exec rm -f {} ';'

8
config/scripts/pt_builder.sh
View File

@@ -160,7 +160,7 @@ install_go() {
rm -rf /usr/local/go /usr/local/go1.8 /usr/local/go1.9 rm -rf /usr/local/go /usr/local/go1.8 /usr/local/go1.9
mv go1.9 /usr/local/ mv go1.9 /usr/local/
ln -s /usr/local/go1.9 /usr/local/go ln -s /usr/local/go1.9 /usr/local/go
GO_VERSION=1.21.1 GO_VERSION=1.21.5
wget --progress=dot:giga https://dl.google.com/go/go${GO_VERSION}.linux-amd64.tar.gz -O /tmp/golang.tar.gz wget --progress=dot:giga https://dl.google.com/go/go${GO_VERSION}.linux-amd64.tar.gz -O /tmp/golang.tar.gz
tar -C /usr/local -xzf /tmp/golang.tar.gz tar -C /usr/local -xzf /tmp/golang.tar.gz
update-alternatives --install "/usr/bin/go" "go" "/usr/local/go/bin/go" 0 update-alternatives --install "/usr/bin/go" "go" "/usr/local/go/bin/go" 0
@@ -370,12 +370,6 @@ build_rpm(){
rm -fr rpmbuild rm -fr rpmbuild
mkdir -vp rpmbuild/{SOURCES,SPECS,BUILD,SRPMS,RPMS} mkdir -vp rpmbuild/{SOURCES,SPECS,BUILD,SRPMS,RPMS}
cp $SRC_RPM rpmbuild/SRPMS/ cp $SRC_RPM rpmbuild/SRPMS/
cd rpmbuild/SPECS
echo '%undefine _missing_build_ids_terminate_build' | cat - percona-toolkit.spec > pt.spec && mv pt.spec percona-toolkit.spec
echo '%define debug_package %{nil}' | cat - percona-toolkit.spec > pt.spec && mv pt.spec percona-toolkit.spec
sed -i "s/@@ARHITECTURE@@/x86_64/" percona-toolkit.spec
#
cd $WORKDIR cd $WORKDIR
RHEL=$(rpm --eval %rhel) RHEL=$(rpm --eval %rhel)
ARCH=$(echo $(uname -m) | sed -e 's:i686:i386:g') ARCH=$(echo $(uname -m) | sed -e 's:i686:i386:g')