Skip to contentSkip to conversation

glib-networking: fix build with pkgconf 1.5.3

PATCH New Asaf Kahlon 2 participants 3 messages Dec 15, 2018

lore
Share & tools
lore

Asaf Kahlon

author
#0 lore raw

PATCH 1/1 glib-networking: fix build with pkgconf 1.5.3

CONF_OPTS has to be altered to contain only the prefix relative to STAGING_DIR, because the sysroot path is prepended since pkgconf bump to 1.5.3

Fixes:
http://autobuild.buildroot.org/results/3a0/3a0687911f9da25fb36497b7abb2adb7ea3ef695

Signed-off-by Asaf Kahlon <[email protected]>
---
 package/glib-networking/glib-networking.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/glib-networking/glib-networking.mk +1 -1
index 10a3b706b3..91def515cc 100644
@@ -23,7 +23,7 @@ GLIB_NETWORKING_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) \
 
 ifeq ($(BR2_PACKAGE_GNUTLS),y)
 GLIB_NETWORKING_DEPENDENCIES += gnutls
-GLIB_NETWORKING_CONF_OPTS += --with-libgcrypt-prefix=$(STAGING_DIR)/usr
+GLIB_NETWORKING_CONF_OPTS += --with-libgcrypt-prefix=/usr
 else
 GLIB_NETWORKING_CONF_OPTS += --without-gnutls
 endif
Signature · 1 line
2.19.1
author
#1 lore raw

PATCH 1/1 python-engineio: bump to verion 3.1.0

Signed-off-by Asaf Kahlon <[email protected]>
---
 package/python-engineio/python-engineio.hash | 4 ++--
 package/python-engineio/python-engineio.mk   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
package/python-engineio/python-engineio.hash +2 -2
index 7a9a1fdad0..47e2333ecd 100644
@@ -1,5 +1,5 @@
 # md5, sha256 from https://pypi.org/pypi/python-engineio/json
-md5	a7930cb8bf957f1b12e1a21ae5b57982  python-engineio-3.0.0.tar.gz
-sha256	bb8b5888adb852614b4b1861586ee7d89145cbd2ebba03ed7043e64c029bbb3b  python-engineio-3.0.0.tar.gz
+md5	3e2428aa3b9ba1d1ff5b6bff2c306e7e  python-engineio-3.1.0.tar.gz
+sha256	d7341725001afded65e42620e26adc54a450cf4082dd54a407480cb9a64fcdf9  python-engineio-3.1.0.tar.gz
 # Locally computed sha256 checksums
 sha256	c9e97d3dbc1fbbcdb4f7808b282cd646db887aff4f5313fe6bbe8d4c31405a9c  LICENSE
package/python-engineio/python-engineio.mk +2 -2
index 9bda632661..f31b948e3c 100644
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-PYTHON_ENGINEIO_VERSION = 3.0.0
-PYTHON_ENGINEIO_SITE = https://files.pythonhosted.org/packages/51/a4/1642a75f1206a14e9a75f286d38b1794b13e9ee3169f57cb939cb99ffea3
+PYTHON_ENGINEIO_VERSION = 3.1.0
+PYTHON_ENGINEIO_SITE = https://files.pythonhosted.org/packages/25/37/57dc050723f3e64a0a652711b3831263d99f5ade2e05e5d6038354be7eaa
 PYTHON_ENGINEIO_SETUP_TYPE = setuptools
 PYTHON_ENGINEIO_LICENSE = MIT
 PYTHON_ENGINEIO_LICENSE_FILES = LICENSE
Signature · 1 line
2.19.1
#2 lore raw

PATCH 1/1 glib-networking: fix build with pkgconf 1.5.3

In reply to Asaf Kahlon

Hello,

Quoted 17 lines · Asaf Kahlon

CONF_OPTS has to be altered to contain only the prefix relative to STAGING_DIR, because the sysroot path is prepended since pkgconf bump to 1.5.3

Fixes:
http://autobuild.buildroot.org/results/3a0/3a0687911f9da25fb36497b7abb2adb7ea3ef695

Signed-off-by Asaf Kahlon <[email protected]>
---
 package/glib-networking/glib-networking.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/glib-networking/glib-networking.mk +0 -0
index 10a3b706b3..91def515cc 100644

package/glib-networking/glib-networking.mk GLIB_NETWORKING_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) \ · line 26

Quoted 5 lines
package/glib-networking/glib-networking.mk +1 -1
@@ -23,7 +23,7 @@ GLIB_NETWORKING_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) \
 
 ifeq ($(BR2_PACKAGE_GNUTLS),y)
 GLIB_NETWORKING_DEPENDENCIES += gnutls
-GLIB_NETWORKING_CONF_OPTS += --with-libgcrypt-prefix=$(STAGING_DIR)/usr
+GLIB_NETWORKING_CONF_OPTS += --with-libgcrypt-prefix=/usr

Meh, this is getting crazy :-/ We're used to pass $(STAGING_DIR)/usr everywhere for those prefixes.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com