diff options
| author |   Patrick Ohly <patrick.ohly@intel.com> | 2017-01-27 11:11:21 +0100 |
|---|---|---|
| committer |   Martin Jansa <Martin.Jansa@gmail.com> | 2017-02-13 18:43:24 +0100 |
| commit | 960acf856f49e65ed31e096aa5fb4aeed237172e (patch) | |
| tree | 1f560d584fff372b91b38b6313282cc20f9a67d7 | |
| parent | ebef44963866d3231ccfe79d66d21c96ca0b4113 (diff) | |
| download | meta-openembedded-contrib-960acf856f49e65ed31e096aa5fb4aeed237172e.tar.gz | |
multipath-tools: fix building of shared objects
When -pie is in CFLAGS, it overrides the -shared compiler
flag, leading to link errors (undefined main) for shared
objects. Parameters must be ordered so that -shared comes
last.
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| -rw-r--r-- | meta-oe/recipes-support/multipath-tools/files/shared-libs-avoid-linking-.so-as-executable.patch | 49 | ||||
| -rw-r--r-- | meta-oe/recipes-support/multipath-tools/multipath-tools_git.bb | 1 |
2 files changed, 50 insertions, 0 deletions
diff --git a/meta-oe/recipes-support/multipath-tools/files/shared-libs-avoid-linking-.so-as-executable.patch b/meta-oe/recipes-support/multipath-tools/files/shared-libs-avoid-linking-.so-as-executable.patch new file mode 100644 index 0000000000..ae6bb89a77 --- /dev/null +++ b/meta-oe/recipes-support/multipath-tools/files/shared-libs-avoid-linking-.so-as-executable.patch @@ -0,0 +1,49 @@ +From 4311856200480288494df8df737f71ea316592d0 Mon Sep 17 00:00:00 2001 +From: Patrick Ohly <patrick.ohly@intel.com> +Date: Thu, 26 Jan 2017 15:28:34 +0100 +Subject: [PATCH] shared libs: avoid linking .so as executable + +When the OE build systems sets CFLAGS including -pie, gcc overrides +the earlier -shared parameter and tries to link a binary, leading to +errors about missing functions like main(). + +Reordering the parameters so that -shared comes after CFLAGS +fixes this. + +Upstream-Status: Inappropriate [OE specific, -pie shouldn't be in CFLAGS?!] + +Signed-off-by: Patrick Ohly <patrick.ohly@intel.com> +--- + libmpathpersist/Makefile | 2 +- + libmultipath/Makefile | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/libmpathpersist/Makefile b/libmpathpersist/Makefile +index c4ec1c5..790692a 100644 +--- a/libmpathpersist/Makefile ++++ b/libmpathpersist/Makefile +@@ -20,7 +20,7 @@ all: $(LIBS) + + $(LIBS): + $(CC) -Wall -fPIC -c $(CFLAGS) *.c +- $(CC) -shared $(LIBDEPS) -Wl,-soname=$@ $(CFLAGS) -o $@ $(OBJS) ++ $(CC) $(LIBDEPS) $(CFLAGS) $(SHARED_FLAGS) -Wl,-soname=$@ -o $@ $(OBJS) + ln -s $(LIBS) $(DEVLIB) + $(GZIP) mpath_persistent_reserve_in.3 > mpath_persistent_reserve_in.3.gz + $(GZIP) mpath_persistent_reserve_out.3 > mpath_persistent_reserve_out.3.gz +diff --git a/libmultipath/Makefile b/libmultipath/Makefile +index fc0f3d6..2287d91 100644 +--- a/libmultipath/Makefile ++++ b/libmultipath/Makefile +@@ -55,7 +55,7 @@ endif + all: $(LIBS) + + $(LIBS): $(OBJS) +- $(CC) $(LDFLAGS) $(SHARED_FLAGS) -Wl,-soname=$@ $(CFLAGS) -o $@ $(OBJS) $(LIBDEPS) ++ $(CC) $(LDFLAGS) $(CFLAGS) $(SHARED_FLAGS) -Wl,-soname=$@ -o $@ $(OBJS) $(LIBDEPS) + ln -sf $@ $(DEVLIB) + + install: +-- +2.11.0 + diff --git a/meta-oe/recipes-support/multipath-tools/multipath-tools_git.bb b/meta-oe/recipes-support/multipath-tools/multipath-tools_git.bb index 6bd611895f..2ab4dad23f 100644 --- a/meta-oe/recipes-support/multipath-tools/multipath-tools_git.bb +++ b/meta-oe/recipes-support/multipath-tools/multipath-tools_git.bb @@ -11,6 +11,7 @@ SRC_URI = "git://git.opensvc.com/multipath-tools/.git;protocol=http \ file://always-use-libdevmapper-kpartx.patch \ file://do-not-link-libmpathpersist-to-TMPDIR.patch \ file://0001-multipathd.service-Error-fix.patch \ + file://shared-libs-avoid-linking-.so-as-executable.patch \ " # 0.5.0 # |