Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated oracle OCCI which is build with new C++ ABI #4645

Merged
merged 1 commit into from
Jan 22, 2019
Merged

Updated oracle OCCI which is build with new C++ ABI #4645

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions cmssw-tool-conf.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,6 @@ Requires: igprof-toolfile
Requires: dmtcp-toolfile
Requires: tkonlinesw-toolfile
Requires: oracle-toolfile
Requires: cms_oracleocci_abi_hack-toolfile
Requires: cuda-toolfile
Requires: cuda-gdb-wrapper-toolfile
Requires: cub-toolfile
Expand All @@ -183,7 +182,6 @@ Requires: glibc-toolfile
%else
Requires: tkonlinesw-fake-toolfile
Requires: oracle-fake-toolfile
Requires: cms_oracleocci_abi_hack-fake-toolfile
%endif
%endif

Expand Down
6 changes: 3 additions & 3 deletions oracle-fake-toolfile.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
### RPM external oracle-fake-toolfile 1.0
### RPM external oracle-fake-toolfile 2.0
Requires: oracle-fake
%prep

Expand All @@ -25,8 +25,8 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/oracle.xml
</tool>
EOF_TOOLFILE

cat << \EOF_TOOLFILE >%i/etc/scram.d/oracleocci-official.xml
<tool name="oracleocci-official" version="@TOOL_VERSION@">
cat << \EOF_TOOLFILE >%i/etc/scram.d/oracleocci.xml
<tool name="oracleocci" version="@TOOL_VERSION@">
<lib name="occi"/>
<use name="oracle"/>
</tool>
Expand Down
6 changes: 3 additions & 3 deletions oracle-toolfile.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
### RPM external oracle-toolfile 1.0
### RPM external oracle-toolfile 2.0
Requires: oracle
%prep

Expand Down Expand Up @@ -27,8 +27,8 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/oracle.xml
</tool>
EOF_TOOLFILE

cat << \EOF_TOOLFILE >%i/etc/scram.d/oracleocci-official.xml
<tool name="oracleocci-official" version="@TOOL_VERSION@">
cat << \EOF_TOOLFILE >%i/etc/scram.d/oracleocci.xml
<tool name="oracleocci" version="@TOOL_VERSION@">
<lib name="occi"/>
<use name="oracle"/>
</tool>
Expand Down
3 changes: 3 additions & 0 deletions oracle.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ Source3: %{http_mirror}/%{client_arch}/instantclient-odbc-%{client_arch}-%{realv
Source4: %{http_mirror}/%{client_arch}/instantclient-sdk-%{client_arch}-%{realversion}.zip
Source5: %{http_mirror}/%{client_arch}/instantclient-sqlplus-%{client_arch}-%{realversion}.zip
Source6: %{http_mirror}/%{client_arch}/instantclient-tools-%{client_arch}-%{realversion}.zip
Source7: http://cmsrep.cern.ch/cmssw/oracle-mirror/%{client_arch}/libocci.so.12.1.zip

Source10: oracle-license

Expand All @@ -46,6 +47,8 @@ rm -rf instantclient_*
%setup -D -T -b 4 -n %{client_dir} instantclient-sdk-%{client_arch}-%{realversion}.zip
%setup -D -T -b 5 -n %{client_dir} instantclient-sqlplus-%{client_arch}-%{realversion}.zip
%setup -D -T -b 6 -n %{client_dir} instantclient-tools-linux-%{client_arch}-%{realversion}.zip
#OCCI lib with new C++ ABI (GCC 5 and above)
%setup -D -T -b 7 -n %{client_dir} libocci.so.12.1.zip

%build
chmod a-x sdk/include/*.h *.sql
Expand Down