[oe-commits] org.oe.dev merge of '1b152d2cb9b2c6474294b89bcc5f136f0cd95903'

[koen commit]

merge of '1b152d2cb9b2c6474294b89bcc5f136f0cd95903'
     and '9acacf300b9ee3fb7ed2a73b88356b44ad0ab8d5'

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 08f0974ebf10be6a9cf488e0ff5a9505bb7bac0e
ViewMTN: http://monotone.openembedded.org/revision/info/08f0974ebf10be6a9cf488e0ff5a9505bb7bac0e
Files:
1
packages/openssl/openssl-native_0.9.7m.bb
packages/openssl/openssl-native_0.9.8g.bb
packages/i2c-tools
packages/i2c-tools/i2c-tools_3.0.1.bb
Diffs:

#
# mt diff -r1b152d2cb9b2c6474294b89bcc5f136f0cd95903 -r08f0974ebf10be6a9cf488e0ff5a9505bb7bac0e
#
#
#
# patch "packages/openssl/openssl-native_0.9.7m.bb"
#  from [e28e67ce3cebe3a10688393468c808ca63a894ea]
#    to [a7e810d1f91585491c6c3f0f1404c6fef062ee5c]
# 
# patch "packages/openssl/openssl-native_0.9.8g.bb"
#  from [eac4eae3180f587b82991e77aecbca59fedd1783]
#    to [2ca0e07e42caa326c5ec3f9611fdd2def25638a8]
#
============================================================
--- packages/openssl/openssl-native_0.9.7m.bb	e28e67ce3cebe3a10688393468c808ca63a894ea
+++ packages/openssl/openssl-native_0.9.7m.bb	a7e810d1f91585491c6c3f0f1404c6fef062ee5c
@@ -2,6 +2,14 @@ require openssl.inc
 
 require openssl.inc
 
+# This flag can contain target options (e.g -mfpu=neon for armv7-a systems)
+export FULL_OPTIMIZATION = " "
+export BUILD_OPTIMIZATION = " "
+
+export CFLAG = " ${@base_conditional('SITEINFO_ENDIANESS', 'le', '-DL_ENDIAN', '-DB_ENDIAN', d)} \
+                 -DTERMIO  "
+
+
 PR = "r2"
 
 SRC_URI += "file://debian.patch;patch=1 \
============================================================
--- packages/openssl/openssl-native_0.9.8g.bb	eac4eae3180f587b82991e77aecbca59fedd1783
+++ packages/openssl/openssl-native_0.9.8g.bb	2ca0e07e42caa326c5ec3f9611fdd2def25638a8
@@ -1,14 +1,16 @@ inherit pkgconfig native
 inherit pkgconfig native
 
+DEFAULT_PREFERENCE = "-1"
+
 require openssl.inc
 
 # This flag can contain target options (e.g -mfpu=neon for armv7-a systems)
 export FULL_OPTIMIZATION = " "
 export BUILD_OPTIMIZATION = " "
 
-export CFLAG = " "
+export CFLAG = " ${@base_conditional('SITEINFO_ENDIANESS', 'le', '-DL_ENDIAN', '-DB_ENDIAN', d)} \
+                 -DTERMIO  "
 
-
 SRC_URI += "file://debian.patch;patch=1 \
             file://configure-targets.patch;patch=1 \
             file://shared-libs.patch;patch=1"


#
# mt diff -r9acacf300b9ee3fb7ed2a73b88356b44ad0ab8d5 -r08f0974ebf10be6a9cf488e0ff5a9505bb7bac0e
#
#
#
# add_dir "packages/i2c-tools"
# 
# add_file "packages/i2c-tools/i2c-tools_3.0.1.bb"
#  content [353aa093f4a9d6c3e69ffdeeb19a926b07da9c3f]
#
============================================================
--- packages/i2c-tools/i2c-tools_3.0.1.bb	353aa093f4a9d6c3e69ffdeeb19a926b07da9c3f
+++ packages/i2c-tools/i2c-tools_3.0.1.bb	353aa093f4a9d6c3e69ffdeeb19a926b07da9c3f
@@ -0,0 +1,12 @@
+DESCRIPTION = "Set of i2c tools for linux"
+SECTION = "base"
+LICENSE = "GPL"
+
+SRC_URI = "http://dl.lm-sensors.org/i2c-tools/releases/i2c-tools-${PV}.tar.bz2"
+
+inherit autotools
+
+do_compile_prepend() {
+        sed -i 's_/usr/local_/usr_' Makefile
+        sed -i 's_CC\t:= gcc_CC\t:= ${CC}_' Makefile
+}