projects / buildroot.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: cd18375)
package/kmsxx: fix static install
authorYann E. MORIN <yann.morin.1998@free.fr>
Fri, 5 Aug 2016 18:05:01 +0000 (20:05 +0200)
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Fri, 5 Aug 2016 18:59:53 +0000 (20:59 +0200)
Currently, we only try to install the shared libraries.

However, when doing a static build, only the static libs are built,
obviously.

Fix this by only installing relevant libraries.

Fixes:
    http://autobuild.buildroot.org/results/82c/82cfb7451f933b222abe30b5d35d23e409a4af79/
    http://autobuild.buildroot.org/results/bb3/bb3840f14382b6ed77d5947eb3ac5c229286681e/

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Maxime Ripard <maxime.ripard@free-electrons.com>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
package/kmsxx/kmsxx.mk patch | blob | history

diff --git a/package/kmsxx/kmsxx.mk b/package/kmsxx/kmsxx.mk
index 84c860c4a190ef7dab19e72bb3ecb5d60ef2640a..df0ab234d7a515dd0838c71ab4cf2e842f692bef 100644 (file)
--- a/package/kmsxx/kmsxx.mk
+++ b/package/kmsxx/kmsxx.mk
@@ -29,17 +29,23 @@ endif
 KMSXX_LIBS = kms++ kms++util
 
 define KMSXX_INSTALL_TARGET_CMDS
-       $(foreach l,$(KMSXX_LIBS),\
-               $(INSTALL) -D -m 0755 $(@D)/lib/lib$(l).so \
-                       $(TARGET_DIR)/usr/lib/lib$(l).so
+       $(if $(BR2_SHARED_LIBS)$(BR2_SHARED_STATIC_LIBS),
+               $(foreach l,$(KMSXX_LIBS),\
+                       $(INSTALL) -D -m 0755 $(@D)/lib/lib$(l).so \
+                               $(TARGET_DIR)/usr/lib/lib$(l).so
+               )
        )
        $(KMSXX_INSTALL_TARGET_TESTS)
 endef
 
 define KMSXX_INSTALL_STAGING_CMDS
        $(foreach l,$(KMSXX_LIBS),\
-               $(INSTALL) -D -m 0755 $(@D)/lib/lib$(l).so \
-                       $(STAGING_DIR)/usr/lib/lib$(l).so
+               $(if $(BR2_SHARED_LIBS)$(BR2_SHARED_STATIC_LIBS),
+                       $(INSTALL) -D -m 0755 $(@D)/lib/lib$(l).so \
+                               $(STAGING_DIR)/usr/lib/lib$(l).so)
+               $(if $(BR2_STATIC_LIBS)$(BR2_SHARED_STATIC_LIBS),
+                       $(INSTALL) -D -m 0755 $(@D)/lib/lib$(l).a \
+                               $(STAGING_DIR)/usr/lib/lib$(l).a)
                mkdir -p $(STAGING_DIR)/usr/include/$(l)
                cp -dpfr $(@D)/$(l)/inc/$(l)/* $(STAGING_DIR)/usr/include/$(l)/
        )