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

Fix build with NORM enabled on FreeBSD. #2066

Merged
merged 2 commits into from
Jul 27, 2016
Merged

Conversation

camachat
Copy link
Contributor

Needs "-L${norm_path}/lib" in order to make "-lnorm" works properly.

@coveralls
Copy link

coveralls commented Jul 27, 2016

Coverage Status

Coverage increased (+0.06%) to 75.374% when pulling 07d00b3 on camachat:master into 3814b87 on zeromq:master.

@bluca bluca merged commit 5e68417 into zeromq:master Jul 27, 2016
@bluca
Copy link
Member

bluca commented Jul 27, 2016

Thanks!

For your next contributions, could you please follow the contributing guidelines for the git commit message?

Problem: X is broken

Solution: do Y and Z to fix X

http://zeromq.org/docs:contributing

Also next time please rebase away recursive merge nodes.

If you have only one commit, you can do it by:

git remote add upstream git@github.com:zeromq/libzmq.git
git fetch upstream
git rebase --onto upstream/master HEAD^
git push -f

If you have more than 1 commit, just add more ^ symbols.

@camachat
Copy link
Contributor Author

Thanks, will do.

uqs pushed a commit to freebsd/freebsd-ports that referenced this pull request Aug 11, 2016
- Add NORM option and helpers [1], no default.
- Backport upstream pull request #2066. [1][2]
- Override default -Werror in build.

[2] zeromq/libzmq#2066

PR:		211306 (part 1 of 2) [1]
Submitted by:	Eric Camachat <eric camachat org> [1]
MFH:		2016Q3


git-svn-id: svn+ssh://svn.freebsd.org/ports/head@420056 35697150-7ecd-e111-bb59-0022644237b5
uqs pushed a commit to freebsd/freebsd-ports that referenced this pull request Aug 11, 2016
- Add NORM option and helpers [1], no default.
- Backport upstream pull request #2066. [1][2]
- Override default -Werror in build.

[2] zeromq/libzmq#2066

PR:		211306 (part 1 of 2) [1]
Submitted by:	Eric Camachat <eric camachat org> [1]

 - Resolve conflict from missing r418449

Approved by:	ports-secteam (blanket)
uqs pushed a commit to freebsd/freebsd-ports that referenced this pull request Aug 11, 2016
- Add NORM option and helpers [1], no default.
- Backport upstream pull request #2066. [1][2]
- Override default -Werror in build.

[2] zeromq/libzmq#2066

PR:		211306 (part 1 of 2) [1]
Submitted by:	Eric Camachat <eric camachat org> [1]
MFH:		2016Q3
uqs pushed a commit to freebsd/freebsd-ports that referenced this pull request Dec 2, 2016
- Add NORM option and helpers [1], no default.
- Backport upstream pull request #2066. [1][2]
- Override default -Werror in build.

[2] zeromq/libzmq#2066

PR:		211306 (part 1 of 2) [1]
Submitted by:	Eric Camachat <eric camachat org> [1]

 - Resolve conflict from missing r418449

Approved by:	ports-secteam (blanket)
uqs pushed a commit to freebsd/freebsd-ports that referenced this pull request Apr 1, 2021
- Add NORM option and helpers [1], no default.
- Backport upstream pull request #2066. [1][2]
- Override default -Werror in build.

[2] zeromq/libzmq#2066

PR:		211306 (part 1 of 2) [1]
Submitted by:	Eric Camachat <eric camachat org> [1]

 - Resolve conflict from missing r418449

Approved by:	ports-secteam (blanket)
svmhdvn pushed a commit to svmhdvn/freebsd-ports that referenced this pull request Jan 10, 2024
- Add NORM option and helpers [1], no default.
- Backport upstream pull request #2066. [1][2]
- Override default -Werror in build.

[2] zeromq/libzmq#2066

PR:		211306 (part 1 of 2) [1]
Submitted by:	Eric Camachat <eric camachat org> [1]
MFH:		2016Q3
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants