Skip to contentSkip to conversation

Microblaze clean up

PATCH New Giulio Benetti 3 participants 17 messages Jun 26, 2019 – Aug 30, 2019

lore
Share & tools
lore
#0 lore raw

v2 cover Microblaze clean up

This patch series works around various Gcc bugs and re-enables Microblaze packages depending on these work-arounds. It also fixes some little build bugs considered as Gcc bugs and some package has been re-enabled because its build failure was due to very very old toolchains.

Note that this patchset is not splitted into smaller patchset because of packages dependencies and it would have been more difficult to understand the sequence of all the patches.

Giulio Benetti (7):
package/libnss: use correct CFLAGS and LDFLAGS package/libnss: re-enable package on microblaze package/ecryptfs-utils: remove libnss gcc bug dependency package/boost: remove gcc bug 85180 dependency for boost-fiber option package/prboom: avoid using hardcoded optimization flags package/prboom: work around gcc bug 85180 package/qt5/qt5webengine: re-enable building if BUG_85682=y on Qt5
Latest

 package/boost/Config.in                       |  5 +--
 package/ecryptfs-utils/Config.in              |  4 --
 ...move-Wmaybe-uninitialized-warning-in.patch | 42 +++++++++++++++++++
 ...ve-Wmaybe-uninitialized-warning-in-t.patch | 27 ++++++++++++
 ...ve-Wmaybe-uninitialized-warning-in-h.patch | 27 ++++++++++++
 ...ve-Wmaybe-uninitialized-warning-in-l.patch | 27 ++++++++++++
 ...ve-Wmaybe-uninitialized-warning-in-p.patch | 26 ++++++++++++
 ...ve-Wmaybe-uninitialized-warning-in-t.patch | 27 ++++++++++++
 ...ve-Wmaybe-uninitialized-warning-in-p.patch | 28 +++++++++++++
 package/libnss/Config.in                      |  4 --
 package/libnss/libnss.mk                      | 16 ++++++-
 ...move-predefined-O2-optimization-flag.patch | 21 ++++++++++
 package/prboom/prboom.mk                      |  9 ++++
 package/qt5/qt5webengine/Config.in            |  6 ---
 14 files changed, 250 insertions(+), 19 deletions(-)
 create mode 100644 package/libnss/0003-Bug-1561548-Remove-Wmaybe-uninitialized-warning-in.patch
 create mode 100644 package/libnss/0004-Bug-1561556-Remove-Wmaybe-uninitialized-warning-in-t.patch
 create mode 100644 package/libnss/0005-Bug-1561558-Remove-Wmaybe-uninitialized-warning-in-h.patch
 create mode 100644 package/libnss/0006-Bug-1561587-Remove-Wmaybe-uninitialized-warning-in-l.patch
 create mode 100644 package/libnss/0007-Bug-1561588-Remove-Wmaybe-uninitialized-warning-in-p.patch
 create mode 100644 package/libnss/0008-Bug-1561591-Remove-Wmaybe-uninitialized-warning-in-t.patch
 create mode 100644 package/libnss/0009-Bug-1561598-Remove-Wmaybe-uninitialized-warning-in-p.patch
 create mode 100644 package/prboom/0002-configure-remove-predefined-O2-optimization-flag.patch
Signature · 1 line
2.17.1
#1 lore raw

PATCH v2 1/7 package/libnss: use correct CFLAGS and LDFLAGS

Actually libnss is configure with BUILD_OPT=1 that doesn't take into account TARGET_CFLAGS nor TARGET_LDFLAGS resulting in pre-chosen optimizations and debugging symbols.

Can't pass TARGET_CFLAGS through CFLAGS or similar otherwise other internal libnss one will be overwritten(i.e. -fPIC), so prefer to append TARGET_CFLAGS at the end of Linux.mk as well as TARGET_LDFLAGS according to internal libnss Makefile system's names. And obviously remove BUILD_OPT=1 from BUILD_VARS. This reveals hidden bugs when building with -Os due to uninitialized variables so add patches to fix those bugs.

---
V1->V2:
* use $() instead of ${}
* add patches to fix all warnings when building with -Os or -Og

---
 ...move-Wmaybe-uninitialized-warning-in.patch | 42 +++++++++++++++++++
 ...ve-Wmaybe-uninitialized-warning-in-t.patch | 27 ++++++++++++
 ...ve-Wmaybe-uninitialized-warning-in-h.patch | 27 ++++++++++++
 ...ve-Wmaybe-uninitialized-warning-in-l.patch | 27 ++++++++++++
 ...ve-Wmaybe-uninitialized-warning-in-p.patch | 26 ++++++++++++
 ...ve-Wmaybe-uninitialized-warning-in-t.patch | 27 ++++++++++++
 ...ve-Wmaybe-uninitialized-warning-in-p.patch | 28 +++++++++++++
 package/libnss/libnss.mk                      | 10 ++++-
 8 files changed, 212 insertions(+), 2 deletions(-)
 create mode 100644 package/libnss/0003-Bug-1561548-Remove-Wmaybe-uninitialized-warning-in.patch
 create mode 100644 package/libnss/0004-Bug-1561556-Remove-Wmaybe-uninitialized-warning-in-t.patch
 create mode 100644 package/libnss/0005-Bug-1561558-Remove-Wmaybe-uninitialized-warning-in-h.patch
 create mode 100644 package/libnss/0006-Bug-1561587-Remove-Wmaybe-uninitialized-warning-in-l.patch
 create mode 100644 package/libnss/0007-Bug-1561588-Remove-Wmaybe-uninitialized-warning-in-p.patch
 create mode 100644 package/libnss/0008-Bug-1561591-Remove-Wmaybe-uninitialized-warning-in-t.patch
 create mode 100644 package/libnss/0009-Bug-1561598-Remove-Wmaybe-uninitialized-warning-in-p.patch
