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 #12278: Cleanup build options and build results #1533

Merged
merged 1 commit into from Mar 26, 2018
Merged

Fixes #12278: Cleanup build options and build results #1533

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
16 changes: 11 additions & 5 deletions rudder-agent/SOURCES/Makefile
View file
Open in desktop
Expand Up @@ -453,11 +453,12 @@ rudder-agent.cron: rudder-sources

# TODO generalize install in build-* to allow caching
build-ssl: openssl-source
cd openssl-source && $(SSL_CONFIGURE) -fPIC --prefix=$(RUDDER_DIR) --openssldir=$(RUDDER_DIR)/openssl shared
cd openssl-source && $(SSL_CONFIGURE) -fPIC --prefix=$(RUDDER_DIR) --openssldir=$(RUDDER_DIR)/openssl shared no-idea no-rc5 no-ssl3 no-dtls no-psk no-srp no-engine
cd openssl-source && $(MAKE)
slibclean >/dev/null 2>&1 || true
# install to a temporary location is needed to build cfengine
cd openssl-source && $(MAKE) install INSTALL_PREFIX=$(CURDIR)/build-ssl
cd $(CURDIR)//build-ssl/$(RUDDER_DIR) && rm -rf bin/c_rehash lib/libssl.a lib/libcrypto.a lib/pkgconfig/openssl.pc ssl/misc/CA.pl ssl/misc/tsget ssl/openssl.cnf.dist
Copy link
Member

Choose a reason for hiding this comment

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

// -> /


build-lmdb: lmdb-source
cd lmdb-source/libraries/liblmdb && $(MAKE)
Expand All @@ -467,30 +468,35 @@ build-lmdb: lmdb-source
cd build-lmdb/opt/rudder && mkdir -p bin lib include man/man1
# install to a temporary location is needed to build cfengine
cd lmdb-source/libraries/liblmdb && $(MAKE) install prefix=$(RUDDER_DIR) DESTDIR=$(CURDIR)/build-lmdb
cd $(CURDIR)/build-lmdb/$(RUDDER_DIR) && rm -rf lib/liblmdb.la

build-pcre: pcre-source
cd pcre-source && ./configure --disable-cpp --enable-utf8 --enable-unicode-properties --prefix=$(RUDDER_DIR)
cd pcre-source && ./configure --disable-cpp --enable-utf8 --enable-unicode-properties --disable-cpp --prefix=$(RUDDER_DIR)
cd pcre-source && $(MAKE)
# install to a temporary location is needed to build cfengine
cd pcre-source && $(MAKE) install DESTDIR=$(CURDIR)/build-pcre
cd $(CURDIR)/build-pcre/$(RUDDER_DIR) && rm -rf bin/pcregrep bin/pcretest lib/libpcre.a lib/libpcre.la lib/libpcreposix.a ib/libpcreposix.la share/man share/doc

build-curl: curl-source
cd curl-source && ./configure --prefix=$(RUDDER_DIR) $(OPENSSL_ARG)
cd curl-source && ./configure --prefix=$(RUDDER_DIR) $(OPENSSL_ARG) --disable-ldap --disable-ldaps --without-axtls --without-cyassl --without-darwinssl --without-egd-socket --without-gnutls --without-gssapi --without-libmetalink --without-librtmp --without-nss --without-polarssl --without-winidn --without-winssl
cd curl-source && $(MAKE)
# install to a temporary location is needed to build cfengine
cd curl-source && $(MAKE) install DESTDIR=$(CURDIR)/build-curl
cd $(CURDIR)/build-curl/$(RUDDER_DIR) && rm -rf share lib/libcurl.a lib/libcurl.la

build-yaml: yaml-source
cd yaml-source && ./configure --prefix=$(RUDDER_DIR)
cd yaml-source && ./configure --prefix=$(RUDDER_DIR) --enable-gettext=no
cd yaml-source && $(MAKE)
# install to a temporary location is needed to build cfengine
cd yaml-source && $(MAKE) install DESTDIR=$(CURDIR)/build-yaml
cd $(CURDIR)/build-yaml/$(RUDDER_DIR) && rm -rf lib/*.a lib/*.la libexec

build-xml: xml-source
cd xml-source && ./configure --prefix=$(RUDDER_DIR)
cd xml-source && ./configure --prefix=$(RUDDER_DIR) --without-xpath --without-c14n --without-catalog --without-debug --without-docbook --without-ftp --without-http --without-html --without-iconv --without-python --enable-shared --disable-static
cd xml-source && $(MAKE)
# install to a temporary location is needed to build cfengine
cd xml-source && $(MAKE) install DESTDIR=$(CURDIR)/build-xml
cd $(CURDIR)/build-xml/$(RUDDER_DIR) && rm -rf bin/xmlcatalog bin/xmllint lib/libxml2.a lib/libxml2.la lib/xml2Conf.sh lib/cmake share

build-cfengine: get-flags $(BUILD_DEPS) cfengine-source build-cfengine-stamp
build-cfengine-stamp:
Expand Down