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

Fixes #7992: Openssl build breaks debian packaging #890

Conversation

peckpeck
Copy link
Member

@@ -45,14 +45,12 @@ FETCH = fetch -q -o
ifneq (,$(wildcard /usr/bin/curl))
GET = $(PROXY_ENV) $(CURL)
GET_OPT = --curl
else
ifneq (,$(wildcard /usr/bin/fetch))
else ifneq (,$(wildcard /usr/bin/fetch))
Copy link
Member Author

Choose a reason for hiding this comment

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

This is just the correct way to write elsif in makefiles

@peckpeck
Copy link
Member Author

peckpeck commented Mar 1, 2016

PR updated

@peckpeck peckpeck force-pushed the bug_7992/openssl_build_breaks_debian_packaging branch from 9ba1039 to 6e31f34 Compare March 1, 2016 10:38
@@ -90,6 +88,9 @@ endif
# Hack needed because openssl is not guessing correctly the architecture on solaris 32bits
ifeq (i386-pc-solaris2.10,$(shell ./config.guess))
SSL_CONFIGURE:=./Configure solaris-x86-gcc
# Hack needed because openssl is not guessing correctly the architecture on debian 32 bits chroot
else ifeq (i386,$(shell [ -x /usr/bin/dpkg ] && dpkg --print-architecture))
Copy link
Member

Choose a reason for hiding this comment

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

If /usr/bin/dpkg does not exist, this will return 1. Will make complain?

Copy link
Member Author

Choose a reason for hiding this comment

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

No, it will just ignore it

jooooooon added a commit that referenced this pull request Mar 1, 2016
…ebian_packaging

Fixes #7992: Openssl build breaks debian packaging
@jooooooon jooooooon merged commit cea8fbd into Normation:master Mar 1, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants