Merge pull request #4267 from lazka/lzo2-rebuild-2023-12-13
lzo2: rebuild
This commit is contained in:
Christoph Reiter
GitHub
commit
c2fef2cfcf
@ -3,25 +3,22 @@
|
||||
pkgbase=lzo2
|
||||
pkgname=('liblzo2' 'liblzo2-devel')
|
||||
pkgver=2.10
|
||||
pkgrel=2
|
||||
pkgrel=3
|
||||
pkgdesc="Portable lossless data compression library"
|
||||
arch=('i686' 'x86_64')
|
||||
url="https://www.oberhumer.com/opensource/lzo"
|
||||
license=('GPL')
|
||||
makedepends=('gcc' 'patch' 'autotools')
|
||||
groups=('libraries' 'compression')
|
||||
source=(https://www.oberhumer.com/opensource/lzo/download/lzo-${pkgver}.tar.gz
|
||||
lzo-2.07-msys2.patch)
|
||||
source=(https://www.oberhumer.com/opensource/lzo/download/lzo-${pkgver}.tar.gz)
|
||||
options=(!libtool)
|
||||
sha256sums=('c0f892943208266f9b6543b3ae308fab6284c5c90e627931446fb49b4221a072'
|
||||
'bc144d5cc547dd0a7c0923130ef4de268a622f6eab6ebfc705d7b0ea87bfa401')
|
||||
sha256sums=('c0f892943208266f9b6543b3ae308fab6284c5c90e627931446fb49b4221a072')
|
||||
msys2_references=(
|
||||
'archlinux: lzo'
|
||||
)
|
||||
|
||||
prepare() {
|
||||
cd "${srcdir}/lzo-${pkgver}"
|
||||
patch -p1 -i ${srcdir}/lzo-2.07-msys2.patch
|
||||
|
||||
autoreconf -fi
|
||||
}
|
||||
@ -29,9 +26,10 @@ prepare() {
|
||||
build() {
|
||||
cd "${srcdir}/lzo-${pkgver}"
|
||||
|
||||
local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
|
||||
./configure \
|
||||
--prefix=/usr \
|
||||
--build=${CHOST} \
|
||||
--build=${CYGWIN_CHOST} \
|
||||
--enable-shared
|
||||
|
||||
make
|
||||
|
||||
@ -1,131 +0,0 @@
|
||||
diff -Naur lzo-2.07-orig/autoconf/compile lzo-2.07/autoconf/compile
|
||||
--- lzo-2.07-orig/autoconf/compile 2014-06-25 17:47:13.000000000 +0400
|
||||
+++ lzo-2.07/autoconf/compile 2014-06-28 16:55:09.415600000 +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 lzo-2.07-orig/autoconf/config.guess lzo-2.07/autoconf/config.guess
|
||||
--- lzo-2.07-orig/autoconf/config.guess 2014-06-25 17:47:13.000000000 +0400
|
||||
+++ lzo-2.07/autoconf/config.guess 2014-06-28 16:59:01.912600000 +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 ;;
|
||||
p*:CYGWIN*:*)
|
||||
echo powerpcle-unknown-cygwin
|
||||
exit ;;
|
||||
diff -Naur lzo-2.07-orig/autoconf/config.rpath lzo-2.07/autoconf/config.rpath
|
||||
--- lzo-2.07-orig/autoconf/config.rpath 2014-06-25 17:47:13.000000000 +0400
|
||||
+++ lzo-2.07/autoconf/config.rpath 2014-06-28 16:55:09.431200000 +0400
|
||||
@@ -57,7 +57,7 @@
|
||||
aix*)
|
||||
wl='-Wl,'
|
||||
;;
|
||||
- mingw* | cygwin* | pw32* | os2* | cegcc*)
|
||||
+ mingw* | cygwin* | msys* | pw32* | os2* | cegcc*)
|
||||
;;
|
||||
hpux9* | hpux10* | hpux11*)
|
||||
wl='-Wl,'
|
||||
@@ -149,7 +149,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++.
|
||||
@@ -198,7 +198,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'
|
||||
@@ -348,7 +348,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
|
||||
@@ -533,7 +533,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'
|
||||
;;
|
||||
diff -Naur lzo-2.07-orig/autoconf/shtool lzo-2.07/autoconf/shtool
|
||||
--- lzo-2.07-orig/autoconf/shtool 2014-06-25 17:47:13.000000000 +0400
|
||||
+++ lzo-2.07/autoconf/shtool 2014-06-28 16:55:09.446800000 +0400
|
||||
@@ -679,7 +679,7 @@
|
||||
term_bold=`awk 'BEGIN { printf("%c%c%c%c", 27, 91, 49, 109); }' </dev/null 2>/dev/null`
|
||||
term_norm=`awk 'BEGIN { printf("%c%c%c", 27, 91, 109); }' </dev/null 2>/dev/null`
|
||||
;;
|
||||
- vt100|vt100*|cygwin)
|
||||
+ vt100|vt100*|cygwin|msys)
|
||||
term_bold=`awk 'BEGIN { printf("%c%c%c%c%c%c", 27, 91, 49, 109, 0, 0); }' </dev/null 2>/dev/null`
|
||||
term_norm=`awk 'BEGIN { printf("%c%c%c%c%c", 27, 91, 109, 0, 0); }' </dev/null 2>/dev/null`
|
||||
;;
|
||||
@@ -3039,6 +3039,36 @@
|
||||
sed -e 's/^/#/' -e 's/^#\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/' -e 's/^#.*$//'`
|
||||
case "$v" in
|
||||
4.0 ) SC="$SC[ NT]" ;;
|
||||
+ 5.0 ) SC="$SC[ 2000]" ;;
|
||||
+ 5.1 ) SC="$SC[ XP]" ;;
|
||||
+ 6.0 ) SC="$SC[ Vista]" ;;
|
||||
+ esac
|
||||
+ ;;
|
||||
+
|
||||
+ # Windows/MSYS
|
||||
+ *:MSYS*:* )
|
||||
+ # determine architecture
|
||||
+ AT="`uname -m`"
|
||||
+ AP="${AT}"
|
||||
+ case "${AP}" in
|
||||
+ i?86 ) AP="iX86" ;;
|
||||
+ esac
|
||||
+ AC="${AP}"
|
||||
+ # determine system
|
||||
+ unset v1; unset v2; unset v3
|
||||
+ eval `echo "${UNAME_RELEASE}" |\
|
||||
+ sed -e 's/^/#/' \
|
||||
+ -e 's/^#\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*$/v1="\1"; v2="\2"; v3="\3"/' \
|
||||
+ -e 's/^#\([0-9][0-9]*\)\.\([0-9][0-9]*\).*$/v1="\1"; v2="\2"/' \
|
||||
+ -e 's/^#\([0-9][0-9]*\).*$/v1="\1"/' \
|
||||
+ -e 's/^#.*$/v1="0"/'`
|
||||
+ ST="Msys ${v1}${v2+.$v2}${v3+[.$v3]}"
|
||||
+ SP="$ST"
|
||||
+ SC="Windows"
|
||||
+ v=`echo "${UNAME_SYSTEM}" | sed -e 's/^MSYS_NT-//' |\
|
||||
+ sed -e 's/^/#/' -e 's/^#\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/' -e 's/^#.*$//'`
|
||||
+ case "$v" in
|
||||
+ 4.0 ) SC="$SC[ NT]" ;;
|
||||
5.0 ) SC="$SC[ 2000]" ;;
|
||||
5.1 ) SC="$SC[ XP]" ;;
|
||||
6.0 ) SC="$SC[ Vista]" ;;
|
||||
Loading…
x
Reference in New Issue
Block a user