diff options
| author |   Dan McGregor <dan.mcgregor@usask.ca> | 2016-12-13 11:24:41 -0600 |
|---|---|---|
| committer | Dan McGregor <dan.mcgregor@usask.ca> | 2017-05-09 13:02:31 -0600 |
| commit | 9d7d076b0dd637053898f2f608eeb66786a0a656 (patch) | |
| tree | ba3360204f730263956853a08a3e4f266d123b35 | |
| parent | 9fcde0c6d21431dc9051bec3088050846f7b3da3 (diff) | |
| download | meta-openembedded-contrib-9d7d076b0dd637053898f2f608eeb66786a0a656.tar.gz | |
zsh 5.3
| -rw-r--r-- | meta-oe/recipes-extended/zsh/files/pcre-pkgconfig.patch | 8 | ||||
| -rw-r--r-- | meta-oe/recipes-extended/zsh/zsh_5.3.bb (renamed from meta-oe/recipes-extended/zsh/zsh_5.2.bb) | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/meta-oe/recipes-extended/zsh/files/pcre-pkgconfig.patch b/meta-oe/recipes-extended/zsh/files/pcre-pkgconfig.patch index cb359f4f5d..5e0c4c236b 100644 --- a/meta-oe/recipes-extended/zsh/files/pcre-pkgconfig.patch +++ b/meta-oe/recipes-extended/zsh/files/pcre-pkgconfig.patch @@ -19,10 +19,10 @@ index e91be3c..5580d13 100644 builtin(include, aczsh.m4) +builtin(include, pkg.m4) diff --git a/configure.ac b/configure.ac -index c3bd713..918657c 100644 +index 920c2fc..d151229 100644 --- a/configure.ac +++ b/configure.ac -@@ -661,17 +661,15 @@ AC_HEADER_TIME +@@ -671,17 +671,15 @@ AC_HEADER_TIME AC_HEADER_STAT AC_HEADER_SYS_WAIT @@ -47,11 +47,11 @@ index c3bd713..918657c 100644 AC_CHECK_HEADERS(sys/time.h sys/times.h sys/select.h termcap.h termio.h \ termios.h sys/param.h sys/filio.h string.h memory.h \ -@@ -925,7 +923,7 @@ fi +@@ -935,7 +933,7 @@ fi if test x$enable_pcre = xyes; then dnl pcre-config should probably be employed here dnl AC_SEARCH_LIBS(pcre_compile, pcre) -- LIBS="`pcre-config --libs` $LIBS" +- LIBS="`$ac_cv_prog_PCRECONF --libs` $LIBS" + LIBS="$PCRE_LIB $LIBS" fi diff --git a/meta-oe/recipes-extended/zsh/zsh_5.2.bb b/meta-oe/recipes-extended/zsh/zsh_5.3.bb index 13f071d7c6..4c389f4a2d 100644 --- a/meta-oe/recipes-extended/zsh/zsh_5.2.bb +++ b/meta-oe/recipes-extended/zsh/zsh_5.3.bb @@ -18,10 +18,10 @@ SRC_URI = " \ file://dot.zshrc \ " -SRC_URI[zsh.md5sum] = "afe96fde08b70e23c1cab1ca7a68fb34" -SRC_URI[zsh.sha256sum] = "f17916320ffaa844bbd7ce48ceeb5945fc5f3eff64b149b4229bbfbdf3795a9d" -SRC_URI[zsh-docs.md5sum] = "873f1ade1fa5d0d15f9cba16d3ba5f98" -SRC_URI[zsh-docs.sha256sum] = "328352cf3d5d0ec4b6e31dcefd25ff5b4c0e6b8077d1fe84448ebb50d6ada52a" +SRC_URI[zsh.md5sum] = "c5ba34e68fcf62a2e78adc56bf3d328a" +SRC_URI[zsh.sha256sum] = "76f82cfd5ce373cf799a03b6f395283f128430db49202e3e3f512fb5a19d6f8a" +SRC_URI[zsh-docs.md5sum] = "12c35fff5b1b902a5a81ab79cb9c3da6" +SRC_URI[zsh-docs.sha256sum] = "cdfc6c3f7235b13308af5316cfa87abb5f51b3ec72d45f9043fde6e5b2e8663e" inherit autotools gettext update-alternatives pkgconfig |