Fixes #12278: Cleanup build options and build results

Normation · Mar 26, 2018 · 8e843fc · 8e843fc
1 parent f493c96
commit 8e843fc
Showing 1 changed file with 11 additions and 5 deletions.
diff --git a/rudder-agent/SOURCES/Makefile b/rudder-agent/SOURCES/Makefile
@@ -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
 
 build-lmdb: lmdb-source
 	cd lmdb-source/libraries/liblmdb && $(MAKE)
@@ -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: