18bd1e7364
Change-Id: I953fb203b1a24920f236c2f6e1fd9d82edda1f0f Reviewed-on: https://gerrit.libreoffice.org/1493 Reviewed-by: Peter Foley <pefoley2@verizon.net> Tested-by: Peter Foley <pefoley2@verizon.net>
66 lines
2.7 KiB
Diff
66 lines
2.7 KiB
Diff
--- misc/raptor-1.4.18/config.sub 2008-04-03 05:15:09.000000000 +0200
|
|
+++ misc/raptor-1.4.18/config.sub 2011-09-27 10:01:06.000000000 +0200
|
|
@@ -120,7 +120,7 @@
|
|
# Here we must recognize all the valid KERNEL-OS combinations.
|
|
maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
|
|
case $maybe_os in
|
|
- nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
|
|
+ nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
|
|
uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
|
|
storm-chaos* | os2-emx* | rtmk-nova*)
|
|
os=-$maybe_os
|
|
@@ -1250,7 +1250,7 @@
|
|
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
|
|
| -chorusos* | -chorusrdb* \
|
|
| -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
|
|
- | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
|
|
+ | -mingw32* | -linux-gnu* | -linux-androideabi* | -linux-newlib* | -linux-uclibc* \
|
|
| -uxpv* | -beos* | -mpeix* | -udk* \
|
|
| -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
|
|
| -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
|
|
--- misc/raptor-1.4.18/configure Sun Jun 15 10:25:55 2008
|
|
+++ misc/build/raptor-1.4.18/configure Wed Feb 18 13:23:12 2009
|
|
@@ -4321,7 +4321,7 @@
|
|
|
|
cygwin*)
|
|
# 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_deplibs_check_method='file_magic ^x86 archive|^x86 DLL'
|
|
lt_cv_file_magic_cmd='func_win32_libid'
|
|
;;
|
|
|
|
@@ -4330,7 +4330,7 @@
|
|
# func_win32_libid shell function, so use a weaker test based on 'objdump',
|
|
# unless we find 'file', for example because we are cross-compiling.
|
|
if ( file / ) >/dev/null 2>&1; then
|
|
- lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
|
|
+ lt_cv_deplibs_check_method='file_magic ^x86 archive|^x86 DLL'
|
|
lt_cv_file_magic_cmd='func_win32_libid'
|
|
else
|
|
lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
|
|
--- misc/raptor-1.4.18/ltmain.sh 2008-02-02 22:28:24.000000000 +0900
|
|
+++ misc/build/raptor-1.4.18/ltmain.sh 2008-07-08 11:58:42.000000000 +0900
|
|
@@ -3262,9 +3262,9 @@
|
|
revision="$number_revision"
|
|
;;
|
|
freebsd-aout|freebsd-elf|sunos)
|
|
- current="$number_major"
|
|
- revision="$number_minor"
|
|
- age="0"
|
|
+ current=`expr $number_major + $number_minor`
|
|
+ age="$number_minor"
|
|
+ revision="$number_revision"
|
|
;;
|
|
irix|nonstopux)
|
|
current=`expr $number_major + $number_minor`
|
|
@@ -3344,8 +3344,8 @@
|
|
;;
|
|
|
|
freebsd-elf)
|
|
- major=".$current"
|
|
- versuffix=".$current";
|
|
+ major=.`expr $current - $age`
|
|
+ versuffix="$major.$age.$revision"
|
|
;;
|
|
|
|
irix | nonstopux)
|