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

Jump to bottom

libosmocore: 0.9.6 -> 0.12.1 #51742

Merged
merged 2 commits into from Dec 14, 2018
Merged

libosmocore: 0.9.6 -> 0.12.1 #51742

merged 2 commits into from Dec 14, 2018

Conversation

markuskowa
Copy link
Member

@markuskowa markuskowa commented Dec 8, 2018 •
edited

Motivation for this change

Update the rather old version. Should now be picked up by auto updater.

Things done

Add gnutls to buildInputs

  • 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.

@Mic92
Copy link
Member

Mic92 commented Dec 8, 2018

Did libosmocore build on macOS before?

@markuskowa
Copy link
Member Author

Yes, the old version did build on darwin.

@markuskowa
Copy link
Member Author

Seems to be problem with time.h on darwin: error: unknown type name 'clockid_t'; did you mean 'clock_t'?

@Mic92
Copy link
Member

Mic92 commented Dec 8, 2018

A fix would be:

+#if defined(__APPLE__)
+typedef int clockid_t;
+#endif

in the header file in question

@Mic92
Copy link
Member

Mic92 commented Dec 8, 2018 •
edited

I do not have time to signup in their gerrit, but I left a note here:

osmocom/libosmocore@87fade8#r31608336

@markuskowa
Copy link
Member Author

Thanks for the patch. It seems to work but now there are other errors on darwin.

@Mic92
Copy link
Member

Mic92 commented Dec 8, 2018

I got the intention upstream is not really targeting macOS. Maybe it should be disabled then.

@markuskowa
Copy link
Member Author

@GrahamcOfBorg build gnuradio-with-plugins

@markuskowa
Copy link
Member Author

@GrahamcOfBorg build gnuradio-with-packages

@markuskowa
Copy link
Member Author

@GrahamcOfBorg build gnuradio-with-packages

@markuskowa
Copy link
Member Author

@GrahamcOfBorg build gnuradio-with-packages

@markuskowa
Copy link
Member Author

It is cleaned up now. I also moved all plugins from gnuradio that don't build on darwin into an optionals isLinux statement. The build failures on darwin and aarch64 are now due to other dependencies.

@Mic92
Copy link
Member

Mic92 commented Dec 9, 2018

cc @lukeadams since you enabled macOS support in the first place.
The bug is now also tracked upstream: https://osmocom.org/issues/3722

@markuskowa
Copy link
Member Author

This PR unbreaks rtl-sdr on darwin #51777. That should help also making gnuradio work on darwin again.

@markuskowa
libosmocore: 0.9.6 -> 0.12.1
0534ed2 
Add gnutls to buildInputs
@markuskowa
gnuradio-with-packages: build gsm and limesdr only on linux
09f9e54 
This allows to build gnuradio-with-packages again on darwin

* libosmocore: remove darwin from platforms
* gnuradio-limesdr: remove darwin from platforms
@markuskowa
Copy link
Member Author

rebased
@GrahamcOfBorg build gnuradio-with-packages

@markuskowa
Copy link
Member Author

OK, now valgrind is blocking the darwin build.

@markuskowa markuskowa merged commit 052379c into NixOS:master Dec 14, 2018
@markuskowa markuskowa deleted the upd-osmocore branch May 25, 2021 08:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
8.has: clean-up 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@markuskowa @Mic92 @GrahamcOfBorg