[oe-commits] org.oe.dev merge of '0a649e59614b2140ef8f93c2dc52b1361f2acb0b'

[hrw commit]

merge of '0a649e59614b2140ef8f93c2dc52b1361f2acb0b'
     and '0b7b234637a0d41420b6a596ef10e38857ff6f57'

Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: a106a2f5d39ab684d2b6151a6be83d4897a0f2b6
ViewMTN: http://monotone.openembedded.org/revision/info/a106a2f5d39ab684d2b6151a6be83d4897a0f2b6
Files:
1
packages/mpfr/mpfr-native_2.3.0.bb
packages/mpfr/mpfr_2.3.0.bb
packages/gettext/gettext-0.14.1/disable_java.patch
packages/gettext/gettext_0.14.1.bb
Diffs:

#
# mt diff -r0a649e59614b2140ef8f93c2dc52b1361f2acb0b -ra106a2f5d39ab684d2b6151a6be83d4897a0f2b6
#
# 
# 
# add_file "packages/mpfr/mpfr-native_2.3.0.bb"
#  content [41f0822f894ea44761b8d80834b7ded6ed91ad66]
# 
# add_file "packages/mpfr/mpfr_2.3.0.bb"
#  content [cf33f92188e335cfc3ddb54fabfa1c1167369430]
# 
============================================================
--- packages/mpfr/mpfr-native_2.3.0.bb	41f0822f894ea44761b8d80834b7ded6ed91ad66
+++ packages/mpfr/mpfr-native_2.3.0.bb	41f0822f894ea44761b8d80834b7ded6ed91ad66
@@ -0,0 +1,4 @@
+require mpfr_${PV}.bb
+inherit native
+DEPENDS = "gmp-native"
+
============================================================
--- packages/mpfr/mpfr_2.3.0.bb	cf33f92188e335cfc3ddb54fabfa1c1167369430
+++ packages/mpfr/mpfr_2.3.0.bb	cf33f92188e335cfc3ddb54fabfa1c1167369430
@@ -0,0 +1,19 @@
+DESCRIPTION = "A C library for multiple-precision floating-point computations with exact rounding"
+LICENSE = "LGPL"
+SECTION = "libs"
+DEPENDS = "gmp"
+PR = "r0"
+
+SRC_URI = "http://www.mpfr.org/mpfr-${PV}/mpfr-${PV}.tar.bz2"
+S = "${WORKDIR}/mpfr-${PV}"
+
+inherit autotools
+
+do_stage() {
+	oe_runmake install prefix=${STAGING_DIR} \
+	       bindir=${STAGING_BINDIR} \
+	       includedir=${STAGING_INCDIR} \
+	       libdir=${STAGING_LIBDIR} \
+	       datadir=${STAGING_DATADIR} \
+	       infodir=${STAGING_DIR}/${HOST_SYS}/info
+}


#
# mt diff -r0b7b234637a0d41420b6a596ef10e38857ff6f57 -ra106a2f5d39ab684d2b6151a6be83d4897a0f2b6
#
# 
# 
# add_file "packages/gettext/gettext-0.14.1/disable_java.patch"
#  content [3cb235c3528f9fea47f41d0f6ce9967545e09d2b]
# 
# patch "packages/gettext/gettext_0.14.1.bb"
#  from [e36d89752702208db243d7f58d7848a83bad0563]
#    to [ae084090fcdd110056d5ce81e5ee0a81bd15fffa]
# 
============================================================
--- packages/gettext/gettext-0.14.1/disable_java.patch	3cb235c3528f9fea47f41d0f6ce9967545e09d2b
+++ packages/gettext/gettext-0.14.1/disable_java.patch	3cb235c3528f9fea47f41d0f6ce9967545e09d2b
@@ -0,0 +1,33 @@
+Index: gettext-0.14.1/gettext-tools/configure.ac
+===================================================================
+--- gettext-0.14.1.orig/gettext-tools/configure.ac	2004-01-16 10:49:06.000000000 +0000
++++ gettext-0.14.1/gettext-tools/configure.ac	2007-11-14 21:43:39.000000000 +0000
+@@ -37,28 +37,16 @@
+ AC_PROG_YACC
+ 
+ gt_GCJ
+-if test -n "$HAVE_GCJ"; then
+-  BUILDJAVAEXE=yes
+-else
+   BUILDJAVAEXE=no
+-fi
+ AC_SUBST(BUILDJAVAEXE)
+ 
+ gt_JAVACOMP
+ AC_CHECK_PROG(JAR, jar, jar)
+-if test -n "$HAVE_JAVACOMP" && test -n "$JAR"; then
+-  BUILDJAVA=yes
+-else
+   BUILDJAVA=no
+-fi
+ AC_SUBST(BUILDJAVA)
+ 
+ gt_JAVAEXEC
+-if test -n "$HAVE_JAVAEXEC" && test $BUILDJAVA = yes; then
+-  TESTJAVA=yes
+-else
+   TESTJAVA=no
+-fi
+ AC_SUBST(TESTJAVA)
+ 
+ gt_CSHARPCOMP
============================================================
--- packages/gettext/gettext_0.14.1.bb	e36d89752702208db243d7f58d7848a83bad0563
+++ packages/gettext/gettext_0.14.1.bb	ae084090fcdd110056d5ce81e5ee0a81bd15fffa
@@ -1,14 +1,15 @@ LICENSE = "GPL"
 DESCRIPTION = "The GNU internationalization library."
 HOMEPAGE = "http://www.gnu.org/software/gettext/gettext.html"
 SECTION = "libs"
 LICENSE = "GPL"
-PR = "r5"
+PR = "r6"
 PROVIDES = "virtual/libintl"
 
 SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \
 	   file://gettext-vpath.patch;patch=1;pnum=1 \
 	   file://fixchicken.patch;patch=1;pnum=1 \
-           file://getline.m4.patch;patch=1"
+           file://getline.m4.patch;patch=1 \
+           file://disable_java.patch;patch=1"
 
 SRC_URI_append_linux-uclibc = " file://gettext-error_print_progname.patch;patch=1"
 SRC_URI_append_linux-uclibcgnueabi = " file://gettext-error_print_progname.patch;patch=1"