diff --git a/cms_oracleocci_abi_hack-fake-toolfile.spec b/cms_oracleocci_abi_hack-fake-toolfile.spec new file mode 100644 index 00000000000..a5b11f65504 --- /dev/null +++ b/cms_oracleocci_abi_hack-fake-toolfile.spec @@ -0,0 +1,36 @@ +### RPM cms cms_oracleocci_abi_hack-fake-toolfile 1.1 +Requires: cms_oracleocci_abi_hack-fake + +%define cms_oracleocci_libname cms_oracleocci_abi_hack +%define isdarwin %(case %{cmsos} in (osx*) echo 1 ;; (*) echo 0 ;; esac) +%define soext so +%if %isdarwin +%define soext dylib +%endif + +%prep + +%build + +%install + +mkdir -p %i/etc/scram.d +if [ -e ${CMS_ORACLEOCCI_ABI_HACK_FAKE_ROOT}/lib/lib%{cms_oracleocci_libname}.%{soext} ] ; then + export CMS_ORACLEOCCI_LIB='' + export CMS_ORACLEOCCI_LIBDIR='' + export CMS_ORACLEOCCI_LD_PRELOAD='' +fi +cat << \EOF_TOOLFILE >%i/etc/scram.d/oracleocci.xml + + @CMS_ORACLEOCCI_LIB@ + + + + + @CMS_ORACLEOCCI_LIBDIR@ + + @CMS_ORACLEOCCI_LD_PRELOAD@ + +EOF_TOOLFILE + +## IMPORT scram-tools-post diff --git a/cms_oracleocci_abi_hack-fake.spec b/cms_oracleocci_abi_hack-fake.spec new file mode 100644 index 00000000000..7bb4d087e8f --- /dev/null +++ b/cms_oracleocci_abi_hack-fake.spec @@ -0,0 +1,17 @@ +### RPM cms cms_oracleocci_abi_hack-fake 20180210 +%define tag 88b2a965305226df1822a14af8fe7174ee5f1614 +Source: git+https://github.com/cms-sw/cms_oracleocci_abi_hack.git?obj=master/%{tag}&export=%{n}-%{realversion}&output=/%{n}-%{realversion}.tgz +Requires: oracle-fake +BuildRequires: gmake + +%prep +%setup -n %{n}-%{realversion} + +%build +export INCLUDE_DIR=${ORACLE_FAKE_ROOT}/include +export LIB_DIR=${ORACLE_FAKE_ROOT}/lib +make %{makeprocesses} + +%install +[ -d build/lib ] && cp -r build/lib %{i}/lib +cp -r build/include %{i}/include diff --git a/cmssw-tool-conf.spec b/cmssw-tool-conf.spec index 9028585d6db..59d25660b19 100644 --- a/cmssw-tool-conf.spec +++ b/cmssw-tool-conf.spec @@ -187,6 +187,7 @@ Requires: glibc-toolfile %else Requires: tkonlinesw-fake-toolfile Requires: oracle-fake-toolfile +Requires: cms_oracleocci_abi_hack-fake-toolfile %endif %endif diff --git a/oracle-fake-toolfile.spec b/oracle-fake-toolfile.spec index a12ca19be7b..82dd1f90ab7 100644 --- a/oracle-fake-toolfile.spec +++ b/oracle-fake-toolfile.spec @@ -25,8 +25,8 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/oracle.xml EOF_TOOLFILE -cat << \EOF_TOOLFILE >%i/etc/scram.d/oracleocci.xml - +cat << \EOF_TOOLFILE >%i/etc/scram.d/oracleocci-official.xml +