[oe-commits] org.oe.dev merge of 'bec88f8c787bf716caa2fed4d5076d31a98bba16'

[jeremy_laine commit]

merge of 'bec88f8c787bf716caa2fed4d5076d31a98bba16'
     and 'f6b3170bc0db632a8c4bac63cc6de9b5655a653d'

Author: jeremy_laine at openembedded.org
Branch: org.openembedded.dev
Revision: 833d1f1160fba889c99b139ce9a416dcedce48e3
ViewMTN: http://monotone.openembedded.org/revision/info/833d1f1160fba889c99b139ce9a416dcedce48e3
Files:
1
packages/libexosip2
packages/libexosip2/files
packages/libexosip2/files/simplify-flags.patch
packages/libexosip2/libexosip2_2.2.3.bb
conf/local.conf.sample
Diffs:

#
# mt diff -rbec88f8c787bf716caa2fed4d5076d31a98bba16 -r833d1f1160fba889c99b139ce9a416dcedce48e3
#
# 
# 
# add_dir "packages/libexosip2"
# 
# add_dir "packages/libexosip2/files"
# 
# add_file "packages/libexosip2/files/simplify-flags.patch"
#  content [630c340f557e9b7b20fc9f01bb0b1b53206baaca]
# 
# add_file "packages/libexosip2/libexosip2_2.2.3.bb"
#  content [808625b158ef2d4abf43a342aaba02ec63b2a17d]
# 
============================================================
--- packages/libexosip2/files/simplify-flags.patch	630c340f557e9b7b20fc9f01bb0b1b53206baaca
+++ packages/libexosip2/files/simplify-flags.patch	630c340f557e9b7b20fc9f01bb0b1b53206baaca
@@ -0,0 +1,27 @@
+diff -urN libeXosip2-2.2.3.orig/src/Makefile.am libeXosip2-2.2.3/src/Makefile.am
+--- libeXosip2-2.2.3.orig/src/Makefile.am	2005-10-07 14:44:38.000000000 +0200
++++ libeXosip2-2.2.3/src/Makefile.am	2008-01-23 16:05:07.000000000 +0100
+@@ -27,7 +27,7 @@
+ jpipe.c          jpipe.h                 jauth.c      \
+ sdp_offans.c     jpublish.c
+ 
+-libeXosip2_la_LDFLAGS = -L$(prefix)/lib -version-info $(LIBEXOSIP_SO_VERSION)
++libeXosip2_la_LDFLAGS = -version-info $(LIBEXOSIP_SO_VERSION)
+ libeXosip2_la_LIBADD = -losip2  @EXOSIP_LIB@ @PTHREAD_LIBS@
+ 
+-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/include -I$(includedir)
++INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/include
+diff -urN libeXosip2-2.2.3.orig/tools/Makefile.am libeXosip2-2.2.3/tools/Makefile.am
+--- libeXosip2-2.2.3.orig/tools/Makefile.am	2005-07-24 02:11:43.000000000 +0200
++++ libeXosip2-2.2.3/tools/Makefile.am	2008-01-23 16:11:07.000000000 +0100
+@@ -9,8 +9,8 @@
+ 
+ sip_reg_LDFLAGS = -O @EXOSIP_LIB@ @PTHREAD_LIBS@ @JOSUA_LIB@ 
+ 
+-sip_reg_LDADD = -L$(prefix)/lib $(top_builddir)/src/libeXosip2.la -losip2 -losipparser2
++sip_reg_LDADD = $(top_builddir)/src/libeXosip2.la -losip2 -losipparser2
+ 
+-INCLUDES = -I$(prefix)/include -I$(top_srcdir) -I$(top_srcdir)/include -I$(includedir)
++INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/include
+ 
+ 
============================================================
--- packages/libexosip2/libexosip2_2.2.3.bb	808625b158ef2d4abf43a342aaba02ec63b2a17d
+++ packages/libexosip2/libexosip2_2.2.3.bb	808625b158ef2d4abf43a342aaba02ec63b2a17d
@@ -0,0 +1,19 @@
+DESCRIPTION = "High level Session Initiation Protocol (SIP) library"
+SECTION = "libs"
+PRIORITY = "optional"
+LICENSE = "GPL"
+DEPENDS = "libosip2"
+SRCNAME = "libeXosip2"
+LEAD_SONAME = "libeXosip2"
+
+PR = "r0"
+SRC_URI = "http://download.savannah.nongnu.org/releases/exosip/${SRCNAME}-${PV}.tar.gz \
+           file://simplify-flags.patch;patch=1"
+S = "${WORKDIR}/${SRCNAME}-${PV}"
+
+inherit autotools pkgconfig
+EXTRA_OECONF = "--disable-josua"
+
+do_stage() {
+        autotools_stage_all
+}


#
# mt diff -rf6b3170bc0db632a8c4bac63cc6de9b5655a653d -r833d1f1160fba889c99b139ce9a416dcedce48e3
#
# 
# 
# patch "conf/local.conf.sample"
#  from [6489f64f53748259d3ce778d7dcb4a1d20ad3af9]
#    to [eea5f30083587d9ac3261c904bbde0f7c622b752]
# 
============================================================
--- conf/local.conf.sample	6489f64f53748259d3ce778d7dcb4a1d20ad3af9
+++ conf/local.conf.sample	eea5f30083587d9ac3261c904bbde0f7c622b752
@@ -39,7 +39,7 @@ BBMASK = ""
 # generation under qemu (mainly arm glibc) and have an external gcc 3.x compiler
 # that OE recognises. This will mean the gcc-native build is skipped, speeding 
 # builds up.
-# ASSUME_PROVIDED += "gcc-native3"
+# ASSUME_PROVIDED += "gcc3-native"
 
 # Uncomment this if you are building Linux 2.4 Embedix kernels.
 # i.e. openzaurus-sa-2.4.18 and openzaurus-pxa-2.4.18 - and don't forget