diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2019-11-15 15:52:11 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2019-11-15 15:52:37 +0000 |
| commit | 9e450874c8064d59e87132576fc6bd76fc598e75 (patch) | |
| tree | d31e21f681a7f8b7ff6ff6dad1ef9d1b4096a9c1 /main/bison | |
| parent | c218236745352a772d23c4ee5a1a480419fd315b (diff) | |
| download | aports-9e450874c8064d59e87132576fc6bd76fc598e75.tar.bz2 aports-9e450874c8064d59e87132576fc6bd76fc598e75.tar.xz | |
main/bison: another try to fix parallel build
Diffstat (limited to 'main/bison')
| -rw-r--r-- | main/bison/APKBUILD | 7 | ||||
| -rw-r--r-- | main/bison/parallel-build-fix.patch | 29 |
2 files changed, 33 insertions, 3 deletions
diff --git a/main/bison/APKBUILD b/main/bison/APKBUILD index b863dfc483..23788f95b3 100644 --- a/main/bison/APKBUILD +++ b/main/bison/APKBUILD @@ -11,7 +11,8 @@ makedepends="perl" depends="m4" checkdepends="bison flex" [ -n "$BOOTSTRAP" ] && options="!check" -source="https://ftp.gnu.org/gnu/bison/bison-$pkgver.tar.xz" +source="https://ftp.gnu.org/gnu/bison/bison-$pkgver.tar.xz + parallel-build-fix.patch" subpackages="$pkgname-doc" build() { @@ -23,7 +24,6 @@ build() { --datadir=/usr/share \ --infodir=/usr/share/info \ --mandir=/usr/share/man - make examples/c/reccalc/scan.h # work around parallel build issue make } @@ -39,4 +39,5 @@ package() { rmdir -p "$pkgdir"/usr/lib 2>/dev/null || true } -sha512sums="00d2b37187b93100ec4b220ce2752d12ccf68f9d0d39b380d375d36dd8a22aa1d6e60156918f95e4493f9531c5d42d8fad38fd807307b491c1ca7ca4177823d9 bison-3.4.2.tar.xz" +sha512sums="00d2b37187b93100ec4b220ce2752d12ccf68f9d0d39b380d375d36dd8a22aa1d6e60156918f95e4493f9531c5d42d8fad38fd807307b491c1ca7ca4177823d9 bison-3.4.2.tar.xz +73655800f32ddf369f51b541999fafff3ae3191d03856d8a082aed488f21af44f359fa92f2bb9fea651db33499e8ae7ca932f451bfa74f9598e7e724820bf4de parallel-build-fix.patch" diff --git a/main/bison/parallel-build-fix.patch b/main/bison/parallel-build-fix.patch new file mode 100644 index 0000000000..7ebcc2bc09 --- /dev/null +++ b/main/bison/parallel-build-fix.patch @@ -0,0 +1,29 @@ +diff --git a/Makefile.in b/Makefile.in +index 8a7726d..83dd0ae 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -2876,7 +2876,7 @@ mfcalcdir = $(docdir)/examples/c/mfcalc + mfcalc_DATA = $(mfcalc_extracted) + dist_mfcalc_DATA = examples/c/mfcalc/Makefile + reccalcdir = $(docdir)/examples/c/reccalc +-@FLEX_WORKS_TRUE@nodist_examples_c_reccalc_reccalc_SOURCES = examples/c/reccalc/parse.y examples/c/reccalc/scan.h examples/c/reccalc/scan.c ++@FLEX_WORKS_TRUE@nodist_examples_c_reccalc_reccalc_SOURCES = examples/c/reccalc/parse.y examples/c/reccalc/scan.stamp + @FLEX_WORKS_TRUE@examples_c_reccalc_reccalc_CPPFLAGS = -I$(top_srcdir)/examples/c/reccalc -I$(top_builddir)/examples/c/reccalc + + # Tell Make that parse.o depends on scan.h, so that scan.h is built +@@ -9313,11 +9313,11 @@ examples/c/mfcalc/mfcalc.c: $(dependencies) + @FLEX_WORKS_TRUE@ # Don't use gnulib's system headers. + + examples/c/reccalc/parse.c: $(dependencies) +-examples/c/reccalc/reccalc$(DASH)parse.o: examples/c/reccalc/scan.h ++examples/c/reccalc/reccalc$(DASH)parse.o: examples/c/reccalc/scan.stamp + +-examples/c/reccalc/scan.c examples/c/reccalc/scan.h: examples/c/reccalc/scan.stamp +- @test -f $@ || rm -f examples/c/reccalc/scan.stamp +- @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) examples/c/reccalc/scan.stamp ++#examples/c/reccalc/scan.c examples/c/reccalc/scan.h: examples/c/reccalc/scan.stamp ++# @test -f $@ || rm -f examples/c/reccalc/scan.stamp ++# @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) examples/c/reccalc/scan.stamp + + examples/c/reccalc/scan.stamp: examples/c/reccalc/scan.l + $(AM_V_LEX)rm -f $@ $@.tmp |