Date: Sunday, May 8, 2011 @ 05:33:27
Author: pierre
Revision: 123093
Respect CFLAGS and LDFLAGS; see FS#24145
Modified:
openssl/trunk/PKGBUILD
----------+
PKGBUILD | 22 +++++++++++++++++-----
1 file changed, 17 insertions(+), 5 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2011-05-08 07:57:27 UTC (rev 123092)
+++ PKGBUILD 2011-05-08 09:33:27 UTC (rev 123093)
@@ -29,6 +29,12 @@
build() {
cd $srcdir/$pkgname-$_ver
+ if [ "${CARCH}" == 'x86_64' ]; then
+ openssltarget='linux-x86_64'
+ elif [ "${CARCH}" == 'i686' ]; then
+ openssltarget='linux-elf'
+ fi
+
# avoid conflicts with other man pages
# see http://www.linuxfromscratch.org/patches/downloads/openssl/
patch -p1 -i $srcdir/fix-manpages.patch
@@ -37,16 +43,22 @@
# set ca dir to /etc/ssl by default
patch -p0 -i $srcdir/ca-dir.patch
# mark stack as non-executable: http://bugs.archlinux.org/task/12434
- ./config --prefix=/usr --openssldir=/etc/ssl --libdir=lib \
- shared zlib enable-md2 -Wa,--noexecstack
+ ./Configure --prefix=/usr --openssldir=/etc/ssl --libdir=lib \
+ shared zlib enable-md2 \
+ "${openssltarget}" \
+ -Wa,--noexecstack "${CFLAGS}" "${LDFLAGS}"
+ make depend
make
+}
+check() {
+ cd $srcdir/$pkgname-$_ver
# the test fails due to missing write permissions in /etc/ssl
# revert this patch for make test
- #patch -p0 -R -i $srcdir/ca-dir.patch
- #make test
- #patch -p0 -i $srcdir/ca-dir.patch
+ patch -p0 -R -i $srcdir/ca-dir.patch
+ make test
+ patch -p0 -i $srcdir/ca-dir.patch
}
package() {
