Merge pull request #46095 from smaret/gildas-build-fixes

gildas: fix build failures
This commit is contained in:
xeji 2018-09-05 16:02:48 +02:00 committed by GitHub
commit 67d796d229
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 1 deletions

View file

@ -22,7 +22,9 @@ stdenv.mkDerivation rec {
buildInputs = [ gtk2-x11 lesstif cfitsio python27Env ];
patches = [ ./wrapper.patch ./return-error-code.patch ./clang.patch ./aarch64.patch ];
patches = [ ./wrapper.patch ./return-error-code.patch ./clang.patch ./aarch64.patch ./gag-font-bin-rule.patch ];
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-unused-command-line-argument";
configurePhase=''
substituteInPlace admin/wrapper.sh --replace '%%OUT%%' $out

View file

@ -0,0 +1,13 @@
diff -ruN gildas-src-aug18a/kernel/etc/Makefile gildas-src-aug18a.gag-font-bin-rule/kernel/etc/Makefile
--- gildas-src-aug18a/kernel/etc/Makefile 2016-09-09 09:39:37.000000000 +0200
+++ gildas-src-aug18a.gag-font-bin-rule/kernel/etc/Makefile 2018-09-04 12:03:11.000000000 +0200
@@ -29,7 +29,8 @@
SEDEXE=sed -e 's?source tree?executable tree?g'
-$(datadir)/gag-font.bin: hershey-font.dat $(bindir)/hershey
+$(datadir)/gag-font.bin: hershey-font.dat $(bindir)/hershey \
+ $(gagintdir)/etc/gag.dico.gbl $(gagintdir)/etc/gag.dico.lcl
ifeq ($(GAG_ENV_KIND)-$(GAG_TARGET_KIND),cygwin-mingw)
$(bindir)/hershey `cygpath -w $(datadir)`/gag-font.bin
else