From 2dd1f2c7eccf26e1636accca2a5abdec5a581a67 Mon Sep 17 00:00:00 2001 From: Ulrich Schwickerath <Ulrich.Schwickerath@cern.ch> Date: Fri, 29 Nov 2024 10:58:14 +0100 Subject: [PATCH 1/2] switch to github for OpenPHIGS --- make_openphigs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/make_openphigs b/make_openphigs index a6b9b154..a227459e 100755 --- a/make_openphigs +++ b/make_openphigs @@ -10,8 +10,8 @@ fi # setup environment . delphi.sh -git clone https://:@gitlab.cern.ch:8443/delphi/openphigs.git -cd openphigs +git clone https://github.com/CERN/OpenPHIGS.git +cd OpenPHIGS # check cmake version cmake_version=`cmake --version | head -1| cut -d. -f1| awk '{print $3}'` -- GitLab From 7543658c5a6024e511464de2c79160959c0c26f9 Mon Sep 17 00:00:00 2001 From: Ulrich Schwickerath <Ulrich.Schwickerath@cern.ch> Date: Fri, 29 Nov 2024 13:49:58 +0100 Subject: [PATCH 2/2] remove traces of removed libraries --- CI/al8_32.yml | 1 + CI/al9_32.yml | 1 + make_openphigs | 4 ---- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/CI/al8_32.yml b/CI/al8_32.yml index 0cff5d31..93eee88d 100644 --- a/CI/al8_32.yml +++ b/CI/al8_32.yml @@ -177,6 +177,7 @@ tests_al8_32: before_script: - umask 022 - dnf -y install gcc-c++ file libepoxy.i686 libepoxy-devel.i686 tcsh + - export LEGACY=' -m32 ' dependencies: - cernlib_al8_32 - dstana_al8_32 diff --git a/CI/al9_32.yml b/CI/al9_32.yml index 30e5024e..855ef9de 100644 --- a/CI/al9_32.yml +++ b/CI/al9_32.yml @@ -179,6 +179,7 @@ tests_al9_32: before_script: - umask 022 - dnf -y install gcc-c++ file libepoxy.i686 libepoxy-devel.i686 tcsh + - export LEGACY=' -m32 ' needs: - cernlib_al9_32 - dstana_al9_32 diff --git a/make_openphigs b/make_openphigs index a227459e..84d6634a 100755 --- a/make_openphigs +++ b/make_openphigs @@ -44,8 +44,6 @@ else if (( $rc )); then exit $rc; fi mkdir -p $OPENPHIGS/lib mkdir -p $OPENPHIGS/bin - mkdir -p $OPENPHIGS/include/GL - mkdir -p $OPENPHIGS/include/VK mkdir -p $OPENPHIGS/include/phigs/private mkdir -p $OPENPHIGS/include/phigs/util # install libraries @@ -54,8 +52,6 @@ else # install binaries cp -p build/tools/* $OPENPHIGS/bin # install headers - cp -p src/include/GL/*.h $OPENPHIGS/include/GL - cp -p src/include/Vk/*.h $OPENPHIGS/include/VK cp -p src/include/phigs/private/*.h $OPENPHIGS/include/phigs/private cp -p src/include/phigs/util/*.h $OPENPHIGS/include/phigs/util cp -p src/include/phigs/*.h $OPENPHIGS/include/phigs -- GitLab