diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-03-16 10:34:49 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-03-16 10:34:49 +0100 |
| commit | f24ad15758f8eebcc46cb0c210f888491869d3f0 (patch) | |
| tree | 85c74dd33e056502de7a306161d28f5b15b274c2 /core/openssl | |
| parent | 5f4568c7f7ba204bc047d2c74a5721f23024b339 (diff) | |
| parent | 636ce8849a9c82c1787c2919ffcfe6685cb799d3 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/chmsee/PKGBUILD
community/darkstat/PKGBUILD
community/dbmail/PKGBUILD
community/dvdisaster/PKGBUILD
community/epic4/PKGBUILD
community/fb-client/PKGBUILD
community/fcrackzip/PKGBUILD
community/fdupes/PKGBUILD
community/flobopuyo/PKGBUILD
community/intel-tbb/PKGBUILD
community/openbsd-netcat/PKGBUILD
community/sunpinyin/PKGBUILD
community/tinc/PKGBUILD
community/uudeview/PKGBUILD
community/zathura/PKGBUILD
core/libedit/PKGBUILD
core/mkinitcpio-busybox/PKGBUILD
core/openssl/PKGBUILD
core/util-linux/PKGBUILD
extra/lua/PKGBUILD
gnome-unstable/pidgin/PKGBUILD
testing/openssl/PKGBUILD
testing/sudo/PKGBUILD
testing/udev/PKGBUILD
testing/util-linux/PKGBUILD
Diffstat (limited to 'core/openssl')
| -rw-r--r-- | core/openssl/PKGBUILD | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/core/openssl/PKGBUILD b/core/openssl/PKGBUILD index e5c5da68a..5ca2cbcb8 100644 --- a/core/openssl/PKGBUILD +++ b/core/openssl/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 137334 2011-09-07 08:58:53Z pierre $ +# $Id: PKGBUILD 153454 2012-03-14 16:44:04Z pierre $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgname=openssl -_ver=1.0.0e +_ver=1.0.0h # use a pacman compatible version scheme pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}} pkgrel=1 @@ -19,18 +19,12 @@ source=("https://www.openssl.org/source/${pkgname}-${_ver}.tar.gz" 'no-rpath.patch' 'gnu-linux-mips64el-gcc.patch' 'ca-dir.patch') -md5sums=('7040b89c4c58c7a1016c0dfa6e821c86' +md5sums=('a5bc483c570f2ac3758ce5c19b667fab' '5bbc0655bda2af95bc8eb568963ce8ba' 'dc78d3d06baffc16217519242ce92478' 'd7115f0cc44df346d7b68c681819f94b' '3bf51be3a1bbd262be46dc619f92aa90') -[ "$CARCH" = "mips64el" ] && \ -makedepends=('imake') - -# keep an upgrade path for older installations -PKGEXT='.pkg.tar.gz' - build() { cd $srcdir/$pkgname-$_ver @@ -59,7 +53,7 @@ build() { if [ "$CARCH" = "mips64el" ]; then ./Configure --prefix=/usr --openssldir=/etc/ssl --libdir=lib \ shared zlib enable-md2 \ - "${openssltarget}" -Wa,--noexecstack "${CFLAGS}" + "${openssltarget}" -Wa,--noexecstack "${CFLAGS}" "${LDFLAGS}" else ./Configure --prefix=/usr --openssldir=/etc/ssl --libdir=lib \ shared zlib enable-md2 \ |