From: George Joseph Date: Mon, 4 Feb 2019 13:09:57 +0000 (-0700) Subject: bundled-jansson: On OpenSuse Leap libjansson.a was placed in lib64 X-Git-Tag: 16.2.0-rc1~5^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=70fa6e6955ea62f9036f775861cc7425c813c050;p=thirdparty%2Fasterisk.git bundled-jansson: On OpenSuse Leap libjansson.a was placed in lib64 On OpenSuse Leap, libjansson.a is installed in third-party/jansson/dest/lib64 instead of lib (which is where the top-level makeopts looks). This causes a link failure. * Updated jansson/Makefile to add an explicit --libdir to force the installation to third-party/jansson/dest/lib. ASTERISK-28271 Reported by: David Wilcox Change-Id: Ibf8af75e5da13562105fcc39ed898c6ef0b5a5f3 --- diff --git a/third-party/jansson/Makefile b/third-party/jansson/Makefile index ca57b1a176..a81502c449 100644 --- a/third-party/jansson/Makefile +++ b/third-party/jansson/Makefile @@ -81,7 +81,8 @@ source/.unpacked: $(DOWNLOAD_DIR)/$(TARBALL_FILE) source/config.status: source/.unpacked Makefile.rules .rebuild_needed $(ECHO_PREFIX) Configuring - $(CMD_PREFIX) (cd source ; ./configure $(QUIET_CONFIGURE) $(JANSSON_CONFIG_OPTS) --disable-shared --enable-static --prefix=$(JANSSON_DIR)/dest) + $(CMD_PREFIX) (cd source ; ./configure $(QUIET_CONFIGURE) $(JANSSON_CONFIG_OPTS) --disable-shared \ + --enable-static --prefix=$(JANSSON_DIR)/dest --libdir=$(JANSSON_DIR)/dest/lib) configure: source/config.status