libsepol: really fix static library build
PATCH 1/1 libsepol: really fix static library build
In commit 52eeb04c7608b9675bd8c2d57d3a4d1373ee72ad ('libsepol: fix static-only library build') I forgot to git add the changes made to the libsepol.mk file itself. Those changes are needed to actually pass STATIC=<something> when building static libraries only.
Signed-off-by Thomas Petazzoni <[email protected]>
--- package/libsepol/libsepol.mk | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
package/libsepol/libsepol.mk +9 -3
@@ -11,18 +11,24 @@ LIBSEPOL_LICENSE_FILES = COPYING LIBSEPOL_INSTALL_STAGING = YES +LIBSEPOL_MAKE_FLAGS = $(TARGET_CONFIGURE_OPTS) + +ifeq ($(BR2_PREFER_STATIC_LIB),y) +LIBSEPOL_MAKE_FLAGS += STATIC=1 +endif + define LIBSEPOL_BUILD_CMDS # DESTDIR is needed during the compile to compute library and # header paths. - $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) DESTDIR=$(STAGING_DIR) + $(MAKE) -C $(@D) $(LIBSEPOL_MAKE_FLAGS) DESTDIR=$(STAGING_DIR) endef define LIBSEPOL_INSTALL_STAGING_CMDS - $(MAKE) -C $(@D) install $(TARGET_CONFIGURE_OPTS) DESTDIR=$(STAGING_DIR) + $(MAKE) -C $(@D) install $(LIBSEPOL_MAKE_FLAGS) DESTDIR=$(STAGING_DIR) endef define LIBSEPOL_INSTALL_TARGET_CMDS - $(MAKE) -C $(@D) install $(TARGET_CONFIGURE_OPTS) DESTDIR=$(TARGET_DIR) + $(MAKE) -C $(@D) install $(LIBSEPOL_MAKE_FLAGS) DESTDIR=$(TARGET_DIR) endef define HOST_LIBSEPOL_BUILD_CMDS
Signature · 1 line
1.8.3.2
PATCH 1/1 libsepol: really fix static library build
Quoted 8 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Thomas" == Thomas Petazzoni <[email protected]> writes:
In commit
52eeb04c7608b9675bd8c2d57d3a4d1373ee72ad('libsepol: fix static-only library build') I forgot to git add the changes made to the libsepol.mk file itself. Those changes are needed to actually pass STATIC=<something> when building static libraries only.Signed-off-by Thomas Petazzoni <[email protected]>
Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard