diff options
| author | Marc Kleine-Budde <mkl@pengutronix.de> | 2013-02-18 11:31:08 +0100 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2013-02-18 11:31:58 +0100 |
| commit | 8004c91a4b660cb7dd55640549507caf3bac7418 (patch) | |
| tree | 4320b71adebc80df6964b1f8cbf3a75830420798 /patches | |
| parent | ff8c3786f8b0369d1fe6f21d647b4d31b21dbe73 (diff) | |
| download | ptxdist-8004c91a4b660cb7dd55640549507caf3bac7418.tar.gz ptxdist-8004c91a4b660cb7dd55640549507caf3bac7418.tar.xz | |
libsemanage: fix parallel build for ruby wrapper aswell
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/libsemanage-2.1.9/0004-makefile-add-a-dependency-from-wrapper-libs-to-.so.patch (renamed from patches/libsemanage-2.1.9/0004-makefile-add-a-dependency-from-pywrap-lib-to-.so.patch) | 18 | ||||
| -rw-r--r-- | patches/libsemanage-2.1.9/series | 4 |
2 files changed, 13 insertions, 9 deletions
diff --git a/patches/libsemanage-2.1.9/0004-makefile-add-a-dependency-from-pywrap-lib-to-.so.patch b/patches/libsemanage-2.1.9/0004-makefile-add-a-dependency-from-wrapper-libs-to-.so.patch index cc22a249d..b5472d07c 100644 --- a/patches/libsemanage-2.1.9/0004-makefile-add-a-dependency-from-pywrap-lib-to-.so.patch +++ b/patches/libsemanage-2.1.9/0004-makefile-add-a-dependency-from-wrapper-libs-to-.so.patch @@ -1,19 +1,19 @@ From: Marc Kleine-Budde <mkl@pengutronix.de> Date: Wed, 13 Feb 2013 23:55:24 +0100 -Subject: [PATCH] makefile: add a dependency from pywrap lib to .so +Subject: [PATCH] makefile: add a dependency from wrapper libs to .so -...otherwise in parallel builds the pywrap might get linked to the .a. +...otherwise in parallel builds the wrapper might get linked to the .a. Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> --- - src/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + src/Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Makefile b/src/Makefile -index 5d0e4b7..4aa6b0c 100644 +index 5d0e4b7..99a286f 100644 --- a/src/Makefile +++ b/src/Makefile -@@ -81,7 +81,7 @@ $(SWIGLOBJ): $(SWIGCOUT) +@@ -81,10 +81,10 @@ $(SWIGLOBJ): $(SWIGCOUT) $(SWIGRUBYLOBJ): $(SWIGRUBYCOUT) $(CC) $(CFLAGS) $(SWIG_CFLAGS) $(RUBYINC) -fPIC -DSHARED -c -o $@ $< @@ -21,4 +21,8 @@ index 5d0e4b7..4aa6b0c 100644 +$(SWIGSO): $(SWIGLOBJ) $(LIBSO) $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $< -L. -lsemanage - $(SWIGRUBYSO): $(SWIGRUBYLOBJ) +-$(SWIGRUBYSO): $(SWIGRUBYLOBJ) ++$(SWIGRUBYSO): $(SWIGRUBYLOBJ) $(LIBSO) + $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -L. -lsemanage + + $(LIBA): $(OBJS) diff --git a/patches/libsemanage-2.1.9/series b/patches/libsemanage-2.1.9/series index 53c6667ab..5da0946d4 100644 --- a/patches/libsemanage-2.1.9/series +++ b/patches/libsemanage-2.1.9/series @@ -3,5 +3,5 @@ 0001-makefile-remove-host-path-from-list-of-header-search.patch 0002-makefile-remove-host-path-from-list-of-linker-search.patch 0003-makefile-use-python-config-instead-of-pkg-config.patch -0004-makefile-add-a-dependency-from-pywrap-lib-to-.so.patch -# 1c717182218fb96b6110fc3700b8b470 - git-ptx-patches magic +0004-makefile-add-a-dependency-from-wrapper-libs-to-.so.patch +# 5e597b81d3eb60a9bd3df62a5143fe4d - git-ptx-patches magic |