Skip to content
This repository was archived by the owner on Jun 1, 2023. It is now read-only.

Commit b79641d

Browse files
committed
Release fixup
Makefile.SH typo perlibs, broke Configure without libffi. Update do-make-cperl-release for deps, ...
1 parent f5ae2ca commit b79641d

File tree

2 files changed

+15
-3
lines changed

2 files changed

+15
-3
lines changed

Makefile.SH

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ shrpldflags='$(LDDLFLAGS)'
4444
ldlibpth=''
4545
DPERL_EXTERNAL_GLOB='-DPERL_EXTERNAL_GLOB'
4646
DPERL_IS_MINIPERL='-DPERL_IS_MINIPERL'
47-
miniperllibs="$perlibs $cryptlib"
47+
miniperllibs="$perllibs $cryptlib"
4848
if [ $useffi = 'define' ]; then
4949
miniperllibs="`echo $perllibs|sed 's, -lffi,,'` $cryptlib"
5050
fi

Porting/do-make-cperl-release

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,13 @@ Linux)
4646
else
4747
db4=libdb4
4848
fi
49+
case $ver in
50+
5.29|5.3*) d_ffi="-d libffi" ;;
51+
*) d_ffi= ;;
52+
esac
4953
fpm -s dir -t rpm -n cperl -v $ver --iteration $rev --epoch '' -a $arch \
5054
-m 'rurban@cpan.org' \
51-
-d 'zlib' -d bzip2-libs -d 'gdbm' -d 'libffi' -d $db4 \
55+
-d 'zlib' -d bzip2-libs -d 'gdbm' -d $db4 $d_ffi \
5256
--url http://perl11.org/cperl/rpm/ \
5357
--description 'a perl5 with classes, types, compiler support, company-friendly.' \
5458
-C $destdir .
@@ -61,10 +65,18 @@ Linux)
6165
ext=deb
6266
pkg=cperl_${ver}-${rev}_${arch}.$ext
6367
test -f $pkg && mv $pkg $pkg~
68+
case $ver in
69+
5.29|5.3*)
70+
d_ffi="-d libffi6" # sid
71+
if [ -n "`grep 'Debian GNU/Linux 7' /etc/issue 2>/dev/null`" ]; then
72+
d_ffi="-d libffi5" # wheezy
73+
fi ;;
74+
*) d_ffi= ;;
75+
esac
6476
fpm -s dir -t deb -n cperl -v $ver-$rev -a $arch \
6577
-m 'rurban@cpan.org' \
6678
-d 'zlib1g >= 1:1.2.2.3' -d libbz2-1.0 -d 'libgdbm3 >= 1.8.3' \
67-
-d 'libdb5.1' -d 'libffi6' \
79+
-d 'libdb5.1' $d_ffi \
6880
--url http://perl11.org/deb/ \
6981
--deb-changelog cperl/pod/perlcdelta.pod \
7082
--description 'a perl5 with classes, types, compiler support, company-friendly.' \

0 commit comments

Comments
 (0)