Skip to contentSkip to conversation

fix rpm autobuild failure

PATCH New Thomas De Schampheleire 2 participants 4 messages Nov 22, 2013

lore
Share & tools
lore
#1 lore raw

PATCH 1/1 beecrypt: include sequence numbers in patch names

[ThomasDS: minor change in commit message]

---
...beecrypt-0001-cppglue.cxx-cplusplus-only.patch} | 0

 ...=> beecrypt-0002-icu-check-cross-compile.patch} |    0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename package/beecrypt/{beecrypt-cppglue.cxx-cplusplus-only.patch => beecrypt-0001-cppglue.cxx-cplusplus-only.patch} (100%)
 rename package/beecrypt/{beecrypt-icu-check-cross-compile.patch => beecrypt-0002-icu-check-cross-compile.patch} (100%)
package/beecrypt/beecrypt-0001-cppglue.cxx-cplusplus-only.patch renamed from package/beecrypt/beecrypt-cppglue.cxx-cplusplus-only.patch +0 -0
rename from package/beecrypt/beecrypt-cppglue.cxx-cplusplus-only.patch
rename to package/beecrypt/beecrypt-0001-cppglue.cxx-cplusplus-only.patch
package/beecrypt/beecrypt-0002-icu-check-cross-compile.patch renamed from package/beecrypt/beecrypt-icu-check-cross-compile.patch +0 -0
rename from package/beecrypt/beecrypt-icu-check-cross-compile.patch
rename to package/beecrypt/beecrypt-0002-icu-check-cross-compile.patch
#2 lore raw

PATCH 1/1 beecrypt: unconditionally disable openpm

In reply to Thomas De Schampheleire

beecrypt does not properly handle its dependency on openpm, so that applications using libbeecrypt are not aware that they also need openmp (libgomp). This causes error messages during linking, such as (rpm):

..-gcc [..] -lbeecrypt -lbz2 -lz -lpopt -lpthread libbecrypt.so: undefined reference to GOMP_sections_end_nowait' libbecrypt.so: undefined reference to GOMP_parallel_end' libbecrypt.so: undefined reference to GOMP_sections_next' libbecrypt.so: undefined reference to GOMP_parallel_sections_start'

Because the openpm dependency of beecrypt is only used by rsa.c, to parallelize the calculation of RSA cyphers, we can simply disable openmp in beecrypt instead of trying to fix the way -lgomp is passed.

Fixes http://autobuild.buildroot.net/results/bcf/bcff4b81bfbb1191f97317b0945c74d948c9774b/

---
 package/beecrypt/beecrypt.mk |  3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

Note: this is an alternative fix to the above autobuild than the one Vicente posted earlier today.

package/beecrypt/beecrypt.mk +2 -1
@@ -19,7 +19,8 @@ BEECRYPT_CONF_ENV = \
 
 BEECRYPT_CONF_OPT = \
 		--without-java \
-		--without-python
+		--without-python \
+		--disable-openmp
 
 ifeq ($(BR2_PACKAGE_ICU),y)
 # C++ support needs icu
#3 lore raw

PATCH 1/1 fix rpm autobuild failure

In reply to Thomas De Schampheleire
Quoted 4 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas De Schampheleire <[email protected]> writes:

This series incorporates one patch from Vicente, and provides an alternative fix to the recent rpm autobuild failure.

Committed series, thanks.

Signature · 1 line
Bye, Peter Korsgaard