mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-04-19 23:28:38 +00:00
Code Issues Projects Releases Wiki Activity

multipath-tools: fix building of shared objects

Browse Source 
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>
This commit is contained in:
Patrick Ohly
2017-01-27 11:11:21 +01:00
committed by Martin Jansa
parent ebef449638
commit 960acf856f
2 changed files with 50 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
meta-oe/recipes-support/multipath-tools/files/shared-libs-avoid-linking-.so-as-executable.patch Normal file
View File

@@ -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

1
meta-oe/recipes-support/multipath-tools/multipath-tools_git.bb
View File

@@ -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
#