diff options
-rw-r--r-- | meta-oe/recipes-support/unixodbc/files/do-not-use-libltdl-source-directory.patch | 12 | ||||
-rw-r--r-- | meta-oe/recipes-support/unixodbc/unixodbc_2.3.6.bb (renamed from meta-oe/recipes-support/unixodbc/unixodbc_2.3.4.bb) | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/meta-oe/recipes-support/unixodbc/files/do-not-use-libltdl-source-directory.patch b/meta-oe/recipes-support/unixodbc/files/do-not-use-libltdl-source-directory.patch index 69d26adca9..2499cff72d 100644 --- a/meta-oe/recipes-support/unixodbc/files/do-not-use-libltdl-source-directory.patch +++ b/meta-oe/recipes-support/unixodbc/files/do-not-use-libltdl-source-directory.patch | |||
@@ -13,22 +13,22 @@ Signed-off-by: Jackie Huang <jackie.huang@windriver.com> | |||
13 | 2 files changed, 3 deletions(-) | 13 | 2 files changed, 3 deletions(-) |
14 | 14 | ||
15 | diff --git a/Makefile.am b/Makefile.am | 15 | diff --git a/Makefile.am b/Makefile.am |
16 | index e881cca..1321802 100644 | 16 | index 4628401..e8989bf 100644 |
17 | --- a/Makefile.am | 17 | --- a/Makefile.am |
18 | +++ b/Makefile.am | 18 | +++ b/Makefile.am |
19 | @@ -5,7 +5,6 @@ SUBDIRS = \ | 19 | @@ -11,7 +11,6 @@ SUBDIRS = \ |
20 | log \ | 20 | log \ |
21 | lst \ | 21 | lst \ |
22 | ini \ | 22 | ini \ |
23 | - libltdl \ | 23 | - libltdl \ |
24 | odbcinst \ | 24 | odbcinst \ |
25 | DriverManager \ | 25 | DriverManager \ |
26 | exe \ | 26 | exe \ |
27 | diff --git a/configure.ac b/configure.ac | 27 | diff --git a/configure.ac b/configure.ac |
28 | index 218502f..d50b7af 100644 | 28 | index e4bcdaf..58aa5c5 100644 |
29 | --- a/configure.ac | 29 | --- a/configure.ac |
30 | +++ b/configure.ac | 30 | +++ b/configure.ac |
31 | @@ -136,9 +136,7 @@ dnl AC_CONFIG_MACRO_DIR([libltdl/m4]) | 31 | @@ -144,9 +144,7 @@ dnl AC_CONFIG_MACRO_DIR([libltdl/m4]) |
32 | dnl LT_CONFIG_LTDL_DIR([libltdl]) | 32 | dnl LT_CONFIG_LTDL_DIR([libltdl]) |
33 | dnl LTDL_INIT | 33 | dnl LTDL_INIT |
34 | 34 | ||
@@ -39,5 +39,5 @@ index 218502f..d50b7af 100644 | |||
39 | dnl Substitute INCLTDL and LIBLTDL in the Makefiles | 39 | dnl Substitute INCLTDL and LIBLTDL in the Makefiles |
40 | AC_SUBST(LTDLINCL) | 40 | AC_SUBST(LTDLINCL) |
41 | -- | 41 | -- |
42 | 2.8.1 | 42 | 2.12.3 |
43 | 43 | ||
diff --git a/meta-oe/recipes-support/unixodbc/unixodbc_2.3.4.bb b/meta-oe/recipes-support/unixodbc/unixodbc_2.3.6.bb index 6f57f375e8..62d9db8439 100644 --- a/meta-oe/recipes-support/unixodbc/unixodbc_2.3.4.bb +++ b/meta-oe/recipes-support/unixodbc/unixodbc_2.3.6.bb | |||
@@ -11,8 +11,8 @@ DEPENDS = "libtool mysql5" | |||
11 | SRC_URI = "ftp://ftp.unixodbc.org/pub/unixODBC/unixODBC-${PV}.tar.gz \ | 11 | SRC_URI = "ftp://ftp.unixodbc.org/pub/unixODBC/unixODBC-${PV}.tar.gz \ |
12 | file://do-not-use-libltdl-source-directory.patch \ | 12 | file://do-not-use-libltdl-source-directory.patch \ |
13 | " | 13 | " |
14 | SRC_URI[md5sum] = "bd25d261ca1808c947cb687e2034be81" | 14 | SRC_URI[md5sum] = "a8629fd2953b04b4639d0a9d8a5cf9d1" |
15 | SRC_URI[sha256sum] = "2e1509a96bb18d248bf08ead0d74804957304ff7c6f8b2e5965309c632421e39" | 15 | SRC_URI[sha256sum] = "88b637f647c052ecc3861a3baa275c3b503b193b6a49ff8c28b2568656d14d69" |
16 | 16 | ||
17 | inherit autotools-brokensep | 17 | inherit autotools-brokensep |
18 | 18 | ||