From 229b586f5405b6b193aed22701b0729f9b49f235 Mon Sep 17 00:00:00 2001 From: Peter Marquardt Date: Mon, 20 Jan 2020 13:06:49 +0100 Subject: [PATCH] ddd: fix Makefile build race condition - be0ify - fix race condition for parallel builds ``` make[2]: Leaving directory '/scratch/local2/beehive/ddd-3.3.12-0/buildroot/ddd/ddd-3.3.12-0/build/ddd' make stringify make[2]: Entering directory '/scratch/local2/beehive/ddd-3.3.12-0/buildroot/ddd/ddd-3.3.12-0/build/ddd' /bin/sh ../libtool --tag=CC --mode=link gcc -g -O2 -o ctest ctest.o -lm gcc -g -O2 -o ctest ctest.o -lm make[2]: Leaving directory '/scratch/local2/beehive/ddd-3.3.12-0/buildroot/ddd/ddd-3.3.12-0/build/ddd' make[3]: 'stringify' is up to date. make[2]: Entering directory '/scratch/local2/beehive/ddd-3.3.12-0/buildroot/ddd/ddd-3.3.12-0/build/ddd' ./stringify < /scratch/local2/beehive/ddd-3.3.12-0/buildroot/ddd/ddd-3.3.12-0/source/ddd/ddd.info.txt.gz > /scratch/local2/beehive/ddd-3.3.12-0/buildroot/ddd/ddd-3.3.12-0/source/ddd/ddd.info.txt.gz.C~ && mv /scratch/local2/beehive/ddd-3.3.12-0/buildroot/ddd/ddd-3.3.12-0/source/ddd/ddd.info.txt.gz.C~ /scratch/local2/beehive/ddd-3.3.12-0/buildroot/ddd/ddd-3.3.12-0/source/ddd/ddd.info.txt.gz.C /bin/sh: ./stringify: Permission denied make[2]: [Makefile:2696: /scratch/local2/beehive/ddd-3.3.12-0/buildroot/ddd/ddd-3.3.12-0/source/ddd/ddd.info.txt.gz.C] Error 126 (ignored) make[2]: Leaving directory '/scratch/local2/beehive/ddd-3.3.12-0/buildroot/ddd/ddd-3.3.12-0/build/ddd' make[2]: Entering directory '/scratch/local2/beehive/ddd-3.3.12-0/buildroot/ddd/ddd-3.3.12-0/build/ddd' /bin/sh ../libtool --tag=CXX --mode=link g++ -O2 -g -Wall -W -Wwrite-strings -trigraphs -o userinfo userinfo.o -lm mkdir .libs g++ -O2 -g -Wall -W -Wwrite-strings -trigraphs -o userinfo userinfo.o -lm make[2]: Leaving directory '/scratch/local2/beehive/ddd-3.3.12-0/buildroot/ddd/ddd-3.3.12-0/build/ddd' make[2]: Entering directory '/scratch/local2/beehive/ddd-3.3.12-0/buildroot/ddd/ddd-3.3.12-0/build/ddd' /bin/sh ../libtool --tag=CXX --mode=link g++ -O2 -g -Wall -W -Wwrite-strings -trigraphs -o stringify stringify.o -lm ``` --- ddd-3.3.12-0.bee | 33 --------------------------------- ddd.be0 | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 33 deletions(-) delete mode 100755 ddd-3.3.12-0.bee create mode 100755 ddd.be0 diff --git a/ddd-3.3.12-0.bee b/ddd-3.3.12-0.bee deleted file mode 100755 index b0269b9db..000000000 --- a/ddd-3.3.12-0.bee +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/env beesh - -SRCURL[0]="ftp://ftp.gnu.org/gnu/ddd/ddd-3.3.12.tar.gz" - -PATCHURL[0]="" - -PGRP=( uncategorized ) - - - -# BEE_CONFIGURE=compat - -# EXCLUDE="" - -mee_patch() { - bee_patch - - sed -ie '40a #include \' ddd/strclass.C - -} - -mee_configure() { - bee_configure -} - -mee_build() { - bee_build -} - -mee_install() { - bee_install -} - diff --git a/ddd.be0 b/ddd.be0 new file mode 100755 index 000000000..6f8f5e17f --- /dev/null +++ b/ddd.be0 @@ -0,0 +1,37 @@ +#!/usr/bin/env beesh + +# BEE_VERSION ddd-3.3.12-1 + +# more info: https://foo.bar.com + +SRCURL[0]="https://ftp.gnu.org/gnu/ddd/ddd-${PKGVERSION}.tar.gz" + +PATCHURL+=( /src/mariux/patches/ddd-fix-race-stringify.patch ) + +# build_in_sourcedir + +# sourcesubdir_append src + +#mee_extract() { +# bee_extract "${@}" +#} + +#mee_patch() { +# bee_patch "${@}" +#} + +#mee_configure() { +# bee_configure +#} + +#mee_build() { +# bee_build +#} + +#mee_install() { +# bee_install +#} + +#mee_install_post() { +# exit +#}