Commit 60385fdd authored by Andrey V.Kosteltsev's avatar Andrey V.Kosteltsev

Perl-5.30.2; Python: 2.7.18, 3.8.2; pkgtools-0.1.5; sqlite-3.31.1.0

parent 93b237aa
../../../sources/packages/perl/patches/perl-5.30.0-multilib.patch -p0
......@@ -8,7 +8,7 @@ SOURCE_REQUIRES = build-system/3pp/sources/packages/perl
# ======= __END_OF_REQUIRES__ =======
version = 5.30.0
version = 5.30.2
tar_xz_archive = $(BUILDSYSTEM)/3pp/sources/packages/perl/perl-$(version).tar.xz
SRC_ARCHIVE = $(tar_xz_archive)
SRC_DIR = $(TARGET_BUILD_DIR)/perl-$(version)
......
../../../sources/packages/perl/patches/perl-5.30.2-multilib.patch -p0
../../../sources/packages/perl/patches/perl-5.30.2-CPAN.patch -p0
......@@ -10,12 +10,12 @@ REQUIRES = build-system/3pp/app/dialog/1.3-20190808
# ======= __END_OF_REQUIRES__ =======
tar_xz_archive = $(BUILDSYSTEM)/3pp/sources/packages/pkgtools/pkgtools-0.1.3.tar.xz
src_dir = pkgtools-0.1.3
tar_xz_archive = $(BUILDSYSTEM)/3pp/sources/packages/pkgtools/pkgtools-0.1.5.tar.xz
src_dir = pkgtools-0.1.5
build_dir = $(TARGET_BUILD_DIR)/built
src_done = $(TARGET_BUILD_DIR)/.source-done
SRC_DIR = $(TARGET_BUILD_DIR)/pkgtools-0.1.3
SRC_DIR = $(TARGET_BUILD_DIR)/pkgtools-0.1.5
SRC_ARCHIVE = $(tar_xz_archive)
PATCHES = PATCHES
......
......@@ -5,7 +5,7 @@ include ../../../../../build-system/constants.mk
SOURCE_REQUIRES = build-system/3pp/sources/packages/pseudo
REQUIRES = build-system/3pp/app/sqlite/3.26.0.0
REQUIRES = build-system/3pp/app/sqlite/3.31.1.0
# ======= __END_OF_REQUIRES__ =======
......
......@@ -5,11 +5,11 @@ include ../../../../../../build-system/constants.mk
SOURCE_REQUIRES = build-system/3pp/sources/packages/python2-modules/pip
REQUIRES = build-system/3pp/app/python2-modules/setuptools/41.6.0
REQUIRES = build-system/3pp/app/python2-modules/setuptools/46.1.3
# ======= __END_OF_REQUIRES__ =======
version = 19.3.1
version = 20.1
tar_gz_archive = $(BUILDSYSTEM)/3pp/sources/packages/python2-modules/pip/pip-$(version).tar.gz
SRC_ARCHIVE = $(tar_gz_archive)
SRC_DIR = $(TARGET_BUILD_DIR)/pip-$(version)
......
......@@ -5,11 +5,11 @@ include ../../../../../../build-system/constants.mk
SOURCE_REQUIRES = build-system/3pp/sources/packages/python2-modules/setuptools
REQUIRES = build-system/3pp/app/python2/2.7.16
REQUIRES = build-system/3pp/app/python2/2.7.18
# ======= __END_OF_REQUIRES__ =======
version = 41.6.0
version = 46.1.3
tar_gz_archive = $(BUILDSYSTEM)/3pp/sources/packages/python2-modules/setuptools/setuptools-$(version).tar.gz
SRC_ARCHIVE = $(tar_gz_archive)
SRC_DIR = $(TARGET_BUILD_DIR)/setuptools-$(version)
......
......@@ -8,7 +8,7 @@ SOURCE_REQUIRES = build-system/3pp/sources/packages/python2
# ======= __END_OF_REQUIRES__ =======
version = 2.7.16
version = 2.7.18
tar_xz_archive = $(BUILDSYSTEM)/3pp/sources/packages/python2/Python-$(version).tar.xz
SRC_ARCHIVE = $(tar_xz_archive)
SRC_DIR = $(TARGET_BUILD_DIR)/Python-$(version)
......
......@@ -5,11 +5,11 @@ include ../../../../../build-system/constants.mk
SOURCE_REQUIRES = build-system/3pp/sources/packages/python3
REQUIRES = build-system/3pp/app/python2-modules/pip/19.3.1
REQUIRES = build-system/3pp/app/python2-modules/pip/20.1
# ======= __END_OF_REQUIRES__ =======
version = 3.7.4
version = 3.8.2
tar_xz_archive = $(BUILDSYSTEM)/3pp/sources/packages/python3/Python-$(version).tar.xz
SRC_ARCHIVE = $(tar_xz_archive)
SRC_DIR = $(TARGET_BUILD_DIR)/Python-$(version)
......@@ -34,7 +34,7 @@ extra_configure_switches += --enable-ipv6
extra_configure_switches += --enable-shared
python_environment = RFS=$(BUILDSYSTEM)
python_environment += PYTHONHOME=$(BUILDSYSTEM)/usr/lib/python3.7
python_environment += PYTHONHOME=$(BUILDSYSTEM)/usr/lib/python3.8
python_environment += LDFLAGS='$(LDFLAGS)'
......@@ -59,17 +59,17 @@ $(build_target): $(src_done)
@touch $@
$(install_target): $(build_target)
@echo -e "\n======= Installing Python 3.7 binary =======\n"
@echo -e "\n======= Installing Python 3.8 binary =======\n"
@cd $(SRC_DIR) && $(MAKE) -j1 $(python_environment) install
@cp -a $(SRC_DIR)/Parser/pgen $(BUILDSYSTEM)/usr/bin/pgen3.7
@( cd $(BUILDSYSTEM)/usr/bin ; ln -sf pgen3.7 pgen3 )
@echo -e "\n======= tune python3.7m-config CFLAGS for target machine =======\n"
@cp -a $(SRC_DIR)/Parser/pgen $(BUILDSYSTEM)/usr/bin/pgen3.8
@( cd $(BUILDSYSTEM)/usr/bin ; ln -sf pgen3.8 pgen3 )
@echo -e "\n======= tune python3.8-config CFLAGS for target machine =======\n"
@( cd $(BUILDSYSTEM)/usr/bin ; \
sed -i 's,includedir=$$(echo "$${prefix},includedir=$$(echo "/usr,g' python3.7m-config ; \
sed -i 's,LIBPL=$$(echo "$${prefix},LIBPL=$$(echo "/usr,g' python3.7m-config ; \
sed -i "s,$(BUILDSYSTEM),,g" python3.7m-config ; \
sed -i 's,includedir=$$(echo "$${prefix},includedir=$$(echo "/usr,g' python3.8-config ; \
sed -i 's,LIBPL=$$(echo "$${prefix},LIBPL=$$(echo "/usr,g' python3.8-config ; \
sed -i "s,$(BUILDSYSTEM),,g" python3.8-config ; \
)
@( cd $(BUILDSYSTEM)/usr/include/python3.7m ; \
@( cd $(BUILDSYSTEM)/usr/include/python3.8 ; \
mv pyconfig.h pyconfig-64.h ; \
echo '' > pyconfig.h ; \
echo '/******************************' >> pyconfig.h ; \
......@@ -104,9 +104,9 @@ $(install_target): $(build_target)
)
@echo -e "\n======= Install Python3 PLY, M2Crypto packages =======\n"
@( cd $(BUILDSYSTEM)/usr/bin ; \
./pip3.7 install --upgrade pip ; \
./pip3.7 install ply ; \
./pip3.7 install M2Crypto ; \
./pip3.8 install --upgrade pip ; \
./pip3.8 install ply ; \
./pip3.8 install M2Crypto ; \
rm -f pip ; ln -sf pip2 pip ; \
)
@echo -e "\n======= Setup PYTHON3 build-system variable =======\n"
......
......@@ -8,7 +8,7 @@ SOURCE_REQUIRES = build-system/3pp/sources/packages/sqlite
# ======= __END_OF_REQUIRES__ =======
version = 3.26.0.0
version = 3.31.1.0
tar_gz_archive = $(BUILDSYSTEM)/3pp/sources/packages/sqlite/sqlite-$(version).tar.gz
src_dir = sqlite-$(version)
build_dir = $(TARGET_BUILD_DIR)/built
......
......@@ -8,14 +8,15 @@ include ../../../../../build-system/constants.mk
url = $(DOWNLOAD_SERVER)/sources/packages/d/perl
versions = 5.30.0
versions = 5.30.2
pkgname = perl
suffix = tar.xz
tarballs = $(addsuffix .$(suffix), $(addprefix $(pkgname)-, $(versions)))
sha1s = $(addsuffix .sha1sum, $(tarballs))
patches = $(CURDIR)/patches/perl-5.30.0-multilib.patch
patches = $(CURDIR)/patches/perl-5.30.2-multilib.patch
patches += $(CURDIR)/patches/perl-5.30.2-CPAN.patch
.NOTPARALLEL: $(patches)
......@@ -50,7 +51,8 @@ $(sha1s): $(tarballs)
$(patches): $(sha1s)
@echo -e "\n======= Create Patches =======\n" ; \
( cd create-5.30.0-multilib-patch ; ./create.patch.sh ) ; \
( cd create-5.30.2-multilib-patch ; ./create.patch.sh ) ; \
( cd create-5.30.2-CPAN-patch ; ./create.patch.sh ) ; \
echo -e "\n"
download_clean:
......
#!/bin/sh
VERSION=5.30.2
tar --files-from=file.list -xJvf ../perl-$VERSION.tar.xz
mv perl-$VERSION perl-$VERSION-orig
cp -rf ./perl-$VERSION-new ./perl-$VERSION
diff -b --unified -Nr perl-$VERSION-orig perl-$VERSION > perl-$VERSION-CPAN.patch
mv perl-$VERSION-CPAN.patch ../patches
rm -rf ./perl-$VERSION
rm -rf ./perl-$VERSION-orig
#!/bin/sh
VERSION=5.30.0
VERSION=5.30.2
tar --files-from=file.list -xJvf ../perl-$VERSION.tar.xz
mv perl-$VERSION perl-$VERSION-orig
......
......@@ -1534,8 +1534,8 @@ case "$sh" in
$me: Fatal Error: I can't find a Bourne Shell anywhere.
Usually it's in /bin/sh. How did you even get this far?
Please contact me (Perl Maintainers) at perlbug@perl.org and
we'll try to straighten this all out.
Please contact me (Perl Maintainers) at https://github.com/Perl/perl5/issues
and we'll try to straighten this all out.
EOM
exit 1
;;
......@@ -2118,7 +2118,7 @@ THIS PACKAGE SEEMS TO BE INCOMPLETE.
You have the option of continuing the configuration process, despite the
distinct possibility that your kit is damaged, by typing 'y'es. If you
do, don't blame me if something goes wrong. I advise you to type 'n'o
and contact the author (perlbug@perl.org).
and contact the author (https://github.com/Perl/perl5/issues).
EOM
echo $n "Continue? [n] $c" >&4
......@@ -2398,7 +2398,7 @@ Much effort has been expended to ensure that this shell script will run on any
Unix system. If despite that it blows up on yours, your best bet is to edit
Configure and run it again. If you can't run Configure for some reason,
you'll have to generate a config.sh file by hand. Whatever problems you
have, let me (perlbug@perl.org) know how I blew it.
have, let me (https://github.com/Perl/perl5/issues) know how I blew it.
This installation script affects things in two ways:
......@@ -3367,7 +3367,7 @@ EOM
(cd $src/hints; ls -C *.sh) | $sed 's/\.sh/ /g' >&4
dflt=''
: Half the following guesses are probably wrong... If you have better
: tests or hints, please send them to perlbug@perl.org
: tests or hints, please send them to https://github.com/Perl/perl5/issues
: The metaconfig authors would also appreciate a copy...
$test -f /irix && osname=irix
$test -f /xenix && osname=sco_xenix
......@@ -4696,7 +4696,7 @@ else
fi
$rm -f try try.*
case "$gccversion" in
1*) cpp=`./loc gcc-cpp $cpp $pth` ;;
1.*) cpp=`./loc gcc-cpp $cpp $pth` ;;
esac
case "$gccversion" in
'') gccosandvers='' ;;
......@@ -4736,7 +4736,7 @@ esac
# gcc 3.* complain about adding -Idirectories that they already know about,
# so we will take those off from locincpth.
case "$gccversion" in
3*)
3.*)
echo "main(){}">try.c
for incdir in $locincpth; do
warn=`$cc $ccflags -I$incdir -c try.c 2>&1 | \
......@@ -5462,13 +5462,13 @@ fi
case "$hint" in
default|recommended)
case "$gccversion" in
1*) dflt="$dflt -fpcc-struct-return" ;;
1.*) dflt="$dflt -fpcc-struct-return" ;;
esac
case "$optimize:$DEBUGGING" in
*-g*:old) dflt="$dflt -DDEBUGGING";;
esac
case "$gccversion" in
2*) if $test -d /etc/conf/kconfig.d &&
2.*) if $test -d /etc/conf/kconfig.d &&
$contains _POSIX_VERSION $usrinc/sys/unistd.h >/dev/null 2>&1
then
# Interactive Systems (ISC) POSIX mode.
......@@ -5477,7 +5477,7 @@ default|recommended)
;;
esac
case "$gccversion" in
1*) ;;
1.*) ;;
2.[0-8]*) ;;
?*) set strict-aliasing -fno-strict-aliasing
eval $checkccflag
......@@ -5595,7 +5595,7 @@ case "$cppflags" in
;;
esac
case "$gccversion" in
1*) cppflags="$cppflags -D__GNUC__"
1.*) cppflags="$cppflags -D__GNUC__"
esac
case "$mips_type" in
'');;
......@@ -5781,7 +5781,7 @@ compile='
mc_file=$1;
shift;
case "$usedevel" in $define|true|[yY]*) if $test ! -f "${mc_file}.c"; then
echo "Internal Configure script bug - compiler test file ${mc_file}.c is missing. Please report this to perlbug@perl.org" >&4;
echo "Internal Configure script bug - compiler test file ${mc_file}.c is missing. Please report this to https://github.com/Perl/perl5/issues" >&4;
exit 1;
fi;
esac;
......@@ -8779,7 +8779,7 @@ case "$shrpdir" in
*) $cat >&4 <<EOM
WARNING: Use of the shrpdir variable for the installation location of
the shared $libperl is not supported. It was never documented and
will not work in this version. Let me (perlbug@perl.org)
will not work in this version. Let me (https://github.com/Perl/perl5/issues)
know of any problems this may cause.
EOM
......@@ -23186,7 +23186,7 @@ fi
: add -D_FORTIFY_SOURCE if feasible and not already there
case "$gccversion" in
[456789].*) case "$optimize$ccflags" in
[456789].*|[1-9][0-9]*) case "$optimize$ccflags" in
*-O*) case "$ccflags$cppsymbols" in
*_FORTIFY_SOURCE=*) # Don't add it again.
echo "You seem to have -D_FORTIFY_SOURCE already, not adding it." >&4
......
/* begin *
perl-5.30.0-multilib.patch - Install to lib32, lib64 depends on ARCH.
perl-5.30.2-multilib.patch - Install to lib32, lib64 depends on ARCH.
perl-5.30.2-CPAN.patch - Fix for `cpan -g Modile::Name' which download
module to th current directory.
* end */
......@@ -8,7 +8,7 @@ include ../../../../../build-system/constants.mk
url = $(DOWNLOAD_SERVER)/sources/packages/a/pkgtools
versions = 0.1.3
versions = 0.1.5
pkgname = pkgtools
suffix = tar.xz
......
......@@ -8,7 +8,7 @@ include ../../../../../../build-system/constants.mk
url = $(DOWNLOAD_SERVER)/sources/packages/d/python-modules/pip
versions = 19.3.1
versions = 20.1
pkgname = pip
suffix = tar.gz
......
......@@ -8,7 +8,7 @@ include ../../../../../../build-system/constants.mk
url = $(DOWNLOAD_SERVER)/sources/packages/d/python-modules/setuptools
versions = 41.6.0
versions = 46.1.3
pkgname = setuptools
suffix = tar.gz
......
......@@ -8,7 +8,7 @@ include ../../../../../build-system/constants.mk
url = $(DOWNLOAD_SERVER)/sources/packages/d/python2
versions = 2.7.16
versions = 2.7.18
pkgname = Python
suffix = tar.xz
......
......@@ -8,7 +8,7 @@ include ../../../../../build-system/constants.mk
url = $(DOWNLOAD_SERVER)/sources/packages/d/python3
versions = 3.7.4
versions = 3.8.2
pkgname = Python
suffix = tar.xz
......
......@@ -5,10 +5,10 @@ COMPONENT_TARGETS = $(HARDWARE_NOARCH)
include ../../../../../build-system/constants.mk
url = $(DOWNLOAD_SERVER)/sources/packages/b/sqlite/2018
url = $(DOWNLOAD_SERVER)/sources/packages/b/sqlite/2020
versions = 3.26.0.0
versions = 3.31.1.0
pkgname = sqlite
suffix = tar.gz
......
......@@ -3,13 +3,13 @@ COMPONENT_TARGETS = $(HARDWARE_BUILD)
include constants.mk
REQUIRES = build-system/3pp/app/pkgtools/0.1.3
REQUIRES = build-system/3pp/app/pkgtools/0.1.5
REQUIRES += build-system/3pp/app/genext2fs/1.4.1
REQUIRES += build-system/3pp/app/populatefs/1.1
REQUIRES += build-system/3pp/app/jsmin/0.0.1
REQUIRES += build-system/3pp/app/pseudo/1.8.2
REQUIRES += build-system/3pp/app/python3/3.7.4
REQUIRES += build-system/3pp/app/perl/5.30.0
REQUIRES += build-system/3pp/app/python3/3.8.2
REQUIRES += build-system/3pp/app/perl/5.30.2
REQUIRES += build-system/progs
# ======= __END_OF_REQUIRES__ =======
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment