diff options
| author | Jeremy Lainé <jeremy.laine@m4x.org> | 2009-01-13 11:38:10 +0100 |
|---|---|---|
| committer | Jeremy Lainé <jeremy.laine@m4x.org> | 2009-01-13 11:38:10 +0100 |
| commit | 2557a9ae7fde409ae860053532821d4c49e80cb4 (patch) | |
| tree | eac2c31617add2244c8112f66af6eef51415a5e5 | |
| parent | a19b421d033bd76896d07d9bfd9ebc2cd05e7178 (diff) | |
openssl-0.9.8j: fix building of shared libraries on powerpc
| -rw-r--r-- | packages/openssl/openssl-0.9.8j/shared-libs.patch | 9 | ||||
| -rw-r--r-- | packages/openssl/openssl_0.9.8j.bb | 2 |
2 files changed, 10 insertions, 1 deletions
diff --git a/packages/openssl/openssl-0.9.8j/shared-libs.patch b/packages/openssl/openssl-0.9.8j/shared-libs.patch index eb1e4a6346..08b0c7594b 100644 --- a/packages/openssl/openssl-0.9.8j/shared-libs.patch +++ b/packages/openssl/openssl-0.9.8j/shared-libs.patch @@ -29,6 +29,15 @@ Index: openssl-0.9.8j/Makefile.org export CC FIPSLD_CC; \ fi; \ $(MAKE) -e SHLIBDIRS='crypto' build-shared; \ +@@ -371,7 +371,7 @@ + @if [ "$(SHLIB_TARGET)" != "" ]; then \ + shlibdeps=-lcrypto; \ + [ "$(FIPSCANLIB)" = "libfips" ] && shlibdeps="$$shlibdeps -lfips"; \ +- $(MAKE) SHLIBDIRS=ssl SHLIBDEPS="$$shlibdeps" build-shared; \ ++ $(MAKE) -e SHLIBDIRS=ssl SHLIBDEPS="$$shlibdeps" build-shared; \ + else \ + echo "There's no support for shared libraries on this platform" >&2 ; \ + exit 1; \ @@ -380,7 +380,7 @@ fips/fipscanister.o: build_fips libfips$(SHLIB_EXT): fips/fipscanister.o diff --git a/packages/openssl/openssl_0.9.8j.bb b/packages/openssl/openssl_0.9.8j.bb index 2bda7f7942..d40fb48bfe 100644 --- a/packages/openssl/openssl_0.9.8j.bb +++ b/packages/openssl/openssl_0.9.8j.bb @@ -2,7 +2,7 @@ inherit pkgconfig require openssl.inc -PR = "r0" +PR = "r1" SRC_URI += "file://configure-targets.patch;patch=1 \ file://shared-libs.patch;patch=1 \ |