[arch-commits] Commit in lib32-openssl/trunk (2 files)
Pierre Schmitz
pierre at nymeria.archlinux.org
Sun Jan 12 10:50:39 UTC 2014
Date: Sunday, January 12, 2014 @ 11:50:39
Author: pierre
Revision: 103844
upgpkg: lib32-openssl 1.0.1.f-1
Added:
lib32-openssl/trunk/Makefile.org-Fix-usage-of-CC-gcc-m32.patch
Modified:
lib32-openssl/trunk/PKGBUILD
--------------------------------------------+
Makefile.org-Fix-usage-of-CC-gcc-m32.patch | 31 +++++++++++++++++++++++++++
PKGBUILD | 7 ++++--
2 files changed, 36 insertions(+), 2 deletions(-)
Added: Makefile.org-Fix-usage-of-CC-gcc-m32.patch
===================================================================
--- Makefile.org-Fix-usage-of-CC-gcc-m32.patch (rev 0)
+++ Makefile.org-Fix-usage-of-CC-gcc-m32.patch 2014-01-12 10:50:39 UTC (rev 103844)
@@ -0,0 +1,31 @@
+From 57bf275b260d74e9a1a6d84e180629b671e95fbe Mon Sep 17 00:00:00 2001
+From: Pierre Schmitz <pierre at archlinux.de>
+Date: Sun, 12 Jan 2014 11:31:05 +0100
+Subject: [PATCH] Makefile.org: Fix usage of CC=gcc -m32
+
+Commit 60adefa61025ffd7d56cf7ff8491008f783282bf introduced the use of the CC
+variable without quoting. This breaks e.g. multilib builds where CC is set to
+"gcc -m32".
+
+Signed-off-by: Pierre Schmitz <pierre at archlinux.de>
+---
+ Makefile.org | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.org b/Makefile.org
+index a9e2727..65a686d 100644
+--- a/Makefile.org
++++ b/Makefile.org
+@@ -302,7 +302,7 @@ libcrypto$(SHLIB_EXT): libcrypto.a fips_premain_dso$(EXE_EXT)
+ FIPSLD_CC="$(CC)"; CC=$(FIPSDIR)/bin/fipsld; \
+ export CC FIPSLD_CC FIPSLD_LIBCRYPTO; \
+ fi; \
+- $(MAKE) -e SHLIBDIRS=crypto CC=$${CC:-$(CC)} build-shared; \
++ $(MAKE) -e SHLIBDIRS=crypto CC="$${CC:-$(CC)}" build-shared; \
+ touch -c fips_premain_dso$(EXE_EXT); \
+ else \
+ echo "There's no support for shared libraries on this platform" >&2; \
+
+--
+1.8.5.2
+
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2014-01-12 10:44:40 UTC (rev 103843)
+++ PKGBUILD 2014-01-12 10:50:39 UTC (rev 103844)
@@ -19,11 +19,13 @@
source=("https://www.openssl.org/source/${_pkgbasename}-${_ver}.tar.gz"
"https://www.openssl.org/source/${_pkgbasename}-${_ver}.tar.gz.asc"
'no-rpath.patch'
- 'ca-dir.patch')
+ 'ca-dir.patch'
+ 'Makefile.org-Fix-usage-of-CC-gcc-m32.patch')
md5sums=('f26b09c028a0541cab33da697d522b25'
'SKIP'
'dc78d3d06baffc16217519242ce92478'
- '3bf51be3a1bbd262be46dc619f92aa90')
+ '3bf51be3a1bbd262be46dc619f92aa90'
+ '538d32f38705a24789c86e7a5be771d1')
prepare() {
cd $srcdir/$_pkgbasename-$_ver
@@ -32,6 +34,7 @@
patch -p0 -i $srcdir/no-rpath.patch
# set ca dir to /etc/ssl by default
patch -p0 -i $srcdir/ca-dir.patch
+ patch -p1 -i $srcdir/Makefile.org-Fix-usage-of-CC-gcc-m32.patch
}
build() {
More information about the arch-commits
mailing list