Fix perl so (hopefully) it works on both arm and armeb

1 files changed, 5 insertions, 261 deletions

diff --git a/packages/perl/perl-5.8.7/config.sh-arm-linux.patch b/packages/perl/perl-5.8.7/config.sh-arm-linux.patch
index dab2af8d84..ae162fbdc6 100644
--- a/packages/perl/perl-5.8.7/config.sh-arm-linux.patch
+++ b/packages/perl/perl-5.8.7/config.sh-arm-linux.patch
@@ -1,104 +1,5 @@
---- perl-5.8.7/Cross/config.sh-arm-linux	2005-05-13 14:38:54.000000000 +0000
-+++ config.sh-openslug	2005-07-25 16:42:49.000000000 +0000
-@@ -8,9 +8,9 @@
- 
- # Package name      : perl5
- # Source directory  : .
--# Configuration time: Wed Sep  3 22:24:58 EDT 2003
--# Configured by     : red
--# Target system     : linux openzaurus.criticalintegration.com 2.4.6-rmk1-np2-embedix #15 Wed Aug 6 07:49:44 UTC 2003 armv4l unknown 
-+# Configuration time: Mon Jul 25 15:21:53 UTC 2005
-+# Configured by     : slug
-+# Target system     : linux thg-slug1 2.6.12.2 #1 wed jul 20 01:50:24 cest 2005 armv5teb unknown unknown gnulinux 
- 
- Author=''
- Date='$Date'
-@@ -36,10 +36,10 @@
- api_version='8'
- api_versionstring='5.8.0'
- ar='ar'
--archlib='/usr/lib/perl5/5.8.7/armv4l-linux'
--archlibexp='/usr/lib/perl5/5.8.7/armv4l-linux'
-+archlib='/usr/lib/perl5/5.8.7/armeb-linux'
-+archlibexp='/usr/lib/perl5/5.8.7/armeb-linux'
- archname64=''
--archname='armv4l-linux'
-+archname='armeb-linux'
- archobjs=''
- asctime_r_proto='0'
- awk='awk'
-@@ -49,21 +49,21 @@
- binexp='/usr/bin'
- bison='bison'
- byacc='byacc'
--byteorder='1234'
-+byteorder='4321'
- c=''
--castflags='0'
-+castflags='1'
- cat='cat'
- cc='cc'
- cccdlflags='-fpic'
- ccdlflags='-rdynamic -Wl,-rpath,/usr/lib/perl5/5.8.7/armv4l-linux/CORE'
- ccflags='-fno-strict-aliasing -I/usr/local/include -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64'
- ccflags_uselargefiles='-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64'
- ccname='gcc'
- ccsymbols='__APCS_32__=1 __ARM_ARCH_3__=1 __CHAR_UNSIGNED__=1 __GNUC_MINOR__=95 __arm__=1 __linux=1 __linux__=1 __unix=1 __unix__=1 cpu=arm machine=arm system=posix system=unix'
- ccversion=''
--cf_by='red'
--cf_email='red@criticalintegration.com'
--cf_time='Wed Sep  3 22:24:58 EDT 2003'
-+cf_by='slug'
-+cf_email='slug@thg-slug1.thg.se'
-+cf_time='Mon Jul 25 15:21:53 UTC 2005'
- charsize='1'
- chgrp=''
- chmod='chmod'
-@@ -76,13 +76,13 @@
- cpio=''
- cpp='cpp'
- cpp_stuff='42'
- cppccsymbols='__ELF__=1 __GNUC__=2 linux=1 unix=1'
--cppflags='-fno-strict-aliasing -I/usr/local/include'
-+cppflags='-fno-strict-aliasing -I/usr/local/include -pipe -fno-strict-aliasing -pipe -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64'
- cpplast='-'
- cppminus='-'
- cpprun='cc -E'
- cppstdin='cc -E'
--cppsymbols='_FILE_OFFSET_BITS=64 __GLIBC__=2 __GLIBC_MINOR__=2 __GNUC_MINOR__=95 __GNU_LIBRARY__=6 _LARGEFILE_SOURCE=1 _POSIX_C_SOURCE=199506 _POSIX_SOURCE=1 __STDC__=1 __USE_BSD=1 __USE_FILE_OFFSET64=1 __USE_LARGEFILE=1 __USE_MISC=1 __USE_POSIX=1 __USE_POSIX199309=1 __USE_POSIX199506=1 __USE_POSIX2=1 __USE_SVID=1 __linux=1 __linux__=1 __unix=1 __unix__=1'
-+cppsymbols='__ELF__=1 _FILE_OFFSET_BITS=64 __GLIBC__=2 __GLIBC_MINOR__=4 __GNUC__=3 __GNUC_MINOR__=4 __GNU_LIBRARY__=6 _LARGEFILE_SOURCE=1 _POSIX_C_SOURCE=199506 _POSIX_SOURCE=1 __STDC__=1 __USE_BSD=1 __USE_FILE_OFFSET64=1 __USE_LARGEFILE=1 __USE_MISC=1 __USE_POSIX=1 __USE_POSIX199309=1 __USE_POSIX199506=1 __USE_POSIX2=1 __USE_SVID=1 linux=1 __linux=1 __linux__=1 unix=1 __unix=1 __unix__=1'
- crypt_r_proto='0'
- cryptlib=''
- csh='csh'
-@@ -119,8 +119,8 @@
- d_bsdsetpgrp='undef'
- d_bzero='define'
- d_casti32='define'
--d_castneg='define'
--d_charvspr='undef'
-+d_castneg='undef'
-+d_charvspr='define'
- d_chown='define'
- d_chroot='define'
- d_chsize='undef'
-@@ -131,7 +131,7 @@
- d_copysignl='define'
- d_crypt='define'
- d_crypt_r='undef'
--d_csh='define'
-+d_csh='undef'
- d_ctermid_r='undef'
- d_ctime_r='undef'
- d_cuserid='define'
-@@ -162,7 +162,7 @@
- d_endservent_r='undef'
- d_eofnblk='define'
- d_eunice='undef'
--d_faststdio='define'
-+d_faststdio='undef'
- d_fchdir='define'
- d_fchmod='define'
- d_fchown='define'
+--- ./Cross/config.sh-arm-linux.orig.old	2005-07-29 12:07:16.000000000 +0200
++++ ./Cross/config.sh-arm-linux	2005-07-29 12:09:27.000000000 +0200
 @@ -266,6 +266,7 @@
  d_killpg='define'
  d_lchown='define'
