davidsch / rpms / bout++

Forked from rpms/bout++ 2 years ago
Clone

Blame remove-mpark.patch

David Schwörer 86b481b
--- a/make.config.in
David Schwörer 86b481b
+++ b/make.config.in
David Schwörer 42eb269
@@ -91,8 +91,7 @@ LIB    = $(BOUT_LIB_PATH)/libbout++.a
David Schwörer 86b481b
 LIB_SO = $(BOUT_LIB_PATH)/libbout++.so
David Schwörer 86b481b
 endif
David Schwörer 86b481b
 
David Schwörer 86b481b
-MPARK_VARIANT_INCLUDE_PATH=@MPARK_VARIANT_INCLUDE_PATH@
David Schwörer 86b481b
-BOUT_INCLUDE = -I$(BOUT_INCLUDE_PATH) $(CXXINCLUDE) $(EXTRA_INCS) -I$(MPARK_VARIANT_INCLUDE_PATH)
David Schwörer 86b481b
+BOUT_INCLUDE = -I$(BOUT_INCLUDE_PATH) $(CXXINCLUDE) $(EXTRA_INCS)
David Schwörer 86b481b
 BOUT_LIBS    = -lm -L$(BOUT_LIB_PATH) -lbout++ $(EXTRA_LIBS)
David Schwörer 86b481b
 
David Schwörer 86b481b
 CHANGED = $(shell find -f $(BOUT_TOP)/include $(BOUT_TOP)/src -type f \( -name \*.cxx -or -name \*.h \) -newer $(LIB) -print 2> /dev/null)
David Schwörer 42eb269
@@ -163,11 +162,10 @@ install: libfast
David Schwörer 86b481b
 	$(PRE_INSTALL)     # Pre-install commands follow.
David Schwörer 86b481b
 
David Schwörer 86b481b
 	$(NORMAL_INSTALL)  # Normal commands follow.
David Schwörer 86b481b
-	$(MKDIR) $(INSTALL_INCLUDE_PATH)/{,pvode,bout/sys,bout/invert,mpark}
David Schwörer 86b481b
+	$(MKDIR) $(INSTALL_INCLUDE_PATH)/{,pvode,bout/sys,bout/invert}
David Schwörer 86b481b
 	$(MKDIR) $(DESTDIR)/{@libdir@,@bindir@,@datadir@/bout++/idllib}
David Schwörer 86b481b
 	$(MKDIR) $(DESTDIR)/@datadir@/bout++/pylib/{boutdata,boututils}
David Schwörer 86b481b
 	$(INSTALL_DATA) include/*.hxx $(INSTALL_INCLUDE_PATH)
David Schwörer 86b481b
-	$(INSTALL_DATA) $(MPARK_VARIANT_INCLUDE_PATH)/mpark/*.hpp $(INSTALL_INCLUDE_PATH)/mpark
David Schwörer 86b481b
 	$(INSTALL_DATA) include/pvode/*.h $(INSTALL_INCLUDE_PATH)/pvode/
David Schwörer 86b481b
 	$(INSTALL_DATA) include/bout/*.hxx $(INSTALL_INCLUDE_PATH)/bout/
David Schwörer 86b481b
 	$(INSTALL_DATA) include/bout/sys/*.hxx $(INSTALL_INCLUDE_PATH)/bout/sys/
David Schwörer 42eb269
@@ -191,13 +189,11 @@ install: libfast
David Schwörer 42eb269
 	sed -i "s|^BOUT_CONFIG_FILE=.*|BOUT_CONFIG_FILE=@includedir@/bout++/make.config|" $(DESTDIR)@bindir@/bout-config
David Schwörer 86b481b
 	sed -i "s|^idlpath=.*|idlpath=@datadir@/bout++/idllib/|" $(DESTDIR)@bindir@/bout-config
David Schwörer 86b481b
 	sed -i "s|^pythonpath=.*|pythonpath=@datadir@/bout++/pylib/|" $(DESTDIR)@bindir@/bout-config
David Schwörer 86b481b
-	sed -i "s|^MPARK_VARIANT_INCLUDE_PATH=.*|MPARK_VARIANT_INCLUDE_PATH=@includedir@/bout++|" $(DESTDIR)@bindir@/bout-config
David Schwörer 86b481b
 
David Schwörer 86b481b
 	@# Modify paths in the make.config file
David Schwörer 42eb269
 	sed -i "s|^BOUT_INCLUDE_PATH=.*|BOUT_INCLUDE_PATH=@includedir@/bout++|" $(INSTALL_INCLUDE_PATH)/make.config
David Schwörer 42eb269
 	sed -i "s|^BOUT_LIB_PATH=.*|BOUT_LIB_PATH=@libdir@|" $(INSTALL_INCLUDE_PATH)/make.config
David Schwörer 42eb269
 	sed -i "s|^BOUT_CONFIG_FILE=.*|BOUT_CONFIG_FILE=@includedir@/bout++/make.config|" $(INSTALL_INCLUDE_PATH)/make.config
David Schwörer 42eb269
-	sed -i "s|^MPARK_VARIANT_INCLUDE_PATH=.*|MPARK_VARIANT_INCLUDE_PATH=@includedir@/bout++|" $(INSTALL_INCLUDE_PATH)/make.config
David Schwörer 86b481b
 
David Schwörer 42eb269
 #	Set the make.config as released, so the library isn't rebuild. This way the .a file doesn't need to be preserved/installed
David Schwörer 42eb269
 	sed -i '26 i RELEASED                 = yes' $(INSTALL_INCLUDE_PATH)/make.config
David Schwörer 42eb269
@@ -223,16 +219,7 @@ uninstall:
David Schwörer 86b481b
 # Builds the library with $(OBJ) which is defined from the SOURCEC variable
David Schwörer 86b481b
 ####################################################################
David Schwörer 86b481b
 
David Schwörer 86b481b
-MPARK_VARIANT_SENTINEL = $(MPARK_VARIANT_INCLUDE_PATH)/mpark/variant.hpp
David Schwörer 86b481b
-$(MPARK_VARIANT_SENTINEL):
David Schwörer 86b481b
-	@echo "Downloading mpark.variant"
David Schwörer 42eb269
-	@lock=$(BOUT_TOP)/externalpackages/.get.mpark ;ex=0; mkdir $$lock && ( \
David Schwörer 42eb269
-	       git submodule update --init --recursive $(BOUT_TOP)/externalpackages/mpark.variant \
David Schwörer 42eb269
-	       ;ex=$$? ; rmdir $$lock ) || \
David Schwörer 42eb269
-	       ( while test -d $$lock ; do sleep .1 ; done); exit $$ex
David Schwörer 86b481b
-
David Schwörer 86b481b
 ifeq ("$(TARGET)", "libfast")
David Schwörer 86b481b
-libfast: | $(MPARK_VARIANT_SENTINEL)
David Schwörer 86b481b
 libfast: makefile $(BOUT_CONFIG_FILE) $(BOUT_TOP)/include $(OBJ) $(DIRS)
David Schwörer 86b481b
 endif
David Schwörer 86b481b