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

Fixes #7992: Openssl build breaks debian packaging #890

Merged
merged 1 commit into from Mar 1, 2016
Merged

Fixes #7992: Openssl build breaks debian packaging #890

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 6 additions & 5 deletions rudder-agent/SOURCES/Makefile
View file
Open in desktop
Expand Up @@ -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

GET = $(PROXY_ENV) $(FETCH)
else
GET = $(PROXY_ENV) $(WGET)
GET_OPT = --wget
endif
endif

# Autodtect presence of gnu tools
TAR := $(shell type gtar >/dev/null 2>&1 && echo gtar || echo tar)
Expand All @@ -65,8 +63,8 @@ FIND := find
# Use parameters to guess what should be packaged
BUILD_DEPS :=
INSTALL_DEPS :=
# default: build openssl
ifneq (true,$(USE_SYSTEM_OPENSSL))
# default: do not build openssl
ifeq (false,$(USE_SYSTEM_OPENSSL))
BUILD_DEPS := $(BUILD_DEPS) build-ssl
INSTALL_DEPS := $(INSTALL_DEPS) install-ssl
OPENSSL_ARG := --with-openssl=$(CURDIR)/build-ssl/opt/rudder
Expand All @@ -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

SSL_CONFIGURE:=./Configure linux-generic32
else
SSL_CONFIGURE:=./config
endif
Expand Down