@@ -107,138 +8,7 @@
  d_link='define'
  d_localtime_r='undef'
  d_locconv='define'
-@@ -405,7 +406,7 @@
- d_sigaction='define'
- d_sigprocmask='define'
- d_sigsetjmp='define'
--d_sockatmark='undef'
-+d_sockatmark='define'
- d_sockatmarkproto='undef'
- d_socket='define'
- d_socklen_t='define'
-@@ -421,12 +422,12 @@
- d_statfs_s='define'
- d_statvfs='define'
- d_stdio_cnt_lval='undef'
--d_stdio_ptr_lval='define'
-+d_stdio_ptr_lval='undef'
- d_stdio_ptr_lval_nochange_cnt='undef'
--d_stdio_ptr_lval_sets_cnt='define'
-+d_stdio_ptr_lval_sets_cnt='undef'
- d_stdio_stream_array='undef'
--d_stdiobase='define'
--d_stdstdio='define'
-+d_stdiobase='undef'
-+d_stdstdio='undef'
- d_strchr='define'
- d_strcoll='define'
- d_strctcpy='define'
-@@ -465,7 +466,7 @@
- d_truncate='define'
- d_ttyname_r='undef'
- d_tzname='define'
--d_u32align='undef'
-+d_u32align='define'
- d_ualarm='define'
- d_umask='define'
- d_uname='define'
-@@ -530,11 +531,11 @@
- freetype='void'
- from=':'
- full_ar='/usr/bin/ar'
--full_csh='/bin/csh'
-+full_csh='csh'
- full_sed='/bin/sed'
- gccansipedantic=''
- gccosandvers=''
--gccversion='2.95.3 20010125 (prerelease)'
-+gccversion='3.4.4'
- getgrent_r_proto='0'
- getgrgid_r_proto='0'
- getgrnam_r_proto='0'
-@@ -562,14 +563,14 @@
- glibpth='/usr/shlib  /lib /usr/lib /usr/lib/386 /lib/386 /usr/ccs/lib /usr/ucblib /usr/local/lib '
- gmake='gmake'
- gmtime_r_proto='0'
--gnulibc_version='2.2.2'
-+gnulibc_version='2.3.90'
- grep='grep'
- groupcat='cat /etc/group'
- groupstype='gid_t'
- gzip='gzip'
- h_fcntl='false'
- h_sysfile='true'
--hint='recommended'
-+hint='previous'
- hostcat='cat /etc/hosts'
- html1dir=' '
- html1direxp=''
-@@ -670,7 +670,7 @@
- inc_version_list_init='0'
- incpath=''
- inews=''
--installarchlib='./install_me_here/usr/lib/perl5/5.8.7/armv4l-linux'
-+installarchlib='./install_me_here/usr/lib/perl5/5.8.7/armeb-linux'
- installbin='./install_me_here/usr/bin'
- installhtml1dir=''
- installhtml3dir=''
-@@ -706,21 +707,21 @@
- known_extensions='B ByteLoader Cwd DB_File Data/Dumper Devel/DProf Devel/PPPort Devel/Peek Digest/MD5 Encode Fcntl File/Glob Filter/Util/Call GDBM_File I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 NDBM_File ODBM_File Opcode POSIX PerlIO/encoding PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Thread Time/HiRes Unicode/Normalize XS/APItest XS/Typemap attrs re threads threads/shared'
- ksh=''
- ld='cc'
--lddlflags='-shared -L/usr/local/lib'
--ldflags=' -L/usr/local/lib'
-+lddlflags='-shared'
-+ldflags=''
- ldflags_uselargefiles=''
- ldlibpthname='LD_LIBRARY_PATH'
- less='less'
- lib_ext='.a'
--libc='/lib/libc-2.2.2.so'
--libperl='libperl.so'
--libpth='/usr/local/lib /lib /usr/lib'
-+libc='/lib/libc-2.3.90.so'
-+libperl='libperl.so'
-+libpth='/lib /usr/lib'
- libs='-lnsl -ldl -lm -lcrypt -lutil -lc'
--libsdirs=' /usr/lib'
--libsfiles=' libnsl.so libdl.so libm.so libcrypt.so libutil.so libc.so'
--libsfound=' /usr/lib/libnsl.so /usr/lib/libdl.so /usr/lib/libm.so /usr/lib/libcrypt.so /usr/lib/libutil.so /usr/lib/libc.so'
--libspath=' /usr/local/lib /lib /usr/lib'
--libswanted='sfio socket bind inet nsl nm ndbm gdbm dbm db malloc dl dld ld sun m crypt sec util c cposix posix ucb BSD'
-+libsdirs=''
-+libsfiles=''
-+libsfound=''
-+libspath=' /lib /usr/lib'
-+libswanted='sfio socket inet nsl nm ndbm gdbm dbm db malloc dl dld ld sun m crypt sec util c cposix posix ucb BSD'
- libswanted_uselargefiles=''
- line=''
- lint=''
-@@ -759,10 +760,10 @@
- more='more'
- multiarch='undef'
- mv=''
--myarchname='armv4l-linux'
--mydomain='.criticalintegration.com'
--myhostname='openzaurus'
--myuname='linux openzaurus.criticalintegration.com 2.4.6-rmk1-np2-embedix #15 Wed Aug 6 07:49:44 UTC 2003 armv4l unknown '
-+myarchname='armeb-linux'
-+mydomain='.thg.se'
-+myhostname='thg-slug1'
-+myuname='linux thg-slug1 2.6.12.2 #1 wed jul 20 01:50:24 cest 2005 armv5teb unknown unknown gnulinux '
- n='-n'
- need_va_copy='undef'
- netdb_hlen_type='size_t'
-@@ -789,19 +790,19 @@
- optimize='-O2'
- orderlib='false'
- osname='linux'
--osvers='2.4.6-rmk1-np2-embedix'
-+osvers='2.6.12.2'
- otherlibdirs=' '
- package='perl5'
--pager='/usr/bin/less'
-+pager='/bin/more'
+@@ -796,12 +797,12 @@
  passcat='cat /etc/passwd'
  patchlevel='8'
  path_sep=':'
