more versions

This commit is contained in:
Robin Appelman 2022-01-25 14:59:34 +01:00
commit e5b8c7a154
4 changed files with 47 additions and 6 deletions

View file

@ -20,8 +20,14 @@ jobs:
- 4.9.18
- 4.8.12
- 4.7.12
- 4.6.16
- 4.5.16
- 4.4.16
- 4.3.13
- 4.2.14
steps:
- uses: actions/checkout@v2
- name: Install build dependencies
run: |
sudo sed -Ei '/.*partner/! s/^# (deb-src .*)/\1/g' /etc/apt/sources.list
@ -30,12 +36,17 @@ jobs:
sudo apt install python2.7-dev
- name: Download sources
run: |
wget "https://download.samba.org/pub/samba/stable/samba-${{ matrix.pkgver }}.tar.gz"
wget -q "https://download.samba.org/pub/samba/stable/samba-${{ matrix.pkgver }}.tar.gz"
tar xf samba-${{ matrix.pkgver }}.tar.gz
- name: Switch to python 2.7
if: matrix.pkgver == '4.9.18' || matrix.pkgver == '4.8.12' || matrix.pkgver == '4.7.12'
- name: Switch to python 2.7 for <=4.9
if: matrix.pkgver == '4.9.18' || matrix.pkgver == '4.8.12' || matrix.pkgver == '4.7.12' || matrix.pkgver == '4.6.16' || matrix.pkgver == '4.5.16' || matrix.pkgver == '4.4.16' || matrix.pkgver == '4.3.13' || matrix.pkgver == '4.2.14'
run: |
sudo update-alternatives --install /usr/bin/python python /usr/bin/python2.7 1
- name: Patch for <=4.3
if: matrix.pkgver == '4.3.13' || matrix.pkgver == '4.2.14'
run: |
cd samba-${{ matrix.pkgver }}
patch -p1 < ../perl_inc.patch
- name: Configure
run: |
cd samba-${{ matrix.pkgver }}

View file

@ -22,8 +22,14 @@ jobs:
- 4.9.18
- 4.8.12
- 4.7.12
- 4.6.16
- 4.5.16
- 4.4.16
- 4.3.13
- 4.2.14
steps:
- uses: actions/checkout@v2
- name: Install build dependencies
run: |
sudo sed -Ei '/.*partner/! s/^# (deb-src .*)/\1/g' /etc/apt/sources.list
@ -32,12 +38,17 @@ jobs:
sudo apt install python2.7-dev
- name: Download sources
run: |
wget "https://download.samba.org/pub/samba/stable/samba-${{ matrix.pkgver }}.tar.gz"
wget -q "https://download.samba.org/pub/samba/stable/samba-${{ matrix.pkgver }}.tar.gz"
tar xf samba-${{ matrix.pkgver }}.tar.gz
- name: Switch to python 2.7
if: matrix.pkgver == '4.9.18' || matrix.pkgver == '4.8.12' || matrix.pkgver == '4.7.12'
- name: Switch to python 2.7 for <=4.9
if: matrix.pkgver == '4.9.18' || matrix.pkgver == '4.8.12' || matrix.pkgver == '4.7.12' || matrix.pkgver == '4.6.16' || matrix.pkgver == '4.5.16' || matrix.pkgver == '4.4.16' || matrix.pkgver == '4.3.13' || matrix.pkgver == '4.2.14'
run: |
sudo update-alternatives --install /usr/bin/python python /usr/bin/python2.7 1
- name: Patch for <=4.3
if: matrix.pkgver == '4.3.13' || matrix.pkgver == '4.2.14'
run: |
cd samba-${{ matrix.pkgver }}
patch -p1 < ../perl_inc.patch
- name: Configure
run: |
cd samba-${{ matrix.pkgver }}

View file

@ -30,3 +30,8 @@ The following versions of `smbclient` are currently build
- 4.9.18
- 4.8.12
- 4.7.12
- 4.6.16
- 4.5.16
- 4.4.16
- 4.3.13
- 4.2.14

14
perl_inc.patch Normal file
View file

@ -0,0 +1,14 @@
diff --git a/buildtools/wafsamba/samba_perl.py b/buildtools/wafsamba/samba_perl.py
index f2f176d..2e9a53a 100644
--- a/buildtools/wafsamba/samba_perl.py
+++ b/buildtools/wafsamba/samba_perl.py
@@ -49,7 +49,8 @@ def SAMBA_CHECK_PERL(conf, mandatory=True, version=(5,0,0)):
conf.env.PERL_LIB_INSTALL_DIR = perl_lib_install_dir
perl_inc = read_perl_config_var('print "@INC"')
- perl_inc.remove('.')
+ if '.' in perl_inc:
+ perl_inc.remove('.')
conf.start_msg("PERL_INC: ")
conf.end_msg("%s" % (perl_inc), 'GREEN')
conf.env.PERL_INC = perl_inc