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.

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

odpic: 2.4.2 -> 3.1.0 #55049

Merged
merged 1 commit into from Feb 11, 2019
Merged

odpic: 2.4.2 -> 3.1.0 #55049

merged 1 commit into from Feb 11, 2019

Conversation

flokli
Copy link
Contributor

@flokli flokli commented Feb 1, 2019

Motivation for this change

This bumps odpic to 3.1.0 - with the current version in unstable,
python*Packages.cx_oracle fails to compile due to some types missing in
our version of odpic:

gcc -Wno-unused-result -Wsign-compare -DNDEBUG -g -fwrapv -O3 -Wall -fPIC -DCXO_BUILD_VERSION=7.0.0 -I/nix/store/43lwkzvxwcymshchqhhafr2rnw2kk8ll-odpic-2.4.2/include -I/nix/store/ydk0mfpvn9smcmn72wc9i20slv1d2b79-python3-3.7.2/include/python3.7m -c src/cxoBuffer.c -o build/temp.linux-x86_64-3.7/src/cxoBuffer.o
In file included from src/cxoBuffer.c:17:0:
src/cxoModule.h:372:5: error: unknown type name 'dpiSodaColl'
     dpiSodaColl *handle;
     ^~~~~~~~~~~
src/cxoModule.h:379:5: error: unknown type name 'dpiSodaDb'
     dpiSodaDb *handle;
     ^~~~~~~~~
src/cxoModule.h:386:5: error: unknown type name 'dpiSodaDoc'
     dpiSodaDoc *handle;
     ^~~~~~~~~~
src/cxoModule.h:392:5: error: unknown type name 'dpiSodaDocCursor'
     dpiSodaDocCursor *handle;
     ^~~~~~~~~~~~~~~~
src/cxoModule.h:398:5: error: unknown type name 'dpiSodaOperOptions'
     dpiSodaOperOptions options;
     ^~~~~~~~~~~~~~~~~~
src/cxoModule.h:492:9: error: unknown type name 'dpiSodaColl'; did you mean 'dpiPool'?
         dpiSodaColl *handle);
         ^~~~~~~~~~~
         dpiPool
src/cxoModule.h:496:49: error: unknown type name 'dpiSodaDoc'; did you mean 'cxoSodaDoc'?
 cxoSodaDoc *cxoSodaDoc_new(cxoSodaDatabase *db, dpiSodaDoc *handle);
                                                 ^~~~~~~~~~
                                                 cxoSodaDoc
src/cxoModule.h:499:9: error: unknown type name 'dpiSodaDocCursor'; did you mean 'cxoSodaDocCursor'?
         dpiSodaDocCursor *handle);
         ^~~~~~~~~~~~~~~~
         cxoSodaDocCursor

cc @gjmoed

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

This bumps odpic to 3.1.0 - with the current version in unstable,
python*Packages.cx_oracle fails to compile due to some types missing in
our version of odpic:

```
gcc -Wno-unused-result -Wsign-compare -DNDEBUG -g -fwrapv -O3 -Wall -fPIC -DCXO_BUILD_VERSION=7.0.0 -I/nix/store/43lwkzvxwcymshchqhhafr2rnw2kk8ll-odpic-2.4.2/include -I/nix/store/ydk0mfpvn9smcmn72wc9i20slv1d2b79-python3-3.7.2/include/python3.7m -c src/cxoBuffer.c -o build/temp.linux-x86_64-3.7/src/cxoBuffer.o
In file included from src/cxoBuffer.c:17:0:
src/cxoModule.h:372:5: error: unknown type name 'dpiSodaColl'
     dpiSodaColl *handle;
     ^~~~~~~~~~~
src/cxoModule.h:379:5: error: unknown type name 'dpiSodaDb'
     dpiSodaDb *handle;
     ^~~~~~~~~
src/cxoModule.h:386:5: error: unknown type name 'dpiSodaDoc'
     dpiSodaDoc *handle;
     ^~~~~~~~~~
src/cxoModule.h:392:5: error: unknown type name 'dpiSodaDocCursor'
     dpiSodaDocCursor *handle;
     ^~~~~~~~~~~~~~~~
src/cxoModule.h:398:5: error: unknown type name 'dpiSodaOperOptions'
     dpiSodaOperOptions options;
     ^~~~~~~~~~~~~~~~~~
src/cxoModule.h:492:9: error: unknown type name 'dpiSodaColl'; did you mean 'dpiPool'?
         dpiSodaColl *handle);
         ^~~~~~~~~~~
         dpiPool
src/cxoModule.h:496:49: error: unknown type name 'dpiSodaDoc'; did you mean 'cxoSodaDoc'?
 cxoSodaDoc *cxoSodaDoc_new(cxoSodaDatabase *db, dpiSodaDoc *handle);
                                                 ^~~~~~~~~~
                                                 cxoSodaDoc
src/cxoModule.h:499:9: error: unknown type name 'dpiSodaDocCursor'; did you mean 'cxoSodaDocCursor'?
         dpiSodaDocCursor *handle);
         ^~~~~~~~~~~~~~~~
         cxoSodaDocCursor
```
@flokli
Copy link
Contributor Author

flokli commented Feb 2, 2019

It seems odpic-raw does not yet work with odpic-3.1.0. I opened an issue upstream: leptonyu/odpic-raw#13

@flokli flokli mentioned this pull request Feb 4, 2019
10 tasks
@flokli
Copy link
Contributor Author

flokli commented Feb 11, 2019

No feedback from upstream.

As the python bindings are currently broken, but seem to be more actively used, merging this bump in.
If somebody wants to get odpic-raw working, he could either override odpic with an older version, or work with upstream.

@flokli flokli merged commit 49d46a4 into NixOS:master Feb 11, 2019
@flokli flokli deleted the odpic-3.1.0 branch February 11, 2019 21:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants