Skip to contentSkip to conversation

package/qlibc: bump to version 2.4.4

PATCH New Fabrice Fontaine 2 participants 2 messages Mar 28, 2019 – Mar 29, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/qlibc: bump to version 2.4.4

- Remove patches (already in version) and autoreconf
- Add hash for license file

---
 .../qlibc/0001-remove-absolute-paths.patch    |  19 ---
 package/qlibc/0002-obey-destdir.patch         | 144 ------------------
 .../qlibc/0003-fix-openssl-mysql-checks.patch |  36 -----
 package/qlibc/qlibc.hash                      |   3 +-
 package/qlibc/qlibc.mk                        |   4 +-
 5 files changed, 3 insertions(+), 203 deletions(-)
 delete mode 100644 package/qlibc/0001-remove-absolute-paths.patch
 delete mode 100644 package/qlibc/0002-obey-destdir.patch
 delete mode 100644 package/qlibc/0003-fix-openssl-mysql-checks.patch
package/qlibc/0001-remove-absolute-paths.patch deleted +0 -19
deleted file mode 100644
index 5976c3c4db..0000000000
@@ -1,19 +0,0 @@
-Remove absolute paths to host locations
-
-Signed-off-by: Sagaert Johan <[email protected]>
-
-Index: b/configure.ac
-===================================================================
---- a/configure.ac
-+++ b/configure.ac
-@@ -85,10 +85,8 @@
- 
- ## Set path
- PATH="$PATH:/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin"
--CPPFLAGS="$CPPFLAGS -I/usr/include -I/usr/local/include"
- CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
- CPPFLAGS="$CPPFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
--LDFLAGS="$LDFLAGS -L/usr/lib -L/usr/local/lib"
- 
- ## Set autoconf setting
- #AC_CANONICAL_TARGET
package/qlibc/0002-obey-destdir.patch deleted +0 -144

144 lines not on this page · raw message

package/qlibc/0003-fix-openssl-mysql-checks.patch deleted +0 -36
deleted file mode 100644
index bb609b2446..0000000000
@@ -1,36 +0,0 @@
-Allow to explicitly disable openssl and mysql
-
-AC_ARG_WITH() is being incorrectly used: the third argument indicates
-the action that needs to be taken when a value was passed, when not
-the option is enabled. Therefore, the result of the existing code was
-that when you passed --without-mysql or --without-openssl, the
-$withval variable would get the value 'yes', which is obviously wrong.
-
-Instead, we simply empty this third argument, because $withval is
-already properly filled with 'yes' or 'no' by the AC_ARG_WITH()
-function.
-
-Signed-off-by: Thomas Petazzoni <[email protected]>
-
-Index: b/configure.ac
-===================================================================
---- a/configure.ac
-+++ b/configure.ac
-@@ -170,7 +170,7 @@
- ## --with section
- ##
- 
--AC_ARG_WITH([openssl],[AS_HELP_STRING([--with-openssl], [This will enable HTTPS support in qhttpclient extension API. When it's enabled, user applications will need to link openssl library with -lssl option.])],[withval=yes],[withval=no])
-+AC_ARG_WITH([openssl],[AS_HELP_STRING([--with-openssl], [This will enable HTTPS support in qhttpclient extension API. When it's enabled, user applications will need to link openssl library with -lssl option.])],[],[withval=no])
- if test "$withval" = yes; then
- 	if test "$with_openssl" = yes; then
- 		with_openssl="/usr/include"
-@@ -185,7 +185,7 @@
- 	fi
- fi
- 
--AC_ARG_WITH([mysql],[AS_HELP_STRING([--with-mysql], [This will enable MySQL database support in qdatabase extension API. When it's enabled, user applications need to link mysql client library. (ex: -lmysqlclient)])],[withval=yes],[withval=no])
-+AC_ARG_WITH([mysql],[AS_HELP_STRING([--with-mysql], [This will enable MySQL database support in qdatabase extension API. When it's enabled, user applications need to link mysql client library. (ex: -lmysqlclient)])],[],[withval=no])
- if test "$withval" = yes; then
- 	if test "$with_mysql" = yes; then
- 		with_mysql="/usr/include/mysql"
package/qlibc/qlibc.hash +2 -1
index 6b8e4d8940..8fa0cf6503 100644
@@ -1,2 +1,3 @@
 # Locally calculated
-sha256 1f9aa5eefd28c45d409130a35104816d41405da64fe900f70a1c41150891501a  qlibc-v2.4.1.tar.gz
+sha256 93512e2203aaadda7aa62039b29500d9236b878e16f070328c58dc9d23da94d7  qlibc-v2.4.4.tar.gz
+sha256 7c9d03656af4c0acf0a35e29459086498dd64080eac6d2945bc1c064aaf18132  LICENSE
package/qlibc/qlibc.mk +1 -3
index 55c7aa3b05..b186dfd32f 100644
@@ -4,13 +4,11 @@
 #
 ################################################################################
 
-QLIBC_VERSION = v2.4.1
+QLIBC_VERSION = v2.4.4
 QLIBC_SITE = $(call github,wolkykim,qlibc,$(QLIBC_VERSION))
 QLIBC_LICENSE = BSD-2-Clause
 QLIBC_LICENSE_FILES = LICENSE
 
-# We're patching configure.ac
-QLIBC_AUTORECONF = YES
 QLIBC_INSTALL_STAGING = YES
 QLIBC_DEPENDENCIES = $(if $(BR2_PACKAGE_LIBICONV),libiconv)
 
Signature · 1 line
2.20.1
#1 lore raw

PATCH 1/1 package/qlibc: bump to version 2.4.4

Quoted 4 lines · On Thu, 28 Mar 2019 20:22:27 +0100 Fabrice Fontaine…

- Remove patches (already in version) and autoreconf
- Add hash for license file

Quoted 10 lines
---
 .../qlibc/0001-remove-absolute-paths.patch    |  19 ---
 package/qlibc/0002-obey-destdir.patch         | 144 ------------------
 .../qlibc/0003-fix-openssl-mysql-checks.patch |  36 -----
 package/qlibc/qlibc.hash                      |   3 +-
 package/qlibc/qlibc.mk                        |   4 +-
 5 files changed, 3 insertions(+), 203 deletions(-)
 delete mode 100644 package/qlibc/0001-remove-absolute-paths.patch
 delete mode 100644 package/qlibc/0002-obey-destdir.patch
 delete mode 100644 package/qlibc/0003-fix-openssl-mysql-checks.patch

Applied to master, thanks.

Thomas

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