diff options
| -rw-r--r-- | meta-oe/recipes-extended/libdivecomputer/files/fix-ar.patch | 16 | ||||
| -rw-r--r-- | meta-oe/recipes-extended/libdivecomputer/libdivecomputer_git.bb | 7 |
2 files changed, 3 insertions, 20 deletions
diff --git a/meta-oe/recipes-extended/libdivecomputer/files/fix-ar.patch b/meta-oe/recipes-extended/libdivecomputer/files/fix-ar.patch deleted file mode 100644 index f65d26aaea..0000000000 --- a/meta-oe/recipes-extended/libdivecomputer/files/fix-ar.patch +++ /dev/null | |||
| @@ -1,16 +0,0 @@ | |||
| 1 | --- | ||
| 2 | configure.ac | 1 + | ||
| 3 | 1 file changed, 1 insertion(+) | ||
| 4 | |||
| 5 | Index: git/configure.ac | ||
| 6 | =================================================================== | ||
| 7 | --- git.orig/configure.ac | ||
| 8 | +++ git/configure.ac | ||
| 9 | @@ -56,6 +56,7 @@ AM_CONDITIONAL([ENABLE_EXAMPLES], [test | ||
| 10 | # Checks for programs. | ||
| 11 | AC_PROG_CC | ||
| 12 | AC_PROG_CC_C99 | ||
| 13 | +AM_PROG_AR | ||
| 14 | |||
| 15 | # Enable automake silent build rules. | ||
| 16 | m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) | ||
diff --git a/meta-oe/recipes-extended/libdivecomputer/libdivecomputer_git.bb b/meta-oe/recipes-extended/libdivecomputer/libdivecomputer_git.bb index 6c4f4a0721..b7c1958eef 100644 --- a/meta-oe/recipes-extended/libdivecomputer/libdivecomputer_git.bb +++ b/meta-oe/recipes-extended/libdivecomputer/libdivecomputer_git.bb | |||
| @@ -8,11 +8,10 @@ DEPENDS = "libusb1" | |||
| 8 | 8 | ||
| 9 | inherit autotools pkgconfig | 9 | inherit autotools pkgconfig |
| 10 | 10 | ||
| 11 | PV = "0.4.2+gitr${SRCPV}" | 11 | PV = "0.6.0" |
| 12 | 12 | ||
| 13 | SRCREV = "5f765f91430f16932d96b3777404420aa2dd4c7c" | 13 | SRCREV = "1195abc2f4acc7b10175d570ec73549d0938c83e" |
| 14 | SRC_URI = "git://git.libdivecomputer.org/libdivecomputer.git \ | 14 | SRC_URI = "git://github.com/libdivecomputer/libdivecomputer.git;protocol=https \ |
| 15 | file://fix-ar.patch \ | ||
| 16 | " | 15 | " |
| 17 | 16 | ||
| 18 | S = "${WORKDIR}/git" | 17 | S = "${WORKDIR}/git" |
