From e5925b868e364ff61bb890efe1b10e31644268d3 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 18 Jul 2014 08:22:16 +0000 Subject: efl: Use automake foreign for cpu/elmdentica/enjoy/ephoto/exalt-client/flame/forecasts/places/rain/uptime Signed-off-by: Richard Purdie --- meta-efl/recipes-efl/e17/cpu/configure.patch | 13 ++++++++++ meta-efl/recipes-efl/e17/cpu_svn.bb | 2 ++ .../recipes-efl/e17/elmdentica/configure.patch | 13 ++++++++++ meta-efl/recipes-efl/e17/elmdentica_svn.bb | 2 ++ meta-efl/recipes-efl/e17/enjoy/configure.patch | 13 ++++++++++ meta-efl/recipes-efl/e17/enjoy_git.bb | 1 + meta-efl/recipes-efl/e17/ephoto/configure.patch | 13 ++++++++++ meta-efl/recipes-efl/e17/ephoto_svn.bb | 2 ++ .../recipes-efl/e17/exalt-client/configure.patch | 28 ++++++++++++++++++++++ meta-efl/recipes-efl/e17/exalt-client_svn.bb | 2 +- meta-efl/recipes-efl/e17/flame/configure.patch | 13 ++++++++++ meta-efl/recipes-efl/e17/flame_svn.bb | 2 ++ meta-efl/recipes-efl/e17/forecasts/configure.patch | 13 ++++++++++ meta-efl/recipes-efl/e17/forecasts_svn.bb | 4 +--- meta-efl/recipes-efl/e17/places/configure.patch | 13 ++++++++++ meta-efl/recipes-efl/e17/places_svn.bb | 2 ++ meta-efl/recipes-efl/e17/rain/configure.patch | 13 ++++++++++ meta-efl/recipes-efl/e17/rain_svn.bb | 2 ++ meta-efl/recipes-efl/e17/uptime/configure.patch | 13 ++++++++++ meta-efl/recipes-efl/e17/uptime_svn.bb | 4 +--- 20 files changed, 161 insertions(+), 7 deletions(-) create mode 100644 meta-efl/recipes-efl/e17/cpu/configure.patch create mode 100644 meta-efl/recipes-efl/e17/elmdentica/configure.patch create mode 100644 meta-efl/recipes-efl/e17/enjoy/configure.patch create mode 100644 meta-efl/recipes-efl/e17/ephoto/configure.patch create mode 100644 meta-efl/recipes-efl/e17/exalt-client/configure.patch create mode 100644 meta-efl/recipes-efl/e17/flame/configure.patch create mode 100644 meta-efl/recipes-efl/e17/forecasts/configure.patch create mode 100644 meta-efl/recipes-efl/e17/places/configure.patch create mode 100644 meta-efl/recipes-efl/e17/rain/configure.patch create mode 100644 meta-efl/recipes-efl/e17/uptime/configure.patch (limited to 'meta-efl') diff --git a/meta-efl/recipes-efl/e17/cpu/configure.patch b/meta-efl/recipes-efl/e17/cpu/configure.patch new file mode 100644 index 0000000000..87c85de9f8 --- /dev/null +++ b/meta-efl/recipes-efl/e17/cpu/configure.patch @@ -0,0 +1,13 @@ +Index: cpu/configure.ac +=================================================================== +--- cpu.orig/configure.ac 2014-07-17 20:39:48.000000000 +0000 ++++ cpu/configure.ac 2014-07-17 21:39:55.320555868 +0000 +@@ -10,7 +10,7 @@ + AC_CANONICAL_HOST + AC_ISC_POSIX + +-AM_INIT_AUTOMAKE(1.6) ++AM_INIT_AUTOMAKE([foreign]) + AM_CONFIG_HEADER(config.h) + m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) + diff --git a/meta-efl/recipes-efl/e17/cpu_svn.bb b/meta-efl/recipes-efl/e17/cpu_svn.bb index c0ad6a42c6..14eb08f718 100644 --- a/meta-efl/recipes-efl/e17/cpu_svn.bb +++ b/meta-efl/recipes-efl/e17/cpu_svn.bb @@ -6,3 +6,5 @@ PV = "0.0.1+svnr${SRCREV}" PR = "${INC_PR}.0" require e-module.inc + +SRC_URI += "file://configure.patch" diff --git a/meta-efl/recipes-efl/e17/elmdentica/configure.patch b/meta-efl/recipes-efl/e17/elmdentica/configure.patch new file mode 100644 index 0000000000..79a981b471 --- /dev/null +++ b/meta-efl/recipes-efl/e17/elmdentica/configure.patch @@ -0,0 +1,13 @@ +Index: elmdentica/configure.ac +=================================================================== +--- elmdentica.orig/configure.ac 2014-07-17 21:46:14.712566207 +0000 ++++ elmdentica/configure.ac 2014-07-17 21:51:34.960574935 +0000 +@@ -3,7 +3,7 @@ + AM_CONFIG_HEADER(config.h) + AC_CONFIG_MACRO_DIR([m4]) + +-AM_INIT_AUTOMAKE ++AM_INIT_AUTOMAKE([foreign]) + + AC_PROG_CC + AC_GNU_SOURCE diff --git a/meta-efl/recipes-efl/e17/elmdentica_svn.bb b/meta-efl/recipes-efl/e17/elmdentica_svn.bb index e7b61a528c..20a4849ba5 100644 --- a/meta-efl/recipes-efl/e17/elmdentica_svn.bb +++ b/meta-efl/recipes-efl/e17/elmdentica_svn.bb @@ -17,3 +17,5 @@ PV = "0.9.9+svnr${SRCPV}" SRCREV = "${EFL_SRCREV}" RDEPENDS_${PN} = "${PN}-themes" + +SRC_URI += "file://configure.patch" diff --git a/meta-efl/recipes-efl/e17/enjoy/configure.patch b/meta-efl/recipes-efl/e17/enjoy/configure.patch new file mode 100644 index 0000000000..6e0ed74610 --- /dev/null +++ b/meta-efl/recipes-efl/e17/enjoy/configure.patch @@ -0,0 +1,13 @@ +Index: git/configure.ac +=================================================================== +--- git.orig/configure.ac 2014-07-17 21:48:51.284570474 +0000 ++++ git/configure.ac 2014-07-17 21:53:39.104578318 +0000 +@@ -26,7 +26,7 @@ + AC_CANONICAL_HOST + AC_ISC_POSIX + +-AM_INIT_AUTOMAKE(1.6 dist-bzip2) ++AM_INIT_AUTOMAKE([dist-bzip2 foreign]) + AC_CONFIG_HEADERS(config.h) + _XTERM_COLORS + m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) diff --git a/meta-efl/recipes-efl/e17/enjoy_git.bb b/meta-efl/recipes-efl/e17/enjoy_git.bb index bc3168e6a3..297cbd5236 100644 --- a/meta-efl/recipes-efl/e17/enjoy_git.bb +++ b/meta-efl/recipes-efl/e17/enjoy_git.bb @@ -22,6 +22,7 @@ inherit e gettext SRC_URI = " \ git://git.enlightenment.org/apps/enjoy.git \ file://0001-always-use-position-as-percent-and-define-a-1-second.patch \ + file://configure.patch \ " S = "${WORKDIR}/git" diff --git a/meta-efl/recipes-efl/e17/ephoto/configure.patch b/meta-efl/recipes-efl/e17/ephoto/configure.patch new file mode 100644 index 0000000000..59466f8af8 --- /dev/null +++ b/meta-efl/recipes-efl/e17/ephoto/configure.patch @@ -0,0 +1,13 @@ +Index: ephoto/configure.ac +=================================================================== +--- ephoto.orig/configure.ac 2014-07-17 21:48:51.028570467 +0000 ++++ ephoto/configure.ac 2014-07-17 21:52:56.120577146 +0000 +@@ -27,7 +27,7 @@ + AC_CANONICAL_HOST + AC_ISC_POSIX + +-AM_INIT_AUTOMAKE(1.6 dist-bzip2) ++AM_INIT_AUTOMAKE([dist-bzip2 foreign]) + AM_CONFIG_HEADER(src/bin/config.h) + m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) + diff --git a/meta-efl/recipes-efl/e17/ephoto_svn.bb b/meta-efl/recipes-efl/e17/ephoto_svn.bb index cea6f39f8e..3255ab835c 100644 --- a/meta-efl/recipes-efl/e17/ephoto_svn.bb +++ b/meta-efl/recipes-efl/e17/ephoto_svn.bb @@ -15,3 +15,5 @@ SRCNAME = "${PN}" # autotools-brokensep B = "${S}" + +SRC_URI += "file://configure.patch" diff --git a/meta-efl/recipes-efl/e17/exalt-client/configure.patch b/meta-efl/recipes-efl/e17/exalt-client/configure.patch new file mode 100644 index 0000000000..d4ff801ce2 --- /dev/null +++ b/meta-efl/recipes-efl/e17/exalt-client/configure.patch @@ -0,0 +1,28 @@ +Index: exalt-client/configure.ac +=================================================================== +--- exalt-client.orig/configure.ac 2014-07-17 21:46:14.712566207 +0000 ++++ exalt-client/configure.ac 2014-07-17 21:47:56.880568991 +0000 +@@ -10,7 +10,7 @@ + AC_CANONICAL_HOST + AC_ISC_POSIX + +-AM_INIT_AUTOMAKE(1.8) ++AM_INIT_AUTOMAKE([foreign]) + AM_CONFIG_HEADER(config.h) + + AC_PROG_CC +@@ -29,7 +29,6 @@ + + m4_ifdef([AM_GNU_GETTEXT], [ + AM_GNU_GETTEXT([external]) +-po_makefile_in=po/Makefile.in + AM_CONDITIONAL([HAVE_PO], [true]) + ],[ + AM_CONDITIONAL([HAVE_PO], [false]) +@@ -101,6 +100,5 @@ + src/Makefile + module.desktop + e_modules-exalt-client.spec +-$po_makefile_in + ], [ + ]) diff --git a/meta-efl/recipes-efl/e17/exalt-client_svn.bb b/meta-efl/recipes-efl/e17/exalt-client_svn.bb index 2c7e5304b6..f70860154f 100644 --- a/meta-efl/recipes-efl/e17/exalt-client_svn.bb +++ b/meta-efl/recipes-efl/e17/exalt-client_svn.bb @@ -22,4 +22,4 @@ FILES_${PN}-staticdev += "${libdir}/enlightenment/modules/*/*/*.a" FILES_${PN}-dev += "${libdir}/enlightenment/modules/*/*/*.la" FILES_${PN}-dbg += "${libdir}/enlightenment/modules/*/*/.debug" - +SRC_URI += "file://configure.patch" \ No newline at end of file diff --git a/meta-efl/recipes-efl/e17/flame/configure.patch b/meta-efl/recipes-efl/e17/flame/configure.patch new file mode 100644 index 0000000000..87c85de9f8 --- /dev/null +++ b/meta-efl/recipes-efl/e17/flame/configure.patch @@ -0,0 +1,13 @@ +Index: cpu/configure.ac +=================================================================== +--- cpu.orig/configure.ac 2014-07-17 20:39:48.000000000 +0000 ++++ cpu/configure.ac 2014-07-17 21:39:55.320555868 +0000 +@@ -10,7 +10,7 @@ + AC_CANONICAL_HOST + AC_ISC_POSIX + +-AM_INIT_AUTOMAKE(1.6) ++AM_INIT_AUTOMAKE([foreign]) + AM_CONFIG_HEADER(config.h) + m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) + diff --git a/meta-efl/recipes-efl/e17/flame_svn.bb b/meta-efl/recipes-efl/e17/flame_svn.bb index b674a5d13c..58c79a8409 100644 --- a/meta-efl/recipes-efl/e17/flame_svn.bb +++ b/meta-efl/recipes-efl/e17/flame_svn.bb @@ -11,3 +11,5 @@ do_configure_prepend() { sed -i -e /po/d ${S}/configure.ac sed -i -e s:\ po::g ${S}/Makefile.am } + +SRC_URI += "file://configure.patch" diff --git a/meta-efl/recipes-efl/e17/forecasts/configure.patch b/meta-efl/recipes-efl/e17/forecasts/configure.patch new file mode 100644 index 0000000000..87c85de9f8 --- /dev/null +++ b/meta-efl/recipes-efl/e17/forecasts/configure.patch @@ -0,0 +1,13 @@ +Index: cpu/configure.ac +=================================================================== +--- cpu.orig/configure.ac 2014-07-17 20:39:48.000000000 +0000 ++++ cpu/configure.ac 2014-07-17 21:39:55.320555868 +0000 +@@ -10,7 +10,7 @@ + AC_CANONICAL_HOST + AC_ISC_POSIX + +-AM_INIT_AUTOMAKE(1.6) ++AM_INIT_AUTOMAKE([foreign]) + AM_CONFIG_HEADER(config.h) + m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) + diff --git a/meta-efl/recipes-efl/e17/forecasts_svn.bb b/meta-efl/recipes-efl/e17/forecasts_svn.bb index a030952239..473bdb9d48 100644 --- a/meta-efl/recipes-efl/e17/forecasts_svn.bb +++ b/meta-efl/recipes-efl/e17/forecasts_svn.bb @@ -7,6 +7,4 @@ PR = "${INC_PR}.0" require e-module.inc - - - +SRC_URI += "file://configure.patch" diff --git a/meta-efl/recipes-efl/e17/places/configure.patch b/meta-efl/recipes-efl/e17/places/configure.patch new file mode 100644 index 0000000000..f8f48345c9 --- /dev/null +++ b/meta-efl/recipes-efl/e17/places/configure.patch @@ -0,0 +1,13 @@ +Index: places/configure.ac +=================================================================== +--- places.orig/configure.ac 2014-07-17 21:51:01.276574017 +0000 ++++ places/configure.ac 2014-07-17 21:52:07.096575810 +0000 +@@ -10,7 +10,7 @@ + AC_CANONICAL_HOST + AC_ISC_POSIX + +-AM_INIT_AUTOMAKE(1.8) ++AM_INIT_AUTOMAKE([foreign]) + m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) + AM_CONFIG_HEADER(config.h) + diff --git a/meta-efl/recipes-efl/e17/places_svn.bb b/meta-efl/recipes-efl/e17/places_svn.bb index 6a6184be72..54f0e0154e 100644 --- a/meta-efl/recipes-efl/e17/places_svn.bb +++ b/meta-efl/recipes-efl/e17/places_svn.bb @@ -12,3 +12,5 @@ do_configure_prepend() { # Calls /usr/bin/eject for media RRECOMMENDS_${PN} += "eject" + +SRC_URI += "file://configure.patch" diff --git a/meta-efl/recipes-efl/e17/rain/configure.patch b/meta-efl/recipes-efl/e17/rain/configure.patch new file mode 100644 index 0000000000..87c85de9f8 --- /dev/null +++ b/meta-efl/recipes-efl/e17/rain/configure.patch @@ -0,0 +1,13 @@ +Index: cpu/configure.ac +=================================================================== +--- cpu.orig/configure.ac 2014-07-17 20:39:48.000000000 +0000 ++++ cpu/configure.ac 2014-07-17 21:39:55.320555868 +0000 +@@ -10,7 +10,7 @@ + AC_CANONICAL_HOST + AC_ISC_POSIX + +-AM_INIT_AUTOMAKE(1.6) ++AM_INIT_AUTOMAKE([foreign]) + AM_CONFIG_HEADER(config.h) + m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) + diff --git a/meta-efl/recipes-efl/e17/rain_svn.bb b/meta-efl/recipes-efl/e17/rain_svn.bb index 0e990d52d4..cf67a4cd5d 100644 --- a/meta-efl/recipes-efl/e17/rain_svn.bb +++ b/meta-efl/recipes-efl/e17/rain_svn.bb @@ -12,3 +12,5 @@ do_configure_prepend() { sed -i -e /po/d ${S}/configure.ac sed -i -e s:\ po::g ${S}/Makefile.am } + +SRC_URI += "file://configure.patch" diff --git a/meta-efl/recipes-efl/e17/uptime/configure.patch b/meta-efl/recipes-efl/e17/uptime/configure.patch new file mode 100644 index 0000000000..87c85de9f8 --- /dev/null +++ b/meta-efl/recipes-efl/e17/uptime/configure.patch @@ -0,0 +1,13 @@ +Index: cpu/configure.ac +=================================================================== +--- cpu.orig/configure.ac 2014-07-17 20:39:48.000000000 +0000 ++++ cpu/configure.ac 2014-07-17 21:39:55.320555868 +0000 +@@ -10,7 +10,7 @@ + AC_CANONICAL_HOST + AC_ISC_POSIX + +-AM_INIT_AUTOMAKE(1.6) ++AM_INIT_AUTOMAKE([foreign]) + AM_CONFIG_HEADER(config.h) + m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) + diff --git a/meta-efl/recipes-efl/e17/uptime_svn.bb b/meta-efl/recipes-efl/e17/uptime_svn.bb index a296a5ec75..5c9bfa9eab 100644 --- a/meta-efl/recipes-efl/e17/uptime_svn.bb +++ b/meta-efl/recipes-efl/e17/uptime_svn.bb @@ -7,6 +7,4 @@ PR = "${INC_PR}.0" require e-module.inc - - - +SRC_URI += "file://configure.patch" -- cgit 1.2.3-korg