[oe-commits] org.oe.dev merge of '050cc7da614b31484f65138eb5faa6715af3fc5c'

[rwhitby commit]

merge of '050cc7da614b31484f65138eb5faa6715af3fc5c'
     and 'f3312a5f747d70b34f246bcf7563edf94614d025'

Author: rwhitby at nslu2-linux.org
Branch: org.openembedded.dev
Revision: 19a2cb87b3e7d9ea6e805a2c82a7c53b91e77511
ViewMTN: http://monotone.openembedded.org/revision.psp?id=19a2cb87b3e7d9ea6e805a2c82a7c53b91e77511
Files:
1
packages/openssl/openssl-0.9.7g/gnueabi-armeb.patch
packages/openssl/openssl_0.9.7g.bb
packages/obexftp/files/iconv.patch
packages/obexftp/obexftp_0.20.bb
Diffs:

#
# mt diff -r050cc7da614b31484f65138eb5faa6715af3fc5c -r19a2cb87b3e7d9ea6e805a2c82a7c53b91e77511
#
# 
# 
# add_file "packages/openssl/openssl-0.9.7g/gnueabi-armeb.patch"
#  content [6667972d27eb2ab7dfbb6189e987578a7feb9a1e]
# 
# patch "packages/openssl/openssl_0.9.7g.bb"
#  from [ecf6ba1e576ef411971cc6af2005e2ecca94b6d8]
#    to [68560d0bda19a0b32c7f514bdb9cf445479e7406]
# 
============================================================
--- packages/openssl/openssl-0.9.7g/gnueabi-armeb.patch	6667972d27eb2ab7dfbb6189e987578a7feb9a1e
+++ packages/openssl/openssl-0.9.7g/gnueabi-armeb.patch	6667972d27eb2ab7dfbb6189e987578a7feb9a1e
@@ -0,0 +1,10 @@
+--- openssl-0.9.7g/Configure~	2007-07-07 21:08:27.000000000 +0930
++++ openssl-0.9.7g/Configure	2007-07-07 21:13:41.000000000 +0930
+@@ -477,6 +477,7 @@
+ "linux-elf-arm","gcc:-DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "linux-elf-armeb","gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "linux-gnueabi-arm","gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"linux-gnueabi-armeb","gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ 
+ # SCO/Caldera targets.
+ #
============================================================
--- packages/openssl/openssl_0.9.7g.bb	ecf6ba1e576ef411971cc6af2005e2ecca94b6d8
+++ packages/openssl/openssl_0.9.7g.bb	68560d0bda19a0b32c7f514bdb9cf445479e7406
@@ -1,9 +1,10 @@ require openssl.inc
 inherit pkgconfig
 
 require openssl.inc
 
-PR = "r3"
+PR = "r4"
 
 SRC_URI += "file://debian.patch;patch=1 \
             file://armeb.patch;patch=1;pnum=0 \
+            file://gnueabi-arm.patch;patch=1 \
+            file://gnueabi-armeb.patch;patch=1"
-            file://gnueabi-arm.patch;patch=1"


#
# mt diff -rf3312a5f747d70b34f246bcf7563edf94614d025 -r19a2cb87b3e7d9ea6e805a2c82a7c53b91e77511
#
# 
# 
# delete "packages/obexftp/files/iconv.patch"
# 
# patch "packages/obexftp/obexftp_0.20.bb"
#  from [88ca8420c7a7c5c71bdaefdd48cba8b53cfac57d]
#    to [c55f1af56071cfbe2fd0843c1abd7a675d5daae6]
# 
============================================================
--- packages/obexftp/obexftp_0.20.bb	88ca8420c7a7c5c71bdaefdd48cba8b53cfac57d
+++ packages/obexftp/obexftp_0.20.bb	c55f1af56071cfbe2fd0843c1abd7a675d5daae6
@@ -1,13 +1,12 @@ LICENSE = "GPL"
 DESCRIPTION = "OBEX Ftp Client based on openobex."
 SECTION = "console/network"
 HOMEPAGE = "http://openobex.triq.net"
 LICENSE = "GPL"
-DEPENDS = "openobex libgsm libiconv"
-PR = "r3"
+DEPENDS = "openobex libgsm"
+PR = "r2"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/openobex/obexftp-${PV}.tar.gz \
-	   file://iconv.patch;patch=1 \
-	   file://i-hate-libtool.patch;patch=1 \
+           file://i-hate-libtool.patch;patch=1 \
 	   file://m4.patch;patch=1"
 
 inherit autotools