diff options
| author | Marc Kleine-Budde <mkl@pengutronix.de> | 2013-02-18 11:24:03 +0100 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2013-02-18 11:29:08 +0100 |
| commit | ff8c3786f8b0369d1fe6f21d647b4d31b21dbe73 (patch) | |
| tree | 5bb090c19ff3770e6f2afea2cd6ba91d92623e4b /patches | |
| parent | 245f79f14c452c79cdb5990a281ec89ef53e53eb (diff) | |
| download | ptxdist-ff8c3786f8b0369d1fe6f21d647b4d31b21dbe73.tar.gz ptxdist-ff8c3786f8b0369d1fe6f21d647b4d31b21dbe73.tar.xz | |
libselinux: fix parallel building issue
Analogue to: "245f79f libsemanage: don't add 'all' to the make options"
It's implicit if nothing else is given, and 'pywrap' depends on anything that
is needed. If both 'all' and 'pywrap' are explicitly added libsemanage.so.1
and it files a build twice. This can cause random build error for parallel
building.
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/libselinux-2.1.12/0007-makefile-add-a-dependency-from-wrapper-libs-to-.so.patch | 37 | ||||
| -rw-r--r-- | patches/libselinux-2.1.12/series | 3 |
2 files changed, 39 insertions, 1 deletions
diff --git a/patches/libselinux-2.1.12/0007-makefile-add-a-dependency-from-wrapper-libs-to-.so.patch b/patches/libselinux-2.1.12/0007-makefile-add-a-dependency-from-wrapper-libs-to-.so.patch new file mode 100644 index 000000000..5d96f0cb2 --- /dev/null +++ b/patches/libselinux-2.1.12/0007-makefile-add-a-dependency-from-wrapper-libs-to-.so.patch @@ -0,0 +1,37 @@ +From: Marc Kleine-Budde <mkl@pengutronix.de> +Date: Mon, 18 Feb 2013 11:22:11 +0100 +Subject: [PATCH] makefile: add a dependency from wrapper libs to .so + +...otherwise in parallel builds the wrapper libs might get linked to the .a. + +Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> +--- + src/Makefile | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/Makefile b/src/Makefile +index e963009..dfa9060 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -106,10 +106,10 @@ $(SWIGLOBJ): $(SWIGCOUT) + $(SWIGRUBYLOBJ): $(SWIGRUBYCOUT) + $(CC) $(CFLAGS) $(SWIG_CFLAGS) $(RUBYINC) -fPIC -DSHARED -c -o $@ $< + +-$(SWIGSO): $(SWIGLOBJ) ++$(SWIGSO): $(SWIGLOBJ) $(LIBSO) + $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $< -L. -lselinux $(LDLIBS) + +-$(SWIGRUBYSO): $(SWIGRUBYLOBJ) ++$(SWIGRUBYSO): $(SWIGRUBYLOBJ) $(LIBSO) + $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -L. -lselinux $(LDLIBS) + + $(LIBA): $(OBJS) +@@ -129,7 +129,7 @@ selinuxswig_python_exception.i: ../include/selinux/selinux.h + $(AUDIT2WHYLOBJ): audit2why.c + $(CC) $(filter-out -Werror, $(CFLAGS)) $(PYINC) -fPIC -DSHARED -c -o $@ $< + +-$(AUDIT2WHYSO): $(AUDIT2WHYLOBJ) ++$(AUDIT2WHYSO): $(AUDIT2WHYLOBJ) $(LIBSO) + $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -L. -lselinux $(LIBDIR)/libsepol.a $(LDLIBS) + + %.o: %.c policy.h diff --git a/patches/libselinux-2.1.12/series b/patches/libselinux-2.1.12/series index ecf97d5d7..410e8de2d 100644 --- a/patches/libselinux-2.1.12/series +++ b/patches/libselinux-2.1.12/series @@ -6,4 +6,5 @@ 0004-makefile-fix-linking-to-shlib-if-prefix.patch 0005-makefile-move-lpcre-from-beginning-of-gcc-linker-cal.patch 0006-makefile-use-python-config-instead-of-pkg-config.patch -# de4667aca3c8dbc6dbdf0d2d76be078e - git-ptx-patches magic +0007-makefile-add-a-dependency-from-wrapper-libs-to-.so.patch +# 110eefc2eace8149fe87fa36f9f513fb - git-ptx-patches magic |