xz: Update to 5.2.6
+ some cleanup
This commit is contained in:
Christoph Reiter
parent
af1d9dd234
commit
0f3ab1f30d
26
xz/PKGBUILD
26
xz/PKGBUILD
@ -1,8 +1,8 @@
|
||||
# Maintainer: Alexey Pavlov <alexpux@gmail.com>
|
||||
|
||||
pkgname=('xz' 'liblzma' 'liblzma-devel')
|
||||
pkgver=5.2.5
|
||||
pkgrel=2
|
||||
pkgver=5.2.6
|
||||
pkgrel=1
|
||||
pkgdesc='Library and command line tools for XZ and LZMA compressed files'
|
||||
arch=('i686' 'x86_64')
|
||||
url='https://tukaani.org/xz/'
|
||||
@ -10,28 +10,23 @@ license=('GPL' 'LGPL' 'custom')
|
||||
depends=('sh' 'libiconv' 'gettext')
|
||||
makedepends=('libiconv-devel' 'gettext-devel' 'autotools' 'gcc')
|
||||
options=('staticlibs')
|
||||
source=("https://tukaani.org/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.sig}
|
||||
"https://tukaani.org/xz/xzgrep-ZDI-CAN-16587.patch"{,.sig}
|
||||
xz-5.0.5-msys2.patch)
|
||||
sha256sums=('f6f4910fd033078738bd82bfba4f49219d03b17eb0794eb91efbae419f4aba10'
|
||||
'SKIP'
|
||||
'98c6cb1042284fe704ec30083f3fc87364ce9ed2ea51f62bbb0ee9d3448717ec'
|
||||
'SKIP'
|
||||
'dcdc78794cbab03c2f88a4d52dee9e2606774e443e5ba1e4836426488410dd45')
|
||||
source=("https://tukaani.org/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.sig})
|
||||
sha256sums=('a2105abee17bcd2ebd15ced31b4f5eda6e17efd6b10f921a01cda4a44c91b3a0'
|
||||
'SKIP')
|
||||
validpgpkeys=('3690C240CE51B4670D30AD1C38EE757D69184620') # Lasse Collin <lasse.collin@tukaani.org>
|
||||
|
||||
prepare() {
|
||||
cd ${srcdir}/${pkgname}-${pkgver}
|
||||
|
||||
patch -p1 -i "${srcdir}/xzgrep-ZDI-CAN-16587.patch"
|
||||
patch -p1 -i ${srcdir}/xz-5.0.5-msys2.patch
|
||||
autoreconf -ivf
|
||||
}
|
||||
|
||||
build() {
|
||||
export lt_cv_deplibs_check_method='pass_all'
|
||||
cd ${srcdir}/${pkgname}-${pkgver}
|
||||
|
||||
export lt_cv_deplibs_check_method='pass_all'
|
||||
export MSYSTEM=CYGWIN
|
||||
local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
|
||||
./configure \
|
||||
--build=${CHOST} \
|
||||
--prefix=/usr \
|
||||
@ -54,10 +49,6 @@ package_xz() {
|
||||
cp -rf ${srcdir}/dest/usr/bin ${pkgdir}/usr/
|
||||
rm -f ${pkgdir}/usr/bin/*.dll
|
||||
cp -rf ${srcdir}/dest/usr/share ${pkgdir}/usr/
|
||||
|
||||
#install -d -m755 ${pkgdir}/usr/share/licenses/xz/
|
||||
#ln -sf /usr/share/doc/xz/COPYING ${pkgdir}/usr/share/licenses/xz/
|
||||
#ln -sf /usr/share/licenses/common/GPL2/license.txt ${pkgdir}/usr/share/doc/xz/COPYING.GPLv2
|
||||
}
|
||||
|
||||
package_liblzma() {
|
||||
@ -72,6 +63,7 @@ package_liblzma-devel() {
|
||||
pkgdesc="Liblzma headers and libraries"
|
||||
groups=('development')
|
||||
depends=("liblzma=${pkgver}" 'libiconv-devel' 'gettext-devel')
|
||||
|
||||
mkdir -p ${pkgdir}/usr
|
||||
cp -rf ${srcdir}/dest/usr/include ${pkgdir}/usr/
|
||||
cp -rf ${srcdir}/dest/usr/lib ${pkgdir}/usr/
|
||||
|
||||
@ -1,82 +0,0 @@
|
||||
diff -Naur xz-5.0.5/build-aux/compile xz-5.0.5-msys2/build-aux/compile
|
||||
--- xz-5.0.5/build-aux/compile 2013-06-30 17:17:56.000000000 +0400
|
||||
+++ xz-5.0.5-msys2/build-aux/compile 2013-07-03 09:05:25.586914000 +0400
|
||||
@@ -53,7 +53,7 @@
|
||||
MINGW*)
|
||||
file_conv=mingw
|
||||
;;
|
||||
- CYGWIN*)
|
||||
+ CYGWIN* | MSYS*)
|
||||
file_conv=cygwin
|
||||
;;
|
||||
*)
|
||||
@@ -67,7 +67,7 @@
|
||||
mingw/*)
|
||||
file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
|
||||
;;
|
||||
- cygwin/*)
|
||||
+ cygwin/* | msys*/)
|
||||
file=`cygpath -m "$file" || echo "$file"`
|
||||
;;
|
||||
wine/*)
|
||||
diff -Naur xz-5.0.5/build-aux/config.guess xz-5.0.5-msys2/build-aux/config.guess
|
||||
--- xz-5.0.5/build-aux/config.guess 2013-06-30 17:17:56.000000000 +0400
|
||||
+++ xz-5.0.5-msys2/build-aux/config.guess 2013-07-03 09:05:25.586914000 +0400
|
||||
@@ -866,6 +866,9 @@
|
||||
amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
|
||||
echo x86_64-unknown-cygwin
|
||||
exit ;;
|
||||
+ amd64:MSYS*:*:* | x86_64:MSYS*:*:*)
|
||||
+ echo x86_64-unknown-msys
|
||||
+ exit ;;
|
||||
prep*:SunOS:5.*:*)
|
||||
echo powerpcle-unknown-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
|
||||
exit ;;
|
||||
diff -Naur xz-5.0.5/build-aux/config.rpath xz-5.0.5-msys2/build-aux/config.rpath
|
||||
--- xz-5.0.5/build-aux/config.rpath 2013-06-30 17:17:38.000000000 +0400
|
||||
+++ xz-5.0.5-msys2/build-aux/config.rpath 2013-07-03 09:11:10.618164000 +0400
|
||||
@@ -64,7 +64,7 @@
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
- mingw* | cygwin* | pw32* | os2* | cegcc*)
|
||||
+ mingw* | cygwin* | msys* | pw32* | os2* | cegcc*)
|
||||
;;
|
||||
hpux9* | hpux10* | hpux11*)
|
||||
wl='-Wl,'
|
||||
@@ -138,7 +138,7 @@
|
||||
hardcode_minus_L=no
|
||||
|
||||
case "$host_os" in
|
||||
- cygwin* | mingw* | pw32* | cegcc*)
|
||||
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
|
||||
# FIXME: the MSVC++ port hasn't been tested in a loooong time
|
||||
# When not using gcc, we currently assume that we are using
|
||||
# Microsoft Visual C++.
|
||||
@@ -188,7 +188,7 @@
|
||||
ld_shlibs=no
|
||||
fi
|
||||
;;
|
||||
- cygwin* | mingw* | pw32* | cegcc*)
|
||||
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
|
||||
# hardcode_libdir_flag_spec is actually meaningless, as there is
|
||||
# no search path for DLLs.
|
||||
hardcode_libdir_flag_spec='-L$libdir'
|
||||
@@ -332,7 +332,7 @@
|
||||
;;
|
||||
bsdi[45]*)
|
||||
;;
|
||||
- cygwin* | mingw* | pw32* | cegcc*)
|
||||
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
|
||||
# When not using gcc, we currently assume that we are using
|
||||
# Microsoft Visual C++.
|
||||
# hardcode_libdir_flag_spec is actually meaningless, as there is
|
||||
@@ -523,7 +523,7 @@
|
||||
bsdi[45]*)
|
||||
library_names_spec='$libname$shrext'
|
||||
;;
|
||||
- cygwin* | mingw* | pw32* | cegcc*)
|
||||
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
|
||||
shrext=.dll
|
||||
library_names_spec='$libname.dll.a $libname.lib'
|
||||
;;
|
||||
Loading…
x
Reference in New Issue
Block a user