Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xbuild_stage1_package.sh2
-rw-r--r--packages-i486-stage1/perl8
2 files changed, 6 insertions, 4 deletions
diff --git a/build_stage1_package.sh b/build_stage1_package.sh
index ddb3645..d37a611 100755
--- a/build_stage1_package.sh
+++ b/build_stage1_package.sh
@@ -57,7 +57,7 @@ if test $(pacman --config "$STAGE1_CHROOT/etc/pacman.conf" -r "$STAGE1_CHROOT" -
else
CPUS=1
fi
- sed -i "s@^#MAKEFLAGS=.*@MAKEFLAGS=\"-j$CPUS\"@" $STAGE1_BUILD/makepkg-$TARGET_CPU.conf
+ sed -i "s@^.*MAKEFLAGS=.*@MAKEFLAGS=\"-j$CPUS\"@" $STAGE1_BUILD/makepkg-$TARGET_CPU.conf
$STAGE1_BUILD/makepkg-$TARGET_CPU -C --config $STAGE1_BUILD/makepkg-$TARGET_CPU.conf \
--skipchecksums --skippgpcheck --nocheck > "$PACKAGE.log" 2>&1
diff --git a/packages-i486-stage1/perl b/packages-i486-stage1/perl
index 6626e6b..80032bf 100644
--- a/packages-i486-stage1/perl
+++ b/packages-i486-stage1/perl
@@ -1,6 +1,3 @@
-# cross-compiling perl doesn't work in parallel
-NOPARALLEL_BUILD=1
-
# the official cross-compilation support in Perl is weird and needs a
# running remote SSH access to the real machine:
# https://stackoverflow.com/questions/5464538/cross-compile-perl-for-arm
@@ -11,6 +8,11 @@ sed -i "/md5sums=/ a\ 'SKIP'" PKGBUILD
sed -i '1!N; /prepare() *{\n *cd/ a \ tar --strip-components=1 -zxf ${srcdir}/perl-cross-1.1.8.tar.gz' PKGBUILD
sed -i "s@./Configure -des@./configure --target=$TARGET_ARCH@" PKGBUILD
+# ./miniperl_top: no ./miniperl found; build it before using miniperl_top
+# we can build in parallel with this small trick: there is a dependency
+# missing from miniperl_top to miniperl it seems
+sed -i 's/^ \+make$/make miniperl; make/' PKGBUILD
+
# rm: cannot remove '/home/cross/build/perl/pkg/perl/usr/bin/perl5.26.1': No such file or directory
sed -i 's@\(rm "$pkgdir/usr/bin/perl$pkgver\)@#\1@g' PKGBUILD