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

pkg/relic: Update to new upstream and remove now obsolete patches #6965

Merged
merged 1 commit into from
Jun 20, 2018
Merged

pkg/relic: Update to new upstream and remove now obsolete patches #6965

merged 1 commit into from
Jun 20, 2018

Conversation

tfar
Copy link
Contributor

@tfar tfar commented Apr 25, 2017

No description provided.

@smlng smlng self-requested a review April 25, 2017 18:36
@BytesGalore BytesGalore added the CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR label Apr 25, 2017
@smlng smlng added Type: enhancement The issue suggests enhanceable parts / The PR enhances parts of the codebase / documentation CI: needs squashing Commits in this PR need to be squashed; If set, CI systems will mark this PR as unmergable Area: pkg Area: External package ports labels Apr 25, 2017
smlng
smlng reviewed May 8, 2017
View reviewed changes
pkg/relic/Makefile Outdated
cd "$(PKG_BUILDDIR)" && perl $(PKG_DIR)/generate-cmake-xcompile.perl > comp-options.cmake

$(PKG_BUILDDIR)/Makefile: $(PKG_BUILDDIR)/comp-options.cmake
cd "$(PKG_BUILDDIR)" && COMP="$(filter-out -Werror=old-style-definition -Werror=strict-prototypes, $(CFLAGS) ) " cmake -DCMAKE_TOOLCHAIN_FILE=comp-options.cmake -DCHECK=off -DTESTS=0 -DBENCH=0 -DSHLIB=off -Wno-dev $(RELIC_CONFIG_FLAGS) .

CFLAGS += -Wno-gnu-zero-variadic-macro-arguments -Wno-unused-function
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you might want to have these CFLAGs to work around the compile errors?!

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@tfar any progress? I just tested and the only problem is with variadic-macros, so if you (re)add the corresponding CFLAGS (as above) to disable the errors it works fine.

If you don't find the time right now to work on this, I'm willing to overtake - if you don't mind?

@smlng smlng mentioned this pull request May 12, 2017
Closed
@smlng smlng mentioned this pull request Jan 23, 2018
Merged
@kaspar030 kaspar030 removed this from the Release 2018.04 milestone Apr 16, 2018
@tcschmidt
Copy link
Member

@tfar can you fix this?

@tcschmidt tcschmidt requested a review from cgundogan May 25, 2018 23:25
@tcschmidt
Copy link
Member

@smlng @cgundogan can we get this to move forward?

cgundogan
cgundogan reviewed Jun 11, 2018
View reviewed changes
pkg/relic/Makefile Outdated
@@ -1,6 +1,6 @@
PKG_NAME=relic
PKG_URL=https://github.com/relic-toolkit/relic.git
PKG_VERSION=cdcfaeef101d18c3231c3b46359c519dd72682e8
PKG_URL=https://github.com/tfar/relic.git
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@tfar would you be fine having the relic specific branch under the RIOT organization instead of keeping it in your private Github account? This way, every RIOT maintainer would have write access to it for future changes/fixes,

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure happy with that. Shall I clone it under the RIOT org?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ping @cgundogan

@tfar
Copy link
Contributor Author

tfar commented Jun 19, 2018 •
edited
Loading

Changed this to use upstream RELIC master, which should include the RIOT specific changes of my custom branch and #9241 . How about me rebasing this on master and then running the CI tests?

@cgundogan
Copy link
Member

@tfar yup, rebase + squash + a proper commit message (:

@tfar tfar force-pushed the sandbox/2017/relic-package-patches-in-riot-specific-branch branch 3 times, most recently from 5fe91e2 to 0e5d085 Compare June 20, 2018 15:15
@tfar
pkg/relic: Update to new upstream and remove patches
3288f7a 
The removed patches have been applied upstream.
@tfar tfar force-pushed the sandbox/2017/relic-package-patches-in-riot-specific-branch branch from 0e5d085 to 3288f7a Compare June 20, 2018 20:09
@tfar
Copy link
Contributor Author

tfar commented Jun 20, 2018

Squashed the changed. The needs squashing label can be removed.

@tfar tfar changed the title Use RIOT specific RELIC branch for RIOT RELIC package pkg/relic: Update to new upstream and remove now obsolete patches Jun 20, 2018
@cgundogan cgundogan added CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR and removed CI: needs squashing Commits in this PR need to be squashed; If set, CI systems will mark this PR as unmergable CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR labels Jun 20, 2018
cgundogan
cgundogan approved these changes Jun 20, 2018
View reviewed changes
Copy link
Member

@cgundogan cgundogan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK

@cgundogan cgundogan added CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR and removed CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR labels Jun 20, 2018
@cgundogan
Copy link
Member

Murdock finally agrees! GO

@cgundogan cgundogan merged commit e0a6c07 into RIOT-OS:master Jun 20, 2018
@cgundogan cgundogan mentioned this pull request Jun 20, 2018
Closed
@cladmi cladmi added this to the Release 2018.07 milestone Jul 10, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@smlng smlng smlng left review comments

@tcschmidt tcschmidt tcschmidt left review comments

@cgundogan cgundogan cgundogan approved these changes

Assignees

@smlng smlng

Labels
Area: pkg Area: External package ports CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR Type: enhancement The issue suggests enhanceable parts / The PR enhances parts of the codebase / documentation
Projects
None yet
Milestone
Release 2018.07
Development

Successfully merging this pull request may close these issues.
8 participants
@tfar @tcschmidt @cgundogan @smlng @cladmi @aabadie @BytesGalore @kaspar030