package/libnss/0003-Bug-1561548-Remove-Wmaybe-uninitialized-warning-in.patch new file +42 -0
new file mode 100644
index 0000000000..7de1f5004c
@@ -0,0 +1,42 @@
+From b1a1686154d8ebb5c70184abc7e583a4612b102e Mon Sep 17 00:00:00 2001
+From: Giulio Benetti <[email protected]>
+Date: Wed, 26 Jun 2019 11:30:20 +0200
+Subject: [PATCH] Bug 1561548 - Remove -Wmaybe-uninitialized warning in
+ pkix_pl_ldapdefaultclient.c
+
+Signed-off-by: Giulio Benetti <[email protected]>
+---
+ nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_ldapdefaultclient.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_ldapdefaultclient.c b/nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_ldapdefaultclient.c
+index 3dc06be9a..32ebc98eb 100644
+--- a/nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_ldapdefaultclient.c
++++ b/nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_ldapdefaultclient.c
+@@ -352,7 +352,7 @@ pkix_pl_LdapDefaultClient_VerifyBindResponse(
+         SECItem decode = {siBuffer, NULL, 0};
+         SECStatus rv = SECFailure;
+         LDAPMessage msg;
+-        LDAPBindResponse *ldapBindResponse = NULL;
++        LDAPBindResponse *ldapBindResponse = &msg.protocolOp.op.bindResponseMsg;
+ 
+         PKIX_ENTER
+                 (LDAPDEFAULTCLIENT,
+@@ -362,12 +362,13 @@ pkix_pl_LdapDefaultClient_VerifyBindResponse(
+         decode.data = (unsigned char *)(client->rcvBuf);
+         decode.len = bufLen;
+ 
++        ldapBindResponse->resultCode.data = NULL;
++
+         PKIX_CHECK(pkix_pl_LdapDefaultClient_DecodeBindResponse
+                 (client->arena, &decode, &msg, &rv, plContext),
+                 PKIX_LDAPDEFAULTCLIENTDECODEBINDRESPONSEFAILED);
+ 
+         if (rv == SECSuccess) {
+-                ldapBindResponse = &msg.protocolOp.op.bindResponseMsg;
+                 if (*(ldapBindResponse->resultCode.data) == SUCCESS) {
+                         client->connectStatus = BOUND;
+                 } else {
+-- 
+2.17.1
+
package/libnss/0004-Bug-1561556-Remove-Wmaybe-uninitialized-warning-in-t.patch new file +27 -0
new file mode 100644
index 0000000000..3e62b9383e
@@ -0,0 +1,27 @@
+From 16bd93137043c54c91b4f606945e57b922273868 Mon Sep 17 00:00:00 2001
+From: Giulio Benetti <[email protected]>
+Date: Wed, 26 Jun 2019 11:35:30 +0200
+Subject: [PATCH] Bug 1561556 - Remove -Wmaybe-uninitialized warning in
+ tls13esni.c
+
+Signed-off-by: Giulio Benetti <[email protected]>
+---
+ nss/lib/ssl/tls13esni.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/nss/lib/ssl/tls13esni.c b/nss/lib/ssl/tls13esni.c
+index 9b635a9cf..4d2e12d62 100644
+--- a/nss/lib/ssl/tls13esni.c
++++ b/nss/lib/ssl/tls13esni.c
+@@ -580,7 +580,7 @@ tls13_ClientSetupESNI(sslSocket *ss)
+     size_t i;
+     PRCList *cur;
+     SECStatus rv;
+-    TLS13KeyShareEntry *share;
++    TLS13KeyShareEntry *share = NULL;
+     const sslNamedGroupDef *group = NULL;
+     PRTime now = PR_Now() / PR_USEC_PER_SEC;
+ 
+-- 
+2.17.1
+
package/libnss/0005-Bug-1561558-Remove-Wmaybe-uninitialized-warning-in-h.patch new file +27 -0
new file mode 100644
index 0000000000..1d2d4ad3a7
@@ -0,0 +1,27 @@
+From fa00b21b9630a991a9b5ec2fbdff80cf940af4fc Mon Sep 17 00:00:00 2001
+From: Giulio Benetti <[email protected]>
+Date: Wed, 26 Jun 2019 11:42:21 +0200
+Subject: [PATCH] Bug 1561558 - Remove -Wmaybe-uninitialized warning in
+ httpserv.c
+
+Signed-off-by: Giulio Benetti <[email protected]>
+---
+ nss/cmd/httpserv/httpserv.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/nss/cmd/httpserv/httpserv.c b/nss/cmd/httpserv/httpserv.c
+index 71e2ab88d..c7277f3bd 100644
+--- a/nss/cmd/httpserv/httpserv.c
++++ b/nss/cmd/httpserv/httpserv.c
+@@ -463,7 +463,7 @@ handle_connection(
+     char *getData = NULL; /* inplace conversion */
+     SECItem postData;
+     PRBool isOcspRequest = PR_FALSE;
+-    PRBool isPost;
++    PRBool isPost = PR_FALSE;
+ 
+     postData.data = NULL;
+     postData.len = 0;
+-- 
+2.17.1
+
package/libnss/0006-Bug-1561587-Remove-Wmaybe-uninitialized-warning-in-l.patch new file +27 -0
new file mode 100644
index 0000000000..d83cbe1d92
@@ -0,0 +1,27 @@
+From 6cb90c22d577c7d276ca9a984e542e3e4ae4a713 Mon Sep 17 00:00:00 2001
+From: Giulio Benetti <[email protected]>
+Date: Wed, 26 Jun 2019 13:34:51 +0200
+Subject: [PATCH] Bug 1561587 - Remove -Wmaybe-uninitialized warning in
+ lgattr.c
+
+Signed-off-by: Giulio Benetti <[email protected]>
+---
+ nss/lib/softoken/legacydb/lgattr.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/nss/lib/softoken/legacydb/lgattr.c b/nss/lib/softoken/legacydb/lgattr.c
+index 542b0c968..b91b7fab9 100644
+--- a/nss/lib/softoken/legacydb/lgattr.c
++++ b/nss/lib/softoken/legacydb/lgattr.c
+@@ -1069,7 +1069,7 @@ lg_FindTrustAttribute(LGObjectCache *obj, CK_ATTRIBUTE_TYPE type,
+     NSSLOWCERTCertificate *cert;
+     unsigned char hash[SHA1_LENGTH];
+     unsigned int trustFlags;
+-    CK_RV crv;
++    CK_RV crv = CKR_CANCEL;
+ 
+     switch (type) {
+         case CKA_PRIVATE:
+-- 
+2.17.1
+
package/libnss/0007-Bug-1561588-Remove-Wmaybe-uninitialized-warning-in-p.patch new file +26 -0
new file mode 100644
index 0000000000..88e4f851e2
@@ -0,0 +1,26 @@
+From a15fff0564da8af100ae036c33b2c61b89aa1868 Mon Sep 17 00:00:00 2001
+From: Giulio Benetti <[email protected]>
+Date: Wed, 26 Jun 2019 13:41:08 +0200
+Subject: [PATCH] Bug 1561588 - Remove -Wmaybe-uninitialized warning in p7env.c
+
+Signed-off-by: Giulio Benetti <[email protected]>
+---
+ nss/cmd/p7env/p7env.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/nss/cmd/p7env/p7env.c b/nss/cmd/p7env/p7env.c
+index b35bf9a98..d7a337f1c 100644
+--- a/nss/cmd/p7env/p7env.c
++++ b/nss/cmd/p7env/p7env.c
+@@ -66,7 +66,7 @@ EncryptFile(FILE *outFile, FILE *inFile, struct recipient *recipients,
+     SEC_PKCS7ContentInfo *cinfo;
+     SEC_PKCS7EncoderContext *ecx;
+     struct recipient *rcpt;
+-    SECStatus rv;
++    SECStatus rv = SECFailure;
+ 
+     if (outFile == NULL || inFile == NULL || recipients == NULL)
+         return -1;
+-- 
+2.17.1
+
package/libnss/0008-Bug-1561591-Remove-Wmaybe-uninitialized-warning-in-t.patch new file +27 -0
new file mode 100644
index 0000000000..7c08717390
@@ -0,0 +1,27 @@
+From 4114677303bddf9c91003da59cc76429d42b6d88 Mon Sep 17 00:00:00 2001
+From: Giulio Benetti <[email protected]>
+Date: Wed, 26 Jun 2019 13:56:12 +0200
+Subject: [PATCH] Bug 1561591 - Remove -Wmaybe-uninitialized warning in
+ tstclnt.c
+
+Signed-off-by: Giulio Benetti <[email protected]>
+---
+ nss/cmd/tstclnt/tstclnt.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/nss/cmd/tstclnt/tstclnt.c b/nss/cmd/tstclnt/tstclnt.c
+index bc0cbfa76..fc9994906 100644
+--- a/nss/cmd/tstclnt/tstclnt.c
++++ b/nss/cmd/tstclnt/tstclnt.c
+@@ -920,7 +920,7 @@ restartHandshakeAfterServerCertIfNeeded(PRFileDesc *fd,
+                                         PRBool override)
+ {
+     SECStatus rv;
+-    PRErrorCode error;
++    PRErrorCode error = 0;
+ 
+     if (!serverCertAuth->isPaused)
+         return SECSuccess;
+-- 
+2.17.1
+
package/libnss/0009-Bug-1561598-Remove-Wmaybe-uninitialized-warning-in-p.patch new file +28 -0
new file mode 100644
index 0000000000..48d2de30f8
@@ -0,0 +1,28 @@
+From eba1f9a59d4d9fe7e3c96c82891a57802a1ed230 Mon Sep 17 00:00:00 2001
+From: Giulio Benetti <[email protected]>
+Date: Wed, 26 Jun 2019 14:39:16 +0200
+Subject: [PATCH] Bug 1561598 - Remove -Wmaybe-uninitialized warning in pqg.c
+
+Signed-off-by: Giulio Benetti <[email protected]>
+---
+ nss/lib/freebl/pqg.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/nss/lib/freebl/pqg.c b/lib/nss/freebl/pqg.c
+index 28930e2e4..2c4ae48e2 100644
+--- a/nss/lib/freebl/pqg.c
++++ b/nss/lib/freebl/pqg.c
+@@ -1630,8 +1630,8 @@ PQG_VerifyParams(const PQGParams *params,
+     unsigned int qseed_len;
+     unsigned int qgen_counter_ = 0;
+     SECItem pseed_ = { 0, 0, 0 };
+-    HASH_HashType hashtype;
+-    pqgGenType type;
++    HASH_HashType hashtype = HASH_AlgNULL;
++    pqgGenType type = FIPS186_1_TYPE;
+ 
+ #define CHECKPARAM(cond)      \
+     if (!(cond)) {            \
+-- 
+2.17.1
+
package/libnss/libnss.mk +8 -2
index 89d614fe1c..e1b9e02a77 100644
@@ -13,6 +13,14 @@ LIBNSS_DEPENDENCIES = libnspr sqlite zlib
 LIBNSS_LICENSE = MPL-2.0
 LIBNSS_LICENSE_FILES = nss/COPYING
 
+# Need to pass down TARGET_CFLAGS and TARGET_LDFLAGS
+define LIBNSS_FIXUP_LINUX_MK
+	echo 'OS_CFLAGS += $(TARGET_CFLAGS)' >> $(@D)/nss/coreconf/Linux.mk
+	echo 'LDFLAGS += $(TARGET_LDFLAGS)' >> $(@D)/nss/coreconf/Linux.mk
+endef
+
+LIBNSS_PRE_CONFIGURE_HOOKS += LIBNSS_FIXUP_LINUX_MK
+
 # --gc-sections triggers binutils ld segfault
 # https://sourceware.org/bugzilla/show_bug.cgi?id=21180
 ifeq ($(BR2_microblaze),y)
@@ -33,7 +41,6 @@ LIBNSS_BUILD_VARS = \
 	MOZILLA_CLIENT=1 \
 	NSPR_INCLUDE_DIR=$(STAGING_DIR)/usr/include/nspr \
 	NSPR_LIB_DIR=$(STAGING_DIR)/usr/lib \
-	BUILD_OPT=1 \
 	NS_USE_GCC=1 \
 	NSS_DISABLE_GTESTS=1 \
 	NSS_USE_SYSTEM_SQLITE=1 \
@@ -102,7 +109,6 @@ HOST_LIBNSS_BUILD_VARS = \
 	MOZILLA_CLIENT=1 \
 	NSPR_INCLUDE_DIR=$(HOST_DIR)/include/nspr \
 	NSPR_LIB_DIR=$(HOST_DIR)/lib \
-	BUILD_OPT=1 \
 	NS_USE_GCC=1 \
 	NSS_DISABLE_GTESTS=1 \
 	NSS_USE_SYSTEM_SQLITE=1 \
Signature · 1 line
2.17.1
#2 lore raw

PATCH v2 1/7 package/libnss: use correct CFLAGS and LDFLAGS

Hello,

all patches are pending upstream:
https://bugzilla.mozilla.org/buglist.cgi?list_id=14776487&short_desc_type=allwordssubstr&short_desc=Remove%20-Wmaybe-uninitialized%20warning&resolution=---&classification=Client%20Software&classification=Developer%20Infrastructure&classification=Components&classification=Server%20Software&classification=Other&query_format=advanced&component=Build&product=NSS

Best regards

Signature · 12 lines
Giulio Benetti
CTO

MICRONOVA SRL
Sede: Via A. Niedda 3 - 35010 Vigonza (PD)
Tel. 049/8931563 - Fax 049/8931346
Cod.Fiscale - P.IVA 02663420285
Capitale Sociale ? 26.000 i.v.
Iscritta al Reg. Imprese di Padova N. 02663420285
Numero R.E.A. 258642

Il 26/06/2019 14:58, Giulio Benetti ha scritto:
Quoted 317 lines

Actually libnss is configure with BUILD_OPT=1 that doesn't take into account TARGET_CFLAGS nor TARGET_LDFLAGS resulting in pre-chosen optimizations and debugging symbols.

Can't pass TARGET_CFLAGS through CFLAGS or similar otherwise other internal libnss one will be overwritten(i.e. -fPIC), so prefer to append TARGET_CFLAGS at the end of Linux.mk as well as TARGET_LDFLAGS according to internal libnss Makefile system's names. And obviously remove BUILD_OPT=1 from BUILD_VARS. This reveals hidden bugs when building with -Os due to uninitialized variables so add patches to fix those bugs.

---
V1->V2:
* use $() instead of ${}
* add patches to fix all warnings when building with -Os or -Og

---
  ...move-Wmaybe-uninitialized-warning-in.patch | 42 +++++++++++++++++++
  ...ve-Wmaybe-uninitialized-warning-in-t.patch | 27 ++++++++++++
  ...ve-Wmaybe-uninitialized-warning-in-h.patch | 27 ++++++++++++
  ...ve-Wmaybe-uninitialized-warning-in-l.patch | 27 ++++++++++++
  ...ve-Wmaybe-uninitialized-warning-in-p.patch | 26 ++++++++++++
  ...ve-Wmaybe-uninitialized-warning-in-t.patch | 27 ++++++++++++
  ...ve-Wmaybe-uninitialized-warning-in-p.patch | 28 +++++++++++++
  package/libnss/libnss.mk                      | 10 ++++-
  8 files changed, 212 insertions(+), 2 deletions(-)

create mode 100644 package/libnss/0003-Bug-1561548-Remove-Wmaybe-uninitialized-warning-in.patch create mode 100644 package/libnss/0004-Bug-1561556-Remove-Wmaybe-uninitialized-warning-in-t.patch create mode 100644 package/libnss/0005-Bug-1561558-Remove-Wmaybe-uninitialized-warning-in-h.patch create mode 100644 package/libnss/0006-Bug-1561587-Remove-Wmaybe-uninitialized-warning-in-l.patch create mode 100644 package/libnss/0007-Bug-1561588-Remove-Wmaybe-uninitialized-warning-in-p.patch create mode 100644 package/libnss/0008-Bug-1561591-Remove-Wmaybe-uninitialized-warning-in-t.patch create mode 100644 package/libnss/0009-Bug-1561598-Remove-Wmaybe-uninitialized-warning-in-p.patch

package/libnss/0003-Bug-1561548-Remove-Wmaybe-uninitialized-warning-in.patch new file +42 -0
new file mode 100644
index 0000000000..7de1f5004c
@@ -0,0 +1,42 @@
+From b1a1686154d8ebb5c70184abc7e583a4612b102e Mon Sep 17 00:00:00 2001
+From: Giulio Benetti <[email protected]>
+Date: Wed, 26 Jun 2019 11:30:20 +0200
+Subject: [PATCH] Bug 1561548 - Remove -Wmaybe-uninitialized warning in
+ pkix_pl_ldapdefaultclient.c
+
+Signed-off-by: Giulio Benetti <[email protected]>
+---
+ nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_ldapdefaultclient.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_ldapdefaultclient.c b/nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_ldapdefaultclient.c
+index 3dc06be9a..32ebc98eb 100644
+--- a/nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_ldapdefaultclient.c
++++ b/nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_ldapdefaultclient.c
+@@ -352,7 +352,7 @@ pkix_pl_LdapDefaultClient_VerifyBindResponse(
+         SECItem decode = {siBuffer, NULL, 0};
+         SECStatus rv = SECFailure;
+         LDAPMessage msg;
+-        LDAPBindResponse *ldapBindResponse = NULL;
++        LDAPBindResponse *ldapBindResponse = &msg.protocolOp.op.bindResponseMsg;
+
+         PKIX_ENTER
+                 (LDAPDEFAULTCLIENT,
+@@ -362,12 +362,13 @@ pkix_pl_LdapDefaultClient_VerifyBindResponse(
+         decode.data = (unsigned char *)(client->rcvBuf);
+         decode.len = bufLen;
+
++        ldapBindResponse->resultCode.data = NULL;
++
+         PKIX_CHECK(pkix_pl_LdapDefaultClient_DecodeBindResponse
+                 (client->arena, &decode, &msg, &rv, plContext),
+                 PKIX_LDAPDEFAULTCLIENTDECODEBINDRESPONSEFAILED);
+
+         if (rv == SECSuccess) {
+-                ldapBindResponse = &msg.protocolOp.op.bindResponseMsg;
+                 if (*(ldapBindResponse->resultCode.data) == SUCCESS) {
+                         client->connectStatus = BOUND;
+                 } else {
+--
+2.17.1
+
package/libnss/0004-Bug-1561556-Remove-Wmaybe-uninitialized-warning-in-t.patch new file +27 -0
new file mode 100644
index 0000000000..3e62b9383e
@@ -0,0 +1,27 @@
+From 16bd93137043c54c91b4f606945e57b922273868 Mon Sep 17 00:00:00 2001
+From: Giulio Benetti <[email protected]>
+Date: Wed, 26 Jun 2019 11:35:30 +0200
+Subject: [PATCH] Bug 1561556 - Remove -Wmaybe-uninitialized warning in
+ tls13esni.c
+
+Signed-off-by: Giulio Benetti <[email protected]>
+---
+ nss/lib/ssl/tls13esni.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/nss/lib/ssl/tls13esni.c b/nss/lib/ssl/tls13esni.c
+index 9b635a9cf..4d2e12d62 100644
+--- a/nss/lib/ssl/tls13esni.c
++++ b/nss/lib/ssl/tls13esni.c
+@@ -580,7 +580,7 @@ tls13_ClientSetupESNI(sslSocket *ss)
+     size_t i;
+     PRCList *cur;
+     SECStatus rv;
+-    TLS13KeyShareEntry *share;
++    TLS13KeyShareEntry *share = NULL;
+     const sslNamedGroupDef *group = NULL;
+     PRTime now = PR_Now() / PR_USEC_PER_SEC;
+
+--
+2.17.1
+
package/libnss/0005-Bug-1561558-Remove-Wmaybe-uninitialized-warning-in-h.patch new file +27 -0
new file mode 100644
index 0000000000..1d2d4ad3a7
@@ -0,0 +1,27 @@
+From fa00b21b9630a991a9b5ec2fbdff80cf940af4fc Mon Sep 17 00:00:00 2001
+From: Giulio Benetti <[email protected]>
+Date: Wed, 26 Jun 2019 11:42:21 +0200
+Subject: [PATCH] Bug 1561558 - Remove -Wmaybe-uninitialized warning in
+ httpserv.c
+
+Signed-off-by: Giulio Benetti <[email protected]>
+---
+ nss/cmd/httpserv/httpserv.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/nss/cmd/httpserv/httpserv.c b/nss/cmd/httpserv/httpserv.c
+index 71e2ab88d..c7277f3bd 100644
+--- a/nss/cmd/httpserv/httpserv.c
++++ b/nss/cmd/httpserv/httpserv.c
+@@ -463,7 +463,7 @@ handle_connection(
+     char *getData = NULL; /* inplace conversion */
+     SECItem postData;
+     PRBool isOcspRequest = PR_FALSE;
+-    PRBool isPost;
++    PRBool isPost = PR_FALSE;
+
+     postData.data = NULL;
+     postData.len = 0;
+--
+2.17.1
+
package/libnss/0006-Bug-1561587-Remove-Wmaybe-uninitialized-warning-in-l.patch new file +27 -0
new file mode 100644
index 0000000000..d83cbe1d92
@@ -0,0 +1,27 @@
+From 6cb90c22d577c7d276ca9a984e542e3e4ae4a713 Mon Sep 17 00:00:00 2001
+From: Giulio Benetti <[email protected]>
+Date: Wed, 26 Jun 2019 13:34:51 +0200
+Subject: [PATCH] Bug 1561587 - Remove -Wmaybe-uninitialized warning in
+ lgattr.c
+
+Signed-off-by: Giulio Benetti <[email protected]>
+---
+ nss/lib/softoken/legacydb/lgattr.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/nss/lib/softoken/legacydb/lgattr.c b/nss/lib/softoken/legacydb/lgattr.c
+index 542b0c968..b91b7fab9 100644
+--- a/nss/lib/softoken/legacydb/lgattr.c
++++ b/nss/lib/softoken/legacydb/lgattr.c
+@@ -1069,7 +1069,7 @@ lg_FindTrustAttribute(LGObjectCache *obj, CK_ATTRIBUTE_TYPE type,
+     NSSLOWCERTCertificate *cert;
+     unsigned char hash[SHA1_LENGTH];
+     unsigned int trustFlags;
+-    CK_RV crv;
++    CK_RV crv = CKR_CANCEL;
+
+     switch (type) {
+         case CKA_PRIVATE:
+--
+2.17.1
+
package/libnss/0007-Bug-1561588-Remove-Wmaybe-uninitialized-warning-in-p.patch new file +26 -0
new file mode 100644
index 0000000000..88e4f851e2
@@ -0,0 +1,26 @@
+From a15fff0564da8af100ae036c33b2c61b89aa1868 Mon Sep 17 00:00:00 2001
+From: Giulio Benetti <[email protected]>
+Date: Wed, 26 Jun 2019 13:41:08 +0200
+Subject: [PATCH] Bug 1561588 - Remove -Wmaybe-uninitialized warning in p7env.c
+
+Signed-off-by: Giulio Benetti <[email protected]>
+---
+ nss/cmd/p7env/p7env.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/nss/cmd/p7env/p7env.c b/nss/cmd/p7env/p7env.c
+index b35bf9a98..d7a337f1c 100644
+--- a/nss/cmd/p7env/p7env.c
++++ b/nss/cmd/p7env/p7env.c
+@@ -66,7 +66,7 @@ EncryptFile(FILE *outFile, FILE *inFile, struct recipient *recipients,
+     SEC_PKCS7ContentInfo *cinfo;
+     SEC_PKCS7EncoderContext *ecx;
+     struct recipient *rcpt;
+-    SECStatus rv;
++    SECStatus rv = SECFailure;
+
+     if (outFile == NULL || inFile == NULL || recipients == NULL)
+         return -1;
+--
+2.17.1
+
package/libnss/0008-Bug-1561591-Remove-Wmaybe-uninitialized-warning-in-t.patch new file +27 -0
new file mode 100644
index 0000000000..7c08717390
@@ -0,0 +1,27 @@
+From 4114677303bddf9c91003da59cc76429d42b6d88 Mon Sep 17 00:00:00 2001
+From: Giulio Benetti <[email protected]>
+Date: Wed, 26 Jun 2019 13:56:12 +0200
+Subject: [PATCH] Bug 1561591 - Remove -Wmaybe-uninitialized warning in
+ tstclnt.c
+
+Signed-off-by: Giulio Benetti <[email protected]>
+---
+ nss/cmd/tstclnt/tstclnt.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/nss/cmd/tstclnt/tstclnt.c b/nss/cmd/tstclnt/tstclnt.c
+index bc0cbfa76..fc9994906 100644
+--- a/nss/cmd/tstclnt/tstclnt.c
++++ b/nss/cmd/tstclnt/tstclnt.c
+@@ -920,7 +920,7 @@ restartHandshakeAfterServerCertIfNeeded(PRFileDesc *fd,
+                                         PRBool override)
+ {
+     SECStatus rv;
+-    PRErrorCode error;
++    PRErrorCode error = 0;
+
+     if (!serverCertAuth->isPaused)
+         return SECSuccess;
+--
+2.17.1
+
package/libnss/0009-Bug-1561598-Remove-Wmaybe-uninitialized-warning-in-p.patch new file +28 -0
new file mode 100644
index 0000000000..48d2de30f8
@@ -0,0 +1,28 @@
+From eba1f9a59d4d9fe7e3c96c82891a57802a1ed230 Mon Sep 17 00:00:00 2001
+From: Giulio Benetti <[email protected]>
+Date: Wed, 26 Jun 2019 14:39:16 +0200
+Subject: [PATCH] Bug 1561598 - Remove -Wmaybe-uninitialized warning in pqg.c
+
+Signed-off-by: Giulio Benetti <[email protected]>
+---
+ nss/lib/freebl/pqg.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/nss/lib/freebl/pqg.c b/lib/nss/freebl/pqg.c
+index 28930e2e4..2c4ae48e2 100644
+--- a/nss/lib/freebl/pqg.c
++++ b/nss/lib/freebl/pqg.c
+@@ -1630,8 +1630,8 @@ PQG_VerifyParams(const PQGParams *params,
+     unsigned int qseed_len;
+     unsigned int qgen_counter_ = 0;
+     SECItem pseed_ = { 0, 0, 0 };
+-    HASH_HashType hashtype;
+-    pqgGenType type;
++    HASH_HashType hashtype = HASH_AlgNULL;
++    pqgGenType type = FIPS186_1_TYPE;
+
+ #define CHECKPARAM(cond)      \
+     if (!(cond)) {            \
+--
+2.17.1
+
package/libnss/libnss.mk +8 -2
index 89d614fe1c..e1b9e02a77 100644
@@ -13,6 +13,14 @@ LIBNSS_DEPENDENCIES = libnspr sqlite zlib
  LIBNSS_LICENSE = MPL-2.0
  LIBNSS_LICENSE_FILES = nss/COPYING
 
+# Need to pass down TARGET_CFLAGS and TARGET_LDFLAGS
+define LIBNSS_FIXUP_LINUX_MK
+	echo 'OS_CFLAGS += $(TARGET_CFLAGS)' >> $(@D)/nss/coreconf/Linux.mk
+	echo 'LDFLAGS += $(TARGET_LDFLAGS)' >> $(@D)/nss/coreconf/Linux.mk
+endef
+
+LIBNSS_PRE_CONFIGURE_HOOKS += LIBNSS_FIXUP_LINUX_MK
+
  # --gc-sections triggers binutils ld segfault
  # https://sourceware.org/bugzilla/show_bug.cgi?id=21180
  ifeq ($(BR2_microblaze),y)
@@ -33,7 +41,6 @@ LIBNSS_BUILD_VARS = \
  	MOZILLA_CLIENT=1 \
  	NSPR_INCLUDE_DIR=$(STAGING_DIR)/usr/include/nspr \
  	NSPR_LIB_DIR=$(STAGING_DIR)/usr/lib \
-	BUILD_OPT=1 \
  	NS_USE_GCC=1 \
  	NSS_DISABLE_GTESTS=1 \
  	NSS_USE_SYSTEM_SQLITE=1 \
@@ -102,7 +109,6 @@ HOST_LIBNSS_BUILD_VARS = \
  	MOZILLA_CLIENT=1 \
  	NSPR_INCLUDE_DIR=$(HOST_DIR)/include/nspr \
  	NSPR_LIB_DIR=$(HOST_DIR)/lib \
-	BUILD_OPT=1 \
  	NS_USE_GCC=1 \
  	NSS_DISABLE_GTESTS=1 \
  	NSS_USE_SYSTEM_SQLITE=1 \
#3 lore raw

PATCH v2 2/7 package/libnss: re-enable package on microblaze

In reply to Giulio Benetti

With Microblaze Gcc version < 8.x the build hangs due to bug 85862:
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=85862
To avoid this, the libnss package has a !BR2_TOOLCHAIN_HAS_GCC_BUG_85862 dependency. However, gcc bug 85862 only triggers when optimization is enabled, so we can work around the issue by passing -O0, which is what we do in other Buildroot packages to work around this bug.

---
V1->V2:
* use $() instead of ${}

---
 package/libnss/Config.in | 4 ----
 package/libnss/libnss.mk | 8 +++++++-
 2 files changed, 7 insertions(+), 5 deletions(-)
package/libnss/Config.in +0 -4
index 34ddb91dfa..599c9a6536 100644
@@ -3,7 +3,6 @@ config BR2_PACKAGE_LIBNSS
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libnspr
 	depends on BR2_PACKAGE_LIBNSPR_ARCH_SUPPORT # libnspr
 	depends on !BR2_STATIC_LIBS
-	depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_85862
 	select BR2_PACKAGE_LIBNSPR
 	select BR2_PACKAGE_SQLITE
 	select BR2_PACKAGE_ZLIB
@@ -19,6 +18,3 @@ config BR2_PACKAGE_LIBNSS
 comment "libnss needs a toolchain w/ threads, dynamic library"
 	depends on BR2_PACKAGE_LIBNSPR_ARCH_SUPPORT
 	depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
-
-comment "libnss needs a toolchain not affected by GCC bug 85862"
-	depends on BR2_TOOLCHAIN_HAS_GCC_BUG_85862
package/libnss/libnss.mk +7 -1
index e1b9e02a77..b323da8523 100644
@@ -13,9 +13,15 @@ LIBNSS_DEPENDENCIES = libnspr sqlite zlib
 LIBNSS_LICENSE = MPL-2.0
 LIBNSS_LICENSE_FILES = nss/COPYING
 
+LIBNSS_CFLAGS = $(TARGET_CFLAGS)
+
+ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85862),y)
+LIBNSS_CFLAGS += -O0
+endif
+
 # Need to pass down TARGET_CFLAGS and TARGET_LDFLAGS
 define LIBNSS_FIXUP_LINUX_MK
-	echo 'OS_CFLAGS += $(TARGET_CFLAGS)' >> $(@D)/nss/coreconf/Linux.mk
+	echo 'OS_CFLAGS += $(LIBNSS_CFLAGS)' >> $(@D)/nss/coreconf/Linux.mk
 	echo 'LDFLAGS += $(TARGET_LDFLAGS)' >> $(@D)/nss/coreconf/Linux.mk
 endef
 
Signature · 1 line
2.17.1
#4 lore raw

PATCH v2 2/7 package/libnss: re-enable package on microblaze

Quoted 7 lines · On Wed, 26 Jun 2019 14:58:55 +0200 Giulio Benetti…

With Microblaze Gcc version < 8.x the build hangs due to bug 85862:
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=85862
To avoid this, the libnss package has a !BR2_TOOLCHAIN_HAS_GCC_BUG_85862 dependency. However, gcc bug 85862 only triggers when optimization is enabled, so we can work around the issue by passing -O0, which is what we do in other Buildroot packages to work around this bug.

Quoted 8 lines

---
V1->V2:
* use $() instead of ${}

---
 package/libnss/Config.in | 4 ----
 package/libnss/libnss.mk | 8 +++++++-
 2 files changed, 7 insertions(+), 5 deletions(-)

Applied to master, thanks.

Thomas

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

PATCH v2 3/7 package/ecryptfs-utils: remove libnss gcc bug dependency

In reply to Giulio Benetti

Package libnss has BR2_TOOLCHAIN_HAS_GCC_BUG_85862 dependency and since ecryptfs-utils depends on libnss it has to have this dependency too. But libnss has been worked around for Gcc Bug 85862 on previous patch, then we can remove 'depends on !BR_TOOLCHAIN_HAS_GCC_BUG_85862' and its comment from Config.in.

---
 package/ecryptfs-utils/Config.in | 4 ----
 1 file changed, 4 deletions(-)
package/ecryptfs-utils/Config.in +0 -4
index b589368a6a..68a659d33d 100644
@@ -6,7 +6,6 @@ config BR2_PACKAGE_ECRYPTFS_UTILS
 	depends on BR2_PACKAGE_LIBNSPR_ARCH_SUPPORT # libnss -> libnspr
 	depends on !BR2_MIPS_NABI32 # libnss
 	depends on !BR2_STATIC_LIBS # libnss, keyutils
-	depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_85862 # microblaze specific & GCC < 7.x
 	select BR2_PACKAGE_KEYUTILS
 	select BR2_PACKAGE_LIBNSS
 	# runtime dependency only, some scripts are using the
@@ -34,6 +33,3 @@ comment "ecryptfs-utils needs a toolchain w/ threads, wchar, dynami library"
 	depends on BR2_USE_MMU
 	depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR || \
 		BR2_STATIC_LIBS
-
-comment "ecryptfs needs a toolchain not affected by GCC bug 85862"
-	depends on BR2_TOOLCHAIN_HAS_GCC_BUG_85862 # libnss
Signature · 1 line
2.17.1
#6 lore raw

PATCH v2 3/7 package/ecryptfs-utils: remove libnss gcc bug dependency

Quoted 10 lines · On Wed, 26 Jun 2019 14:58:56 +0200 Giulio Benetti…

Package libnss has BR2_TOOLCHAIN_HAS_GCC_BUG_85862 dependency and since ecryptfs-utils depends on libnss it has to have this dependency too. But libnss has been worked around for Gcc Bug 85862 on previous patch, then we can remove 'depends on !BR_TOOLCHAIN_HAS_GCC_BUG_85862' and its comment from Config.in.

---
 package/ecryptfs-utils/Config.in | 4 ----
 1 file changed, 4 deletions(-)

Applied to master, thanks.

Thomas

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

PATCH v2 4/7 package/boost: remove gcc bug 85180 dependency for boost-fiber option

In reply to Giulio Benetti

BR2_TOOLCHAIN_HAS_GCC_BUG_85180 dependency is already satisfied because BR2_PACKAGE_BOOST_FIBER depends on BR2_PACKAGE_BOOST_CONTEXT_ARCH_SUPPORTS that doesn't contain BR2_microblaze and BR2_TOOLCHAIN_HAS_GCC_BUG_85180 depends right on BR2_microblaze. So let's remove 'depends on BR2_TOOLCHAIN_HAS_GCC_BUG_85180'.

---
V1->V2:
* don't allow building boost context since it's not supported for Microblaze

---
 package/boost/Config.in | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
package/boost/Config.in +2 -3
index 4e6bbff6df..392d7424fb 100644
@@ -136,7 +136,6 @@ config BR2_PACKAGE_BOOST_FIBER
 	# since mips32r2/mips64r2.
 	depends on !BR2_MIPS_CPU_MIPS32 && !BR2_MIPS_CPU_MIPS64
 	depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # boost-context
-	depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_85180
 	select BR2_PACKAGE_BOOST_CONTEXT
 	select BR2_PACKAGE_BOOST_FILESYSTEM
 	select BR2_PACKAGE_BOOST_SYSTEM
@@ -147,9 +146,9 @@ comment "boost-fiber needs a toolchain w/ NPTL"
 	depends on BR2_PACKAGE_BOOST_CONTEXT_ARCH_SUPPORTS
 	depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL
 
-comment "boost-fiber needs a toolchain not affected by GCC bug 64735, 85180"
+comment "boost-fiber needs a toolchain not affected by GCC bug 64735"
 	depends on BR2_PACKAGE_BOOST_CONTEXT_ARCH_SUPPORTS
-	depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 || BR2_TOOLCHAIN_HAS_GCC_BUG_85180
+	depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735
 
 config BR2_PACKAGE_BOOST_FILESYSTEM
 	bool "boost-filesystem"
Signature · 1 line
2.17.1
#8 lore raw

PATCH v2 4/7 package/boost: remove gcc bug 85180 dependency for boost-fiber option

Quoted 7 lines · On Wed, 26 Jun 2019 14:58:57 +0200 Giulio Benetti…

BR2_TOOLCHAIN_HAS_GCC_BUG_85180 dependency is already satisfied because BR2_PACKAGE_BOOST_FIBER depends on BR2_PACKAGE_BOOST_CONTEXT_ARCH_SUPPORTS that doesn't contain BR2_microblaze and BR2_TOOLCHAIN_HAS_GCC_BUG_85180 depends right on BR2_microblaze. So let's remove 'depends on BR2_TOOLCHAIN_HAS_GCC_BUG_85180'.

Quoted 8 lines

---
V1->V2:
* don't allow building boost context since it's not supported for Microblaze

---
 package/boost/Config.in | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

Applied to master, thanks.

Thomas

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

PATCH v2 5/7 package/prboom: avoid using hardcoded optimization flags

In reply to Giulio Benetti

Package prboom builds using -O2 flag ignoring Buildroot settings, this is due to the fact that -O2 is appended at the end of compiler flags.

Remove -O2 from 'configure.ac' file and set PRBOOM_AUTORECONF to YES, this way CFLAGS_OPTS will contain Buildroot TARGET_CFLAGS.

---
V1->V2:
* patch configure.ac instead of configure and autoreconf

 ...move-predefined-O2-optimization-flag.patch | 21 +++++++++++++++++++
 package/prboom/prboom.mk                      |  1 +
 2 files changed, 22 insertions(+)
 create mode 100644 package/prboom/0002-configure-remove-predefined-O2-optimization-flag.patch
package/prboom/0002-configure-remove-predefined-O2-optimization-flag.patch new file +21 -0
new file mode 100644
index 0000000000..9260cb6314
@@ -0,0 +1,21 @@
+configure: remove predefined -O2 optimization flag
+
+CFLAGS_OPT variable forces to use -O2 optimization flag denying the
+possibility to use different optimization flag values.
+
+Remove -O2 flag from CFLAGS_OPT.
+
+Signed-off-by: Giulio Benetti <[email protected]>
+---
+diff -urpN prboom-2.5.0.orig/configure.ac prboom-2.5.0/configure.ac
+--- prboom-2.5.0.orig/configure.ac	2019-06-20 14:07:45.058481879 +0200
++++ prboom-2.5.0/configure.ac	2019-06-20 14:09:05.066238825 +0200
+@@ -48,7 +48,7 @@ else
+ fi
+ 
+ dnl --- cph: work out flags to pass to compiler
+-CFLAGS_OPT="-O2 -fomit-frame-pointer"
++CFLAGS_OPT="-fomit-frame-pointer"
+ AC_C_COMPILE_FLAGS(-Wall)
+ dnl --- Option to enable debugging
+ AC_ARG_ENABLE(debug,AC_HELP_STRING([--enable-debug],[turns on various debugging features, like range checking and internal heap diagnostics]),,enable_debug="no")
package/prboom/prboom.mk +1 -0
index d370ae3fa5..325bf3eb02 100644
@@ -10,6 +10,7 @@ PRBOOM_CONF_ENV = ac_cv_type_uid_t=yes
 PRBOOM_DEPENDENCIES = sdl sdl_net sdl_mixer
 PRBOOM_LICENSE = GPL-2.0+
 PRBOOM_LICENSE_FILES = COPYING
+PRBOOM_AUTORECONF = YES
 
 ifeq ($(BR2_PACKAGE_LIBPNG),y)
 PRBOOM_DEPENDENCIES += libpng
Signature · 1 line
2.17.1
#10 lore raw

PATCH v2 5/7 package/prboom: avoid using hardcoded optimization flags

Quoted 7 lines · On Wed, 26 Jun 2019 14:58:58 +0200 Giulio Benetti…

Package prboom builds using -O2 flag ignoring Buildroot settings, this is due to the fact that -O2 is appended at the end of compiler flags.

Remove -O2 from 'configure.ac' file and set PRBOOM_AUTORECONF to YES, this way CFLAGS_OPTS will contain Buildroot TARGET_CFLAGS.

Your proposed solution is not ideal, because it really only prevents prboom from adding -O2, but not any other option. A better solution would have been to make sure that CFLAGS passed as ./configure environment or arguments appear *after* the CFLAGS defined by the configure.ac, so they can all be overridden. But well, that is too much effort for a completely unmaintained piece of software, so I applied your patch as-is.

Thanks!

Thomas

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

PATCH v2 5/7 package/prboom: avoid using hardcoded optimization flags

Quoted 13 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

Quoted 7 lines · On Wed, 26 Jun 2019 14:58:58 +0200 Giulio Benetti…

Package prboom builds using -O2 flag ignoring Buildroot settings, this is due to the fact that -O2 is appended at the end of compiler flags.

Remove -O2 from 'configure.ac' file and set PRBOOM_AUTORECONF to YES, this way CFLAGS_OPTS will contain Buildroot TARGET_CFLAGS.

Quoted 7 lines

Your proposed solution is not ideal, because it really only prevents prboom from adding -O2, but not any other option. A better solution would have been to make sure that CFLAGS passed as ./configure environment or arguments appear *after* the CFLAGS defined by the configure.ac, so they can all be overridden. But well, that is too much effort for a completely unmaintained piece of software, so I applied your patch as-is.

Committed to 2019.02.x and 2019.05.x, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#12 lore raw

PATCH v2 6/7 package/prboom: work around gcc bug 85180

In reply to Giulio Benetti

With Microblaze Gcc version < 8.x the build hangs due to gcc bug 85180: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=85180. The bug shows up when building prboom with optimization but not when building with -O0. To work around this, if BR2_TOOLCHAIN_HAS_GCC_BUG_85180=y we force using -O0.

Fixes:
http://autobuild.buildroot.net/results/e72/e72a2070ab7e9a093c3c70002ee94ee57a6154f6/

---
 package/prboom/prboom.mk | 8 ++++++++
 1 file changed, 8 insertions(+)
package/prboom/prboom.mk +8 -0
index 325bf3eb02..36692d29a3 100644
@@ -12,6 +12,14 @@ PRBOOM_LICENSE = GPL-2.0+
 PRBOOM_LICENSE_FILES = COPYING
 PRBOOM_AUTORECONF = YES
 
+PRBOOM_CFLAGS = $(TARGET_CFLAGS)
+
+ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85180),y)
+PRBOOM_CFLAGS += -O0
+endif
+
+PRBOOM_CONF_ENV += CFLAGS="$(PRBOOM_CFLAGS)"
+
 ifeq ($(BR2_PACKAGE_LIBPNG),y)
 PRBOOM_DEPENDENCIES += libpng
 endif
Signature · 1 line
2.17.1
#13 lore raw

PATCH v2 6/7 package/prboom: work around gcc bug 85180

Quoted 6 lines · On Wed, 26 Jun 2019 14:58:59 +0200 Giulio Benetti…

With Microblaze Gcc version < 8.x the build hangs due to gcc bug 85180: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=85180. The bug shows up when building prboom with optimization but not when building with -O0. To work around this, if BR2_TOOLCHAIN_HAS_GCC_BUG_85180=y we force using -O0.

Quoted 7 lines

Fixes:
http://autobuild.buildroot.net/results/e72/e72a2070ab7e9a093c3c70002ee94ee57a6154f6/

---
 package/prboom/prboom.mk | 8 ++++++++
 1 file changed, 8 insertions(+)

Applied to master, thanks.

Thomas

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

PATCH v2 6/7 package/prboom: work around gcc bug 85180

Quoted 11 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

Quoted 6 lines · On Wed, 26 Jun 2019 14:58:59 +0200 Giulio Benetti…

With Microblaze Gcc version < 8.x the build hangs due to gcc bug 85180: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=85180. The bug shows up when building prboom with optimization but not when building with -O0. To work around this, if BR2_TOOLCHAIN_HAS_GCC_BUG_85180=y we force using -O0.

Quoted 7 lines
Quoted 7 lines

Fixes:
http://autobuild.buildroot.net/results/e72/e72a2070ab7e9a093c3c70002ee94ee57a6154f6/

---
package/prboom/prboom.mk | 8 ++++++++

1 file changed, 8 insertions(+)

Committed to 2019.02.x and 2019.05.x, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#15 lore raw

PATCH v2 7/7 package/qt5/qt5webengine: re-enable building if BUG_85682=y on Qt5 Latest

In reply to Giulio Benetti

On Qt5 Latest package qt5webengine depends on package libnss that was affected by Gcc Bug 85862, but that bug has been worked around on libnss, so we can now remove 'depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_85862' as well as '|| BR2_PACKAGE_QT5_VERSION_5_6' that allowed to build qt5 version 5.6 that doesn't depend on libnss.

---
 package/qt5/qt5webengine/Config.in | 6 ------
 1 file changed, 6 deletions(-)
package/qt5/qt5webengine/Config.in +0 -6
index 744d659567..969582712e 100644
@@ -20,18 +20,12 @@ comment "qt5webengine needs an OpenGL and EGL-capable backend"
 	depends on BR2_PACKAGE_QT5WEBENGINE_ARCH_SUPPORTS
 	depends on !BR2_PACKAGE_QT5_GL_AVAILABLE || !BR2_PACKAGE_HAS_LIBEGL
 
-comment "qt5webengine needs a toolchain not affected by GCC bug 85862"
-	depends on BR2_PACKAGE_QT5WEBENGINE_ARCH_SUPPORTS
-	depends on !BR2_PACKAGE_QT5_VERSION_5_6
-	depends on BR2_TOOLCHAIN_HAS_GCC_BUG_85862 # libnss
-
 config BR2_PACKAGE_QT5WEBENGINE
 	bool "qt5webengine"
 	depends on BR2_PACKAGE_QT5WEBENGINE_ARCH_SUPPORTS
 	depends on BR2_TOOLCHAIN_USES_GLIBC # execinfo.h, mallinfo
 	depends on BR2_HOST_GCC_AT_LEAST_4_8 # qt5base-icu
 	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # qt5base-icu
-	depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_85862 || BR2_PACKAGE_QT5_VERSION_5_6 # libnss
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2, libvpx, qt5base-dbus
 	depends on BR2_USE_WCHAR # libglib2
 	depends on BR2_PACKAGE_QT5_GL_AVAILABLE # qt5declarative, qt5base-eglfs
Signature · 1 line
2.17.1
#16 lore raw

PATCH v2 7/7 package/qt5/qt5webengine: re-enable building if BUG_85682=y on Qt5 Latest

Quoted 11 lines · On Wed, 26 Jun 2019 14:59:00 +0200 Giulio Benetti…

On Qt5 Latest package qt5webengine depends on package libnss that was affected by Gcc Bug 85862, but that bug has been worked around on libnss, so we can now remove 'depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_85862' as well as '|| BR2_PACKAGE_QT5_VERSION_5_6' that allowed to build qt5 version 5.6 that doesn't depend on libnss.

---
 package/qt5/qt5webengine/Config.in | 6 ------
 1 file changed, 6 deletions(-)

Applied to master after reworking a bit the commit title and commit log.

Thanks,

Thomas

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