gildas: 20180701_a -> 20180801_a

This commit is contained in:
Sebastien Maret 2018-08-13 15:17:15 +02:00
parent a5efa6650f
commit b4599987e3
2 changed files with 5 additions and 22 deletions

View File

@ -7,13 +7,13 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
srcVersion = "jul18a"; srcVersion = "aug18a";
version = "20180701_a"; version = "20180801_a";
name = "gildas-${version}"; name = "gildas-${version}";
src = fetchurl { src = fetchurl {
url = "http://www.iram.fr/~gildas/dist/archive/gildas/gildas-src-${srcVersion}.tar.gz"; url = "http://www.iram.fr/~gildas/dist/gildas-src-${srcVersion}.tar.gz";
sha256 = "0kl3zf6b1kv8hgsfrarsnm2gnrdax3vi8f856249y4nxsa7lbv2i"; sha256 = "0mg3wijrj8x1p912vkgrhxbypjx7aj9b1492yxvq2y3fxban6bj1";
}; };
enableParallelBuilding = true; enableParallelBuilding = true;
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
buildInputs = [ gtk2-x11 lesstif cfitsio python27Env ]; buildInputs = [ gtk2-x11 lesstif cfitsio python27Env ];
patches = [ ./wrapper.patch ./return-error-code.patch ./clang.patch ./mod.patch ./aarch64.patch ]; patches = [ ./wrapper.patch ./return-error-code.patch ./clang.patch ./aarch64.patch ];
configurePhase='' configurePhase=''
substituteInPlace admin/wrapper.sh --replace '%%OUT%%' $out substituteInPlace admin/wrapper.sh --replace '%%OUT%%' $out

View File

@ -1,17 +0,0 @@
diff -ruN gildas-src-jul18a/admin/Makefile.build gildas-src-jul18a.mod/admin/Makefile.build
--- gildas-src-jul18a/admin/Makefile.build 2018-06-14 14:36:54.000000000 +0200
+++ gildas-src-jul18a.mod/admin/Makefile.build 2018-07-06 13:31:46.000000000 +0200
@@ -291,6 +291,13 @@
win-$(LIB_IDENTITY)-und.def -o $@ $(FLDLIBS) $(LIB_DEPENDS) $(ADD_LIBS) $(SYS_LIBS))
endif
+# Dummy rules for modules just so that make consider the module a
+# valid dependency when first parsing the makefiles. This rule should
+# never be applied as the modules are a by-product of the compilation
+# of the object
+$(builddir)/%.mod:
+ echo "dummy" > /dev/null
+
# Fortran executables
$(bindir)/% : $(builddir)/%.o | $(bindir)
$(FC) $(ALL_FLDFLAGS) $< $(OBJECTS) -o $@ \