| Message ID | 20220305204446.823802-1-fontaine.fabrice@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [1/1] package/azure-iot-sdk-c: drop custom install rules | expand |
Fabrice, All, On 2022-03-05 21:44 +0100, Fabrice Fontaine spake thusly: > Drop custom install rules which have been added since the addition of > the package in commit 2d837933e55216dc31a2206b063689cfd04a4c01 but are > now resulting in a broken installion > > Fixes: > - https://bugs.buildroot.org/show_bug.cgi?id=14636 > > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/azure-iot-sdk-c/azure-iot-sdk-c.mk | 58 ---------------------- > 1 file changed, 58 deletions(-) > > diff --git a/package/azure-iot-sdk-c/azure-iot-sdk-c.mk b/package/azure-iot-sdk-c/azure-iot-sdk-c.mk > index 3f00db3ff4..e6de8c851b 100644 > --- a/package/azure-iot-sdk-c/azure-iot-sdk-c.mk > +++ b/package/azure-iot-sdk-c/azure-iot-sdk-c.mk > @@ -14,62 +14,4 @@ AZURE_IOT_SDK_C_INSTALL_STAGING = YES > AZURE_IOT_SDK_C_DEPENDENCIES = libxml2 openssl libcurl util-linux > AZURE_IOT_SDK_C_CONF_OPTS = -Dskip_samples=ON > > -# The project only supports building one kind of library. > -# Further the install target installs the wrong files, so we do it here: > -ifeq ($(BR2_STATIC_LIBS),y) > -AZURE_IOT_SDK_C_LIBS += \ > - uamqp/libuamqp.a \ > - c-utility/libaziotsharedutil.a \ > - iothub_client/libiothub_client.a \ > - iothub_client/libiothub_client_mqtt_ws_transport.a \ > - iothub_client/libiothub_client_amqp_ws_transport.a \ > - iothub_client/libiothub_client_http_transport.a \ > - iothub_client/libiothub_client_amqp_transport.a \ > - iothub_client/libiothub_client_mqtt_transport.a \ > - iothub_service_client/libiothub_service_client.a \ > - serializer/libserializer.a \ > - umqtt/libumqtt.a \ > - deps/uhttp/libuhttp.a \ > - deps/umock-c/libumock_c.a \ > - libparson.a > -else > -AZURE_IOT_SDK_C_LIBS += \ > - uamqp/libuamqp.so \ > - c-utility/libaziotsharedutil.so \ > - iothub_client/libiothub_client.so \ > - iothub_client/libiothub_client_mqtt_ws_transport.so \ > - iothub_client/libiothub_client_amqp_ws_transport.so \ > - iothub_client/libiothub_client_http_transport.so \ > - iothub_client/libiothub_client_amqp_transport.so \ > - iothub_client/libiothub_client_mqtt_transport.so \ > - iothub_service_client/libiothub_service_client.so \ > - serializer/libserializer.so \ > - umqtt/libumqtt.so.1.1.12 \ > - deps/uhttp/libuhttp.so \ > - deps/umock-c/libumock_c.so \ > - libparson.so > - > -define AZURE_IOT_SDK_C_CREATE_SYMLINKS > - ln -sf libumqtt.so.1.1.12 $(1)/usr/lib/libumqtt.so.1 > - ln -sf libumqtt.so.1.1.12 $(1)/usr/lib/libumqtt.so > -endef > -endif > - > -define AZURE_IOT_SDK_C_INSTALL_LIBS > - $(foreach l,$(AZURE_IOT_SDK_C_LIBS), \ > - $(INSTALL) -D -m 0755 $(@D)/$(l) $(1)/usr/lib/$(notdir $(l)) > - ) > - $(call AZURE_IOT_SDK_C_CREATE_SYMLINKS,$(1)) > -endef > - > -define AZURE_IOT_SDK_C_INSTALL_STAGING_CMDS > - $(call AZURE_IOT_SDK_C_INSTALL_LIBS,$(STAGING_DIR)) > - cp -a $(@D)/c-utility/inc/* $(STAGING_DIR)/usr/include/ > - cp -a $(@D)/iothub_client/inc/* $(STAGING_DIR)/usr/include/ > -endef > - > -define AZURE_IOT_SDK_C_INSTALL_TARGET_CMDS > - $(call AZURE_IOT_SDK_C_INSTALL_LIBS,$(TARGET_DIR)) > -endef > - > $(eval $(cmake-package)) > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot@buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot
>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes: > Drop custom install rules which have been added since the addition of > the package in commit 2d837933e55216dc31a2206b063689cfd04a4c01 but are > now resulting in a broken installion > Fixes: > - https://bugs.buildroot.org/show_bug.cgi?id=14636 > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Committed to 2021.02.x and 2021.11.x, thanks.
diff --git a/package/azure-iot-sdk-c/azure-iot-sdk-c.mk b/package/azure-iot-sdk-c/azure-iot-sdk-c.mk index 3f00db3ff4..e6de8c851b 100644 --- a/package/azure-iot-sdk-c/azure-iot-sdk-c.mk +++ b/package/azure-iot-sdk-c/azure-iot-sdk-c.mk @@ -14,62 +14,4 @@ AZURE_IOT_SDK_C_INSTALL_STAGING = YES AZURE_IOT_SDK_C_DEPENDENCIES = libxml2 openssl libcurl util-linux AZURE_IOT_SDK_C_CONF_OPTS = -Dskip_samples=ON -# The project only supports building one kind of library. -# Further the install target installs the wrong files, so we do it here: -ifeq ($(BR2_STATIC_LIBS),y) -AZURE_IOT_SDK_C_LIBS += \ - uamqp/libuamqp.a \ - c-utility/libaziotsharedutil.a \ - iothub_client/libiothub_client.a \ - iothub_client/libiothub_client_mqtt_ws_transport.a \ - iothub_client/libiothub_client_amqp_ws_transport.a \ - iothub_client/libiothub_client_http_transport.a \ - iothub_client/libiothub_client_amqp_transport.a \ - iothub_client/libiothub_client_mqtt_transport.a \ - iothub_service_client/libiothub_service_client.a \ - serializer/libserializer.a \ - umqtt/libumqtt.a \ - deps/uhttp/libuhttp.a \ - deps/umock-c/libumock_c.a \ - libparson.a -else -AZURE_IOT_SDK_C_LIBS += \ - uamqp/libuamqp.so \ - c-utility/libaziotsharedutil.so \ - iothub_client/libiothub_client.so \ - iothub_client/libiothub_client_mqtt_ws_transport.so \ - iothub_client/libiothub_client_amqp_ws_transport.so \ - iothub_client/libiothub_client_http_transport.so \ - iothub_client/libiothub_client_amqp_transport.so \ - iothub_client/libiothub_client_mqtt_transport.so \ - iothub_service_client/libiothub_service_client.so \ - serializer/libserializer.so \ - umqtt/libumqtt.so.1.1.12 \ - deps/uhttp/libuhttp.so \ - deps/umock-c/libumock_c.so \ - libparson.so - -define AZURE_IOT_SDK_C_CREATE_SYMLINKS - ln -sf libumqtt.so.1.1.12 $(1)/usr/lib/libumqtt.so.1 - ln -sf libumqtt.so.1.1.12 $(1)/usr/lib/libumqtt.so -endef -endif - -define AZURE_IOT_SDK_C_INSTALL_LIBS - $(foreach l,$(AZURE_IOT_SDK_C_LIBS), \ - $(INSTALL) -D -m 0755 $(@D)/$(l) $(1)/usr/lib/$(notdir $(l)) - ) - $(call AZURE_IOT_SDK_C_CREATE_SYMLINKS,$(1)) -endef - -define AZURE_IOT_SDK_C_INSTALL_STAGING_CMDS - $(call AZURE_IOT_SDK_C_INSTALL_LIBS,$(STAGING_DIR)) - cp -a $(@D)/c-utility/inc/* $(STAGING_DIR)/usr/include/ - cp -a $(@D)/iothub_client/inc/* $(STAGING_DIR)/usr/include/ -endef - -define AZURE_IOT_SDK_C_INSTALL_TARGET_CMDS - $(call AZURE_IOT_SDK_C_INSTALL_LIBS,$(TARGET_DIR)) -endef - $(eval $(cmake-package))
Drop custom install rules which have been added since the addition of the package in commit 2d837933e55216dc31a2206b063689cfd04a4c01 but are now resulting in a broken installion Fixes: - https://bugs.buildroot.org/show_bug.cgi?id=14636 Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> --- package/azure-iot-sdk-c/azure-iot-sdk-c.mk | 58 ---------------------- 1 file changed, 58 deletions(-)