From e93658a33b15e53413f32f78c355a7998131aa49 Mon Sep 17 00:00:00 2001 From: John Mark Bell Date: Thu, 30 Dec 2010 12:04:57 +0000 Subject: Build runes for RISC OS SDK. libxml2 must not depend on libiconv.d, as we may not want libiconv in the SDK (e.g. if iconv is provided by the runtime) Change the way we provide environment to subprocesses -- some buildsystems (i.e. OSLib's) dislike CC being overridden with the target compiler svn path=/toolchains/; revision=11171 --- sdk/recipes/patches/openssl/Configure.p | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'sdk/recipes/patches/openssl/Configure.p') diff --git a/sdk/recipes/patches/openssl/Configure.p b/sdk/recipes/patches/openssl/Configure.p index 7191fe5..156a589 100644 --- a/sdk/recipes/patches/openssl/Configure.p +++ b/sdk/recipes/patches/openssl/Configure.p @@ -1,11 +1,20 @@ --- Configure.old 2010-12-29 02:43:14.000000000 +0000 +++ Configure 2010-12-29 02:45:29.000000000 +0000 -@@ -412,6 +412,8 @@ +@@ -412,6 +412,9 @@ "beos-x86-r5", "gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -mcpu=pentium -Wall::-D_REENTRANT:BEOS:-lbe -lnet:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:beos:beos-shared:-fPIC -DPIC:-shared:.so", "beos-x86-bone", "gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -mcpu=pentium -Wall::-D_REENTRANT:BEOS:-lbe -lbind -lsocket:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:beos:beos-shared:-fPIC:-shared:.so", ++"arm-unknown-riscos","arm-unknown-riscos-gcc:-DL_ENDIAN -DTERMIOS -DNO_SYS_UN_H -O3 -fomit-frame-pointer -Wall::-D_REENTRANT:::BN_LLONG DES_RISC1::::::::::::::::::::echo", +"m68k-unknown-amigaos","m68k-unknown-amigaos-gcc:-DB_ENDIAN -DTERMIOS -DNO_SYSLOG -DHAVE_FORK=0 -DNO_SYS_PARAM_H -DNO_SYS_UN_H -O3 -fomit-frame-pointer -Wall::-D_REENTRANT:::BN_LLONG DES_RISC1::::::::::::::::::::m68k-unknown-amigaos-ranlib", + #### SCO/Caldera targets. # # Originally we had like unixware-*, unixware-*-pentium, unixware-*-p6, etc. +@@ -1039,6 +1042,7 @@ + my $IsMK1MF=scalar grep /^$target$/,@MK1MF_Builds; + + $exe_ext=".exe" if ($target eq "Cygwin" || $target eq "DJGPP" || $target =~ /^mingw/); ++$exe_ext=",e1f" if ($target eq "arm-unknown-riscos"); + $exe_ext=".nlm" if ($target =~ /netware/); + $exe_ext=".pm" if ($target =~ /vos/); + $openssldir="/usr/local/ssl" if ($openssldir eq "" and $prefix eq ""); -- cgit v1.2.3