From b03bd305625775db2ab7be1b308366fe276595c3 Mon Sep 17 00:00:00 2001 From: Alexander Pace <alexander.pace@ligo.org> Date: Tue, 31 Oct 2017 16:04:34 -0400 Subject: [PATCH] Updated optimized makefile to pull from git.ligo.org --- .../O2/optimised/Makefile.ligosoftware_icc_gstreamer-0.10 | 4 ++-- .../O2/optimised/Makefile.ligosoftware_icc_gstreamer-1.0 | 5 ++--- .../O2/optimised/Makefile.ligosoftware_icc_gstreamer-1.0_knl | 3 +-- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/gstlal-inspiral/share/O2/optimised/Makefile.ligosoftware_icc_gstreamer-0.10 b/gstlal-inspiral/share/O2/optimised/Makefile.ligosoftware_icc_gstreamer-0.10 index 9269e64e27..ceb5e1da1b 100644 --- a/gstlal-inspiral/share/O2/optimised/Makefile.ligosoftware_icc_gstreamer-0.10 +++ b/gstlal-inspiral/share/O2/optimised/Makefile.ligosoftware_icc_gstreamer-0.10 @@ -583,7 +583,7 @@ logs/patch.txt : $(LOGS_DIR)/tar.txt $(PATCH_TARGET_1) @echo $^ | sed -e "s@ @\n@g" > $@ $(PATCH_TARGET_1) : logs/tar.txt - @wget --no-check-certificate https://versions.ligo.org/cgit/gstlal/plain/gstlal-inspiral/share/profile/patches/gstreamer-bison.patch --directory-prefix=$(PATCH_DIR) -nc + @wget --no-check-certificate https://git.ligo.org/lscsoft/gstlal/raw/master/gstlal-inspiral/share/profile/patches/gstreamer-bison.patch --directory-prefix=$(PATCH_DIR) -nc #tarballs logs/tar.txt : $(LOGS_DIR)/git.txt $(FFTW_TAR_TARGET) $(ORC_TAR_TARGET) $(GSL_TAR_TARGET) $(GSTREAMER_TAR_TARGET) $(GSTBASE_TAR_TARGET) $(GSTGOOD_TAR_TARGET) $(GSTPYTHON_TAR_TARGET) $(OPROFILE_TAR_TARGET) $(LIBFRAME_TAR_TARGET) $(METAIO_TAR_TARGET) $(SWIG_TAR_TARGET) $(LDASTOOLS_TAR_TARGET) $(GDS_TAR_TARGET) $(LAL_TAR_TARGET) $(LALFRAME_TAR_TARGET) $(LALMETAIO_TAR_TARGET) $(LALSIM_TAR_TARGET) $(LALBURST_TAR_TARGET) $(LALDETCHAR_TAR_TARGET) $(LALINSPIRAL_TAR_TARGET) $(LALPULSAR_TAR_TARGET) $(LALINFER_TAR_TARGET) $(LALSTOCH_TAR_TARGET) $(LALAPPS_TAR_TARGET) $(GLUE_TAR_TARGET) $(PYLAL_TAR_TARGET) $(LALEXTRA_TAR_TARGET) $(DOXYGEN_TAR_TARGET) $(GSTLAL_TAR_TARGET) $(GSTLALUGLY_TAR_TARGET) $(GSTLALCALIB_TAR_TARGET) $(GSTLALINSPIRAL_TAR_TARGET) @@ -703,7 +703,7 @@ $(GSTLAL_GIT_TARGET) : $(LALSUITE_GIT_TARGET) echo "Gstlal git repo exists" ; \ else \ mkdir -p $(GSTLAL_REPO) ; \ - git clone https://versions.ligo.org/git/gstlal.git $(GSTLAL_REPO) ; \ + git clone https://git.ligo.org/lscsoft/gstlal.git $(GSTLAL_REPO) ; \ fi ; $(LALSUITE_GIT_TARGET) : $(LOGS_DIR) diff --git a/gstlal-inspiral/share/O2/optimised/Makefile.ligosoftware_icc_gstreamer-1.0 b/gstlal-inspiral/share/O2/optimised/Makefile.ligosoftware_icc_gstreamer-1.0 index 601f8b9e46..615e925d9b 100644 --- a/gstlal-inspiral/share/O2/optimised/Makefile.ligosoftware_icc_gstreamer-1.0 +++ b/gstlal-inspiral/share/O2/optimised/Makefile.ligosoftware_icc_gstreamer-1.0 @@ -103,7 +103,7 @@ GSL_2_TARGET=$(INSTALL_DIR)/lib/pkgconfig/gsl.pc.orig GSL_1_TARGET=$(INSTALL_DIR)/lib/libgsl.so ORC_TARGET=$(INSTALL_DIR)/lib/liborc-0.4.so FFTW_TARGET=$(INSTALL_DIR)/lib/libfftw3.so -PYFFTW_TARGET=$(INSTALL_DIR)/lib64/python2.7/site-packages/pyfftw/pyfftw.so +PYFFTW_TARGET=$(INSTALL_DIR)/lib/python2.7/site-packages/pyfftw/pyfftw.so # tarballs GSTLALINSPIRAL_TAR_TARGET=$(TAR_DIR)/$(GSTLALINSPIRAL).tar.gz GSTLALCALIB_TAR_TARGET=$(TAR_DIR)/$(GSTLALCALIBRATION).tar.gz @@ -787,8 +787,7 @@ $(LOGS_DIR) : echo "Gstlal git repo exists" ; \ else \ mkdir -p $(GSTLAL_REPO) ; \ - ecp-cookie-init LIGO.ORG https://versions.ligo.org/git $(USER) ; \ - git clone https://versions.ligo.org/git/gstlal.git $(GSTLAL_REPO) ; \ + git clone https://git.ligo.org/lscsoft/gstlal.git $(GSTLAL_REPO) ; \ fi ; \ fi ; diff --git a/gstlal-inspiral/share/O2/optimised/Makefile.ligosoftware_icc_gstreamer-1.0_knl b/gstlal-inspiral/share/O2/optimised/Makefile.ligosoftware_icc_gstreamer-1.0_knl index b3f5e148ed..cd37fff2ea 100644 --- a/gstlal-inspiral/share/O2/optimised/Makefile.ligosoftware_icc_gstreamer-1.0_knl +++ b/gstlal-inspiral/share/O2/optimised/Makefile.ligosoftware_icc_gstreamer-1.0_knl @@ -789,8 +789,7 @@ $(LOGS_DIR) : echo "Gstlal git repo exists" ; \ else \ mkdir -p $(GSTLAL_REPO) ; \ - ecp-cookie-init LIGO.ORG https://versions.ligo.org/git $(USER) ; \ - git clone https://versions.ligo.org/git/gstlal.git $(GSTLAL_REPO) ; \ + git clone https://git.ligo.org/lscsoft/gstlal.git $(GSTLAL_REPO) ; \ fi ; \ fi ; -- GitLab