lzo2: Rebuild
This commit is contained in:
Alexey Pavlov
parent
659530da36
commit
e7ff04d19b
@ -3,7 +3,7 @@
|
||||
pkgbase=lzo2
|
||||
pkgname=('liblzo2' 'liblzo2-devel')
|
||||
pkgver=2.10
|
||||
pkgrel=1
|
||||
pkgrel=2
|
||||
pkgdesc="Portable lossless data compression library"
|
||||
arch=('i686' 'x86_64')
|
||||
url="https://www.oberhumer.com/opensource/lzo"
|
||||
@ -14,7 +14,7 @@ source=(https://www.oberhumer.com/opensource/lzo/download/lzo-${pkgver}.tar.gz
|
||||
lzo-2.07-msys2.patch)
|
||||
options=(!libtool)
|
||||
sha256sums=('c0f892943208266f9b6543b3ae308fab6284c5c90e627931446fb49b4221a072'
|
||||
'8f2bf70693d6efe5b98ad394c76d88467cc3f7ac124cc1850d2b2847bc5f6cba')
|
||||
'bc144d5cc547dd0a7c0923130ef4de268a622f6eab6ebfc705d7b0ea87bfa401')
|
||||
|
||||
prepare() {
|
||||
cd "${srcdir}/lzo-${pkgver}"
|
||||
@ -26,7 +26,10 @@ prepare() {
|
||||
build() {
|
||||
cd "${srcdir}/lzo-${pkgver}"
|
||||
|
||||
./configure --prefix=/usr --enable-shared
|
||||
./configure \
|
||||
--prefix=/usr \
|
||||
--build=${CHOST} \
|
||||
--enable-shared
|
||||
|
||||
make
|
||||
make DESTDIR=${srcdir}/dest install
|
||||
|
||||
@ -1,214 +1,3 @@
|
||||
diff -Naur lzo-2.07-orig/aclocal.m4 lzo-2.07/aclocal.m4
|
||||
--- lzo-2.07-orig/aclocal.m4 2014-06-25 17:47:13.000000000 +0400
|
||||
+++ lzo-2.07/aclocal.m4 2014-06-28 16:58:12.251400000 +0400
|
||||
@@ -1679,7 +1679,7 @@
|
||||
lt_cv_sys_max_cmd_len=-1;
|
||||
;;
|
||||
|
||||
- cygwin* | mingw* | cegcc*)
|
||||
+ cygwin* | msys* | mingw* | cegcc*)
|
||||
# On Win9x/ME, this test blows up -- it succeeds, but takes
|
||||
# about 5 minutes as the teststring grows exponentially.
|
||||
# Worse, since 9x/ME are not pre-emptively multitasking,
|
||||
@@ -1927,7 +1927,7 @@
|
||||
lt_cv_dlopen_libs=
|
||||
;;
|
||||
|
||||
- cygwin*)
|
||||
+ cygwin* | msys*)
|
||||
lt_cv_dlopen=dlopen
|
||||
lt_cv_dlopen_libs=
|
||||
;;
|
||||
@@ -2413,7 +2413,7 @@
|
||||
# libtool to hard-code these into programs
|
||||
;;
|
||||
|
||||
-cygwin* | mingw* | pw32* | cegcc*)
|
||||
+cygwin* | msys* | mingw* | pw32* | cegcc*)
|
||||
version_type=windows
|
||||
shrext_cmds=.dll
|
||||
need_version=no
|
||||
@@ -2445,6 +2445,12 @@
|
||||
m4_if([$1], [],[
|
||||
sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"])
|
||||
;;
|
||||
+ msys*)
|
||||
+ # MSYS DLLs use 'msys-' prefix rather than 'lib'
|
||||
+ soname_spec='`echo $libname | sed -e 's/^lib/msys-/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
|
||||
+m4_if([$1], [],[
|
||||
+ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"])
|
||||
+ ;;
|
||||
mingw* | cegcc*)
|
||||
# MinGW DLLs use traditional 'lib' prefix
|
||||
soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
|
||||
@@ -2479,7 +2485,7 @@
|
||||
# Convert to MSYS style.
|
||||
sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'`
|
||||
;;
|
||||
- cygwin*)
|
||||
+ cygwin* | msys*)
|
||||
# Convert to unix form, then to dos form, then back to unix form
|
||||
# but this time dos style (no spaces!) so that the unix form looks
|
||||
# like /cygdrive/c/PROGRA~1:/cygdr...
|
||||
@@ -3221,7 +3227,7 @@
|
||||
esac
|
||||
reload_cmds='$LD$reload_flag -o $output$reload_objs'
|
||||
case $host_os in
|
||||
- cygwin* | mingw* | pw32* | cegcc*)
|
||||
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
|
||||
if test yes != "$GCC"; then
|
||||
reload_cmds=false
|
||||
fi
|
||||
@@ -3277,7 +3283,7 @@
|
||||
lt_cv_file_magic_test_file=/shlib/libc.so
|
||||
;;
|
||||
|
||||
-cygwin*)
|
||||
+cygwin* | msys*)
|
||||
# func_win32_libid is a shell function defined in ltmain.sh
|
||||
lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
|
||||
lt_cv_file_magic_cmd='func_win32_libid'
|
||||
@@ -3582,7 +3588,7 @@
|
||||
[lt_cv_sharedlib_from_linklib_cmd='unknown'
|
||||
|
||||
case $host_os in
|
||||
-cygwin* | mingw* | pw32* | cegcc*)
|
||||
+cygwin* | msys* | mingw* | pw32* | cegcc*)
|
||||
# two different shell functions defined in ltmain.sh;
|
||||
# decide which one to use based on capabilities of $DLLTOOL
|
||||
case `$DLLTOOL --help 2>&1` in
|
||||
@@ -3652,7 +3658,7 @@
|
||||
[AC_REQUIRE([AC_CANONICAL_HOST])dnl
|
||||
LIBM=
|
||||
case $host in
|
||||
-*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*)
|
||||
+*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-msys* | *-*-haiku* | *-*-pw32* | *-*-darwin*)
|
||||
# These system don't have libm, or don't need it
|
||||
;;
|
||||
*-ncr-sysv4.3*)
|
||||
@@ -3727,7 +3733,7 @@
|
||||
aix*)
|
||||
symcode='[[BCDT]]'
|
||||
;;
|
||||
-cygwin* | mingw* | pw32* | cegcc*)
|
||||
+cygwin* | msys* | mingw* | pw32* | cegcc*)
|
||||
symcode='[[ABCDGISTW]]'
|
||||
;;
|
||||
hpux*)
|
||||
@@ -4033,7 +4039,7 @@
|
||||
beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
|
||||
# PIC is the default for these OSes.
|
||||
;;
|
||||
- mingw* | cygwin* | os2* | pw32* | cegcc*)
|
||||
+ mingw* | cygwin* | msys* | os2* | pw32* | cegcc*)
|
||||
# This hack is so that the source file can tell whether it is being
|
||||
# built for inclusion in a dll (and should export symbols for example).
|
||||
# Although the cygwin gcc ignores -fPIC, still need this for old-style
|
||||
@@ -4104,7 +4110,7 @@
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
- mingw* | cygwin* | os2* | pw32* | cegcc*)
|
||||
+ mingw* | cygwin* | msys* | os2* | pw32* | cegcc*)
|
||||
# This hack is so that the source file can tell whether it is being
|
||||
# built for inclusion in a dll (and should export symbols for example).
|
||||
m4_if([$1], [GCJ], [],
|
||||
@@ -4352,7 +4358,7 @@
|
||||
# PIC is the default for these OSes.
|
||||
;;
|
||||
|
||||
- mingw* | cygwin* | pw32* | os2* | cegcc*)
|
||||
+ mingw* | cygwin* | msys* | pw32* | os2* | cegcc*)
|
||||
# This hack is so that the source file can tell whether it is being
|
||||
# built for inclusion in a dll (and should export symbols for example).
|
||||
# Although the cygwin gcc ignores -fPIC, still need this for old-style
|
||||
@@ -4451,7 +4457,7 @@
|
||||
esac
|
||||
;;
|
||||
|
||||
- mingw* | cygwin* | pw32* | os2* | cegcc*)
|
||||
+ mingw* | cygwin* | msys* | pw32* | os2* | cegcc*)
|
||||
# This hack is so that the source file can tell whether it is being
|
||||
# built for inclusion in a dll (and should export symbols for example).
|
||||
m4_if([$1], [GCJ], [],
|
||||
@@ -4717,7 +4723,7 @@
|
||||
pw32*)
|
||||
_LT_TAGVAR(export_symbols_cmds, $1)=$ltdll_cmds
|
||||
;;
|
||||
- cygwin* | mingw* | cegcc*)
|
||||
+ cygwin* | msys* | mingw* | cegcc*)
|
||||
case $cc_basename in
|
||||
cl*)
|
||||
_LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
|
||||
@@ -4775,7 +4781,7 @@
|
||||
extract_expsyms_cmds=
|
||||
|
||||
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++.
|
||||
@@ -4890,7 +4896,7 @@
|
||||
fi
|
||||
;;
|
||||
|
||||
- cygwin* | mingw* | pw32* | cegcc*)
|
||||
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
|
||||
# _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
|
||||
# as there is no search path for DLLs.
|
||||
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
|
||||
@@ -5265,7 +5271,7 @@
|
||||
_LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
|
||||
;;
|
||||
|
||||
- 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
|
||||
@@ -6255,7 +6261,7 @@
|
||||
esac
|
||||
;;
|
||||
|
||||
- cygwin* | mingw* | pw32* | cegcc*)
|
||||
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
|
||||
case $GXX,$cc_basename in
|
||||
,cl* | no,cl*)
|
||||
# Native MSVC
|
||||
@@ -7941,7 +7947,7 @@
|
||||
*-*-mingw* ) # actually msys
|
||||
lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
|
||||
;;
|
||||
- *-*-cygwin* )
|
||||
+ *-*-cygwin* | *-*-msys* )
|
||||
lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
|
||||
;;
|
||||
* ) # otherwise, assume *nix
|
||||
@@ -7949,12 +7955,12 @@
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
- *-*-cygwin* )
|
||||
+ *-*-cygwin* | *-*-msys* )
|
||||
case $build in
|
||||
*-*-mingw* ) # actually msys
|
||||
lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
|
||||
;;
|
||||
- *-*-cygwin* )
|
||||
+ *-*-cygwin* | *-*-msys* )
|
||||
lt_cv_to_host_file_cmd=func_convert_file_noop
|
||||
;;
|
||||
* ) # otherwise, assume *nix
|
||||
@@ -8117,7 +8123,7 @@
|
||||
[enable_win32_dll=yes
|
||||
|
||||
case $host in
|
||||
-*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
|
||||
+*-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
|
||||
AC_CHECK_TOOL(AS, as, false)
|
||||
AC_CHECK_TOOL(DLLTOOL, dlltool, false)
|
||||
AC_CHECK_TOOL(OBJDUMP, objdump, false)
|
||||
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
|
||||
@ -291,18 +80,6 @@ diff -Naur lzo-2.07-orig/autoconf/config.rpath lzo-2.07/autoconf/config.rpath
|
||||
shrext=.dll
|
||||
library_names_spec='$libname.dll.a $libname.lib'
|
||||
;;
|
||||
diff -Naur lzo-2.07-orig/autoconf/local.m4 lzo-2.07/autoconf/local.m4
|
||||
--- lzo-2.07-orig/autoconf/local.m4 2014-06-25 17:47:13.000000000 +0400
|
||||
+++ lzo-2.07/autoconf/local.m4 2014-06-28 16:55:09.431200000 +0400
|
||||
@@ -534,7 +534,7 @@
|
||||
AC_DEFUN([mfx_CHECK_LIB_WINMM], [
|
||||
if test "X$GCC" = Xyes; then
|
||||
case $host_os in
|
||||
-cygwin* | mingw* | pw32*)
|
||||
+cygwin* | msys* | mingw* | pw32*)
|
||||
test "X$LIBS" != "X" && LIBS="$LIBS "
|
||||
LIBS="${LIBS}-lwinmm" ;;
|
||||
esac
|
||||
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
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user