On Tue, Jul 26, 2016 at 05:18:07AM -0400, [email protected] wrote: > From: Jackie Huang <[email protected]> > > unixODBC is an Open Source ODBC sub-system and an > ODBC SDK for Linux, Mac OSX, and UNIX. > > Signed-off-by: Jackie Huang <[email protected]> > --- > .../do-not-use-libltdl-source-directory.patch | 43 > ++++++++++++++++++++++ > meta-oe/recipes-support/unixodbc/unixodbc_2.3.4.bb | 27 ++++++++++++++ > 2 files changed, 70 insertions(+) > create mode 100644 > meta-oe/recipes-support/unixodbc/files/do-not-use-libltdl-source-directory.patch > create mode 100644 meta-oe/recipes-support/unixodbc/unixodbc_2.3.4.bb > > 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 > new file mode 100644 > index 0000000..69d26ad > --- /dev/null > +++ > b/meta-oe/recipes-support/unixodbc/files/do-not-use-libltdl-source-directory.patch > @@ -0,0 +1,43 @@ > +Subject: [PATCH] do not use libltdl source directory > + > +Don't use the included libltdl, use the one provided > +by our libtool instead. > + > +Upstream-Status: Inappropriate [configuration] > + > +Signed-off-by: Song.Li <[email protected]> > +Signed-off-by: Jackie Huang <[email protected]> > +--- > + Makefile.am | 1 - > + configure.ac | 2 -- > + 2 files changed, 3 deletions(-) > + > +diff --git a/Makefile.am b/Makefile.am > +index e881cca..1321802 100644 > +--- a/Makefile.am > ++++ b/Makefile.am > +@@ -5,7 +5,6 @@ SUBDIRS = \ > + log \ > + lst \ > + ini \ > +- libltdl \ > + odbcinst \ > + DriverManager \ > + exe \ > +diff --git a/configure.ac b/configure.ac > +index 218502f..d50b7af 100644 > +--- a/configure.ac > ++++ b/configure.ac > +@@ -136,9 +136,7 @@ dnl AC_CONFIG_MACRO_DIR([libltdl/m4]) > + dnl LT_CONFIG_LTDL_DIR([libltdl]) > + dnl LTDL_INIT > + > +-LT_CONFIG_LTDL_DIR([libltdl]) > + LT_INIT([dlopen]) > +-LTDL_INIT([convenience]) > + > + dnl Substitute INCLTDL and LIBLTDL in the Makefiles > + AC_SUBST(LTDLINCL) > +-- > +2.8.1 > + > diff --git a/meta-oe/recipes-support/unixodbc/unixodbc_2.3.4.bb > b/meta-oe/recipes-support/unixodbc/unixodbc_2.3.4.bb > new file mode 100644 > index 0000000..23d6d04 > --- /dev/null > +++ b/meta-oe/recipes-support/unixodbc/unixodbc_2.3.4.bb > @@ -0,0 +1,27 @@ > +SUMMARY = "An Open Source ODBC sub-system" > +DESCRIPTION = "unixODBC is an Open Source ODBC sub-system and an ODBC SDK \ > +for Linux, Mac OSX, and UNIX." > + > +HOMEPAGE = "http://www.unixodbc.org/"; > +LICENSE = "GPLv2" > +LIC_FILES_CHKSUM = "file://COPYING;md5=d7b37bf80a3df5a65b355433ae36d206" > + > +DEPENDS = "libtool mysql5" > + > +SRC_URI = "ftp://ftp.unixodbc.org/pub/unixODBC/unixODBC-${PV}.tar.gz \ > + file://do-not-use-libltdl-source-directory.patch \ > +" > +SRC_URI[md5sum] = "bd25d261ca1808c947cb687e2034be81" > +SRC_URI[sha256sum] = > "2e1509a96bb18d248bf08ead0d74804957304ff7c6f8b2e5965309c632421e39" > + > +inherit autotools-brokensep > + > +S = "${WORKDIR}/unixODBC-${PV}" > + > +EXTRA_OEMAKE += "LIBS=-lltdl" > + > +do_configure_prepend() { > + # old m4 files will cause libtool version don't match > + rm -rf m4/* > + rm -fr libltdl
Don't use tabs in meta-oe layers. I'll fix it this time, but next time just reject it. > +} > -- > 2.8.1 > > -- > _______________________________________________ > Openembedded-devel mailing list > [email protected] > http://lists.openembedded.org/mailman/listinfo/openembedded-devel -- Martin 'JaMa' Jansa jabber: [email protected]
signature.asc
Description: Digital signature
-- _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-devel
