diff options
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/libint/fix-paths.patch')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/libint/fix-paths.patch | 96 |
1 files changed, 96 insertions, 0 deletions
diff --git a/nixpkgs/pkgs/development/libraries/libint/fix-paths.patch b/nixpkgs/pkgs/development/libraries/libint/fix-paths.patch new file mode 100644 index 000000000000..2cf178e81f3a --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libint/fix-paths.patch @@ -0,0 +1,96 @@ +diff --git a/export/fortran/Makefile b/export/fortran/Makefile +index 62d8711..a83edc7 100644 +--- a/export/fortran/Makefile ++++ b/export/fortran/Makefile +@@ -1,12 +1,14 @@ +-TOPDIR = .. +-SRCDIR = .. ++TOPDIR = ../.. ++SRCDIR = ../.. + +--include ../MakeSuffixRules +--include ../MakeVars +--include ../MakeVars.features ++-include ../../lib/MakeSuffixRules ++-include ../../src/bin/MakeVars ++-include ../../src/lib/libint/MakeVars.features + +-FCFLAGS := -I../include -I../include/libint2 -D__COMPILING_LIBINT2=1 $(FCFLAGS) +-COMPUTE_LIB = -L../lib -lint2 ++FCFLAGS := -I../../include -I../../include/libint2 -D__COMPILING_LIBINT2=1 $(FCFLAGS) ++COMPUTE_LIB = -L../../lib -lint2 ++ ++CXXCPP = cc -E -I../../include/libint2 + + .PHONY: clean distclean default make_test check_test + +@@ -28,7 +30,7 @@ libint2_types_f.h: $(TOPDIR)/include/libint2.h.i + + fortran_example.o: libint_f.o + +-fortran_incldefs.h: $(TOPDIR)/include/libint2_types.h ++fortran_incldefs.h: $(TOPDIR)/include/libint2/libint2_types.h + grep '^#' $< | grep -v '#include' > $@ + + fortran_example: fortran_example.o libint_f.o +diff --git a/src/bin/libint/Makefile b/src/bin/libint/Makefile +index 406306c..bd8a695 100644 +--- a/src/bin/libint/Makefile ++++ b/src/bin/libint/Makefile +@@ -59,7 +59,7 @@ test: $(TESTCXXOBJ) $(LIBTARGET) + $(CXX) -o $@ $(CXXFLAGS) $(LDFLAGS) $^ $(SYSLIBS) + + $(LIBTARGET): $(LIBOBJ) +- /bin/rm -f $@ ++ rm -f $@ + $(AR) $(ARFLAGS) $@ $(LIBOBJ) + $(RANLIB) $@ + +@@ -102,7 +102,7 @@ ifneq ($(CXXDEPENDSUF),none) + %.d: %.cc + $(CXXDEPEND) $(CXXDEPENDFLAGS) -c $(CPPFLAGS) $(CXXFLAGS) $< > /dev/null + sed 's/^$*.o/$*.$(OBJSUF) $*.d/g' < $(*F).$(CXXDEPENDSUF) > $(@F) +- /bin/rm -f $(*F).$(CXXDEPENDSUF) ++ rm -f $(*F).$(CXXDEPENDSUF) + else + %.d: %.cc + $(CXXDEPEND) $(CXXDEPENDFLAGS) -c $(CPPFLAGS) $(CXXFLAGS) $< | sed 's/^$*.o/$*.$(OBJSUF) $*.d/g' > $(@F) +diff --git a/tests/eri/Makefile b/tests/eri/Makefile +index 6223e4f..05909dc 100644 +--- a/tests/eri/Makefile ++++ b/tests/eri/Makefile +@@ -62,7 +62,7 @@ ifneq ($(CXXDEPENDSUF),none) + %.d: %.cc + $(CXXDEPEND) $(CXXDEPENDFLAGS) -c $(CPPFLAGS) $(CXXFLAGS) $< > /dev/null + sed 's/^$*.o/$*.$(OBJSUF) $*.d/g' < $(*F).$(CXXDEPENDSUF) > $(@F) +- /bin/rm -f $(*F).$(CXXDEPENDSUF) ++ rm -f $(*F).$(CXXDEPENDSUF) + else + %.d: %.cc + $(CXXDEPEND) $(CXXDEPENDFLAGS) -c $(CPPFLAGS) $(CXXFLAGS) $< | sed 's/^$*.o/$*.$(OBJSUF) $*.d/g' > $(@F) +diff --git a/tests/hartree-fock/Makefile b/tests/hartree-fock/Makefile +index aaebadc..4971472 100644 +--- a/tests/hartree-fock/Makefile ++++ b/tests/hartree-fock/Makefile +@@ -95,7 +95,7 @@ ifneq ($(CXXDEPENDSUF),none) + %.d:: %.cc + $(CXXDEPEND) $(CXXDEPENDFLAGS) -c $(CPPFLAGS) $(CXXFLAGS) $< > /dev/null + sed 's/^$*.o/$*.$(OBJSUF) $*.d/g' < $(*F).$(CXXDEPENDSUF) > $(@F) +- /bin/rm -f $(*F).$(CXXDEPENDSUF) ++ rm -f $(*F).$(CXXDEPENDSUF) + else + %.d:: %.cc + $(CXXDEPEND) $(CXXDEPENDFLAGS) -c $(CPPFLAGS) $(CXXFLAGS) $< | sed 's/^$*.o/$*.$(OBJSUF) $*.d/g' > $(@F) +diff --git a/tests/unit/Makefile b/tests/unit/Makefile +index f2d9400..da9d82b 100644 +--- a/tests/unit/Makefile ++++ b/tests/unit/Makefile +@@ -93,7 +93,7 @@ ifneq ($(CXXDEPENDSUF),none) + %.d:: %.cc + $(CXXDEPEND) $(CXXDEPENDFLAGS) -c $(CPPFLAGS) $(CXXGENFLAGS) $< > /dev/null + sed 's/^$*.o/$*.$(OBJSUF) $*.d/g' < $(*F).$(CXXDEPENDSUF) > $(@F) +- /bin/rm -f $(*F).$(CXXDEPENDSUF) ++ rm -f $(*F).$(CXXDEPENDSUF) + else + %.d:: %.cc + $(CXXDEPEND) $(CXXDEPENDFLAGS) -c $(CPPFLAGS) $(CXXGENFLAGS) $< | sed 's/^$*.o/$*.$(OBJSUF) $*.d/g' > $(@F) |