@@ -246,39 +16,13 @@
 +perl5='hostperl'
  perl=''
  perl_patchlevel=''
--perladmin='red@criticalintegration.com'
--perllibs='-lnsl -ldl -lm -lcrypt -lutil -lc'
+ perladmin='red@criticalintegration.com'
+ perllibs='-lnsl -ldl -lm -lcrypt -lutil -lc'
 -perlpath='/usr/bin/perl'
-+perladmin='slug@thg-slug1.thg.se'
-+perllibs='-lnsl -ldl -lm -lcrypt -lutil -lc -lgcc_s'
 +perlpath='hostperl'
  pg='pg'
  phostname='hostname'
  pidtype='pid_t'
-@@ -865,15 +866,15 @@
- shortsize='2'
- shrpenv=''
- shsharp='true'
--sig_count='64'
--sig_name='ZERO HUP INT QUIT ILL TRAP ABRT BUS FPE KILL USR1 SEGV USR2 PIPE ALRM TERM STKFLT CHLD CONT STOP TSTP TTIN TTOU URG XCPU XFSZ VTALRM PROF WINCH IO PWR SYS RTMIN NUM33 NUM34 NUM35 NUM36 NUM37 NUM38 NUM39 NUM40 NUM41 NUM42 NUM43 NUM44 NUM45 NUM46 NUM47 NUM48 NUM49 NUM50 NUM51 NUM52 NUM53 NUM54 NUM55 NUM56 NUM57 NUM58 NUM59 NUM60 NUM61 NUM62 RTMAX IOT CLD POLL UNUSED '
--sig_name_init='"ZERO", "HUP", "INT", "QUIT", "ILL", "TRAP", "ABRT", "BUS", "FPE", "KILL", "USR1", "SEGV", "USR2", "PIPE", "ALRM", "TERM", "STKFLT", "CHLD", "CONT", "STOP", "TSTP", "TTIN", "TTOU", "URG", "XCPU", "XFSZ", "VTALRM", "PROF", "WINCH", "IO", "PWR", "SYS", "RTMIN", "NUM33", "NUM34", "NUM35", "NUM36", "NUM37", "NUM38", "NUM39", "NUM40", "NUM41", "NUM42", "NUM43", "NUM44", "NUM45", "NUM46", "NUM47", "NUM48", "NUM49", "NUM50", "NUM51", "NUM52", "NUM53", "NUM54", "NUM55", "NUM56", "NUM57", "NUM58", "NUM59", "NUM60", "NUM61", "NUM62", "RTMAX", "IOT", "CLD", "POLL", "UNUSED", 0'
--sig_num='0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 6 17 29 31 '
--sig_num_init='0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 6, 17, 29, 31, 0'
--sig_size='68'
-+sig_count='65'
-+sig_name='ZERO HUP INT QUIT ILL TRAP ABRT BUS FPE KILL USR1 SEGV USR2 PIPE ALRM TERM STKFLT CHLD CONT STOP TSTP TTIN TTOU URG XCPU XFSZ VTALRM PROF WINCH IO PWR SYS NUM32 NUM33 NUM34 RTMIN NUM36 NUM37 NUM38 NUM39 NUM40 NUM41 NUM42 NUM43 NUM44 NUM45 NUM46 NUM47 NUM48 NUM49 NUM50 NUM51 NUM52 NUM53 NUM54 NUM55 NUM56 NUM57 NUM58 NUM59 NUM60 NUM61 NUM62 NUM63 RTMAX IOT CLD POLL UNUSED '
-+sig_name_init='"ZERO", "HUP", "INT", "QUIT", "ILL", "TRAP", "ABRT", "BUS", "FPE", "KILL", "USR1", "SEGV", "USR2", "PIPE", "ALRM", "TERM", "STKFLT", "CHLD", "CONT", "STOP", "TSTP", "TTIN", "TTOU", "URG", "XCPU", "XFSZ", "VTALRM", "PROF", "WINCH", "IO", "PWR", "SYS", "NUM32", "NUM33", "NUM34", "RTMIN", "NUM36", "NUM37", "NUM38", "NUM39", "NUM40", "NUM41", "NUM42", "NUM43", "NUM44", "NUM45", "NUM46", "NUM47", "NUM48", "NUM49", "NUM50", "NUM51", "NUM52", "NUM53", "NUM54", "NUM55", "NUM56", "NUM57", "NUM58", "NUM59", "NUM60", "NUM61", "NUM62", "NUM63", "RTMAX", "IOT", "CLD", "POLL", "UNUSED", 0'
-+sig_num='0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 6 17 29 31 '
-+sig_num_init='0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 6, 17, 29, 31, 0'
-+sig_size='69'
- signal_t='void'
--sitearch='/usr/lib/perl5/site_perl/5.8.7/armv4l-linux'
--sitearchexp='/usr/lib/perl5/site_perl/5.8.7/armv4l-linux'
-+sitearch='/usr/lib/perl5/site_perl/5.8.7/armeb-linux'
-+sitearchexp='/usr/lib/perl5/site_perl/5.8.7/armeb-linux'
- sitebin='/usr/bin'
- sitebinexp='/usr/bin'
- sitehtml1dir=''
 @@ -906,7 +907,7 @@
  srandom_r_proto='0'
  src='.'