Skip to content

Commit

Permalink
Fixes #13817: Removing -fPIE breaks lmdb build
Browse files Browse the repository at this point in the history
  • Loading branch information
amousset committed Nov 13, 2018
1 parent 895f70d commit 60fabe2
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions rudder-agent/SOURCES/Makefile
Expand Up @@ -533,8 +533,9 @@ build-ssl: openssl-source
cd openssl-source && $(MAKE) install DESTDIR=$(CURDIR)/build-ssl

build-lmdb: lmdb-source
# lmdb doesn't support CFLAGS (it overrides its own) so we pass XCFLAGS instead, that is appended to the oroginal ones
cd lmdb-source/libraries/liblmdb && $(MAKE) XCFLAGS="$(BUILD_CFLAGS) $(SECURE_CFLAGS)" LDFLAGS="-Wl,-R$(RUDDER_DIR)/lib $(BUILD_LDFLAGS) $(SECURE_LDFLAGS)"
# lmdb doesn't support CFLAGS (it overrides its own) so we pass XCFLAGS instead, that is appended to the original ones
# we need to add -fPIE to be able to build static lib (which we do not use)
cd lmdb-source/libraries/liblmdb && $(MAKE) XCFLAGS="$(BUILD_CFLAGS) $(SECURE_CFLAGS) -fPIE" LDFLAGS="-Wl,-R$(RUDDER_DIR)/lib $(BUILD_LDFLAGS) $(SECURE_LDFLAGS)"
# need a temporary install for cfengine
mkdir -p build-lmdb$(RUDDER_DIR)
# LMDB's Makefile does not know how to create destination files, do it ourselves
Expand Down

0 comments on commit 60fabe2

Please sign in to comment.