Skip to contentSkip to conversation

unixodbc and psqlodbc: Add new recipes

PATCH In review [email protected] 2 participants 5 messages Jul 26, 2016 – Jul 27, 2016

lore
Share & tools
lore
#0 lore raw

cover unixodbc and psqlodbc: Add new recipes

From: Jackie Huang <[email protected]>

The following changes since commit 5c69367d848271cdf3a3bd1a087665f324d3fd34:

python-flask-bootstrap: update to version 3.3.6.0 and fix RDEPENDS (2016-07-22 21:45:42 +0200)

are available in the git repository at:

git://git.pokylinux.org/poky-contrib.git jhuang0/r_add_odbc_160718_0
http://git.pokylinux.org/cgit.cgi//log/?h=jhuang0/r_add_odbc_160718_0

Jackie Huang (2):
unixodbc: Add the new recipe
psqlodbc: Add the new recipe

 .../psqlodbc-donot-use-the-hardcode-libdir.patch   |  26 ++++
 .../files/psqlodbc-fix-for-ptest-support.patch     | 148 +++++++++++++++++++++
 ...bc-remove-some-checks-for-cross-compiling.patch | 118 ++++++++++++++++
 meta-oe/recipes-support/psqlodbc/files/run-ptest   |  46 +++++++
 meta-oe/recipes-support/psqlodbc/psqlodbc.inc      |  50 +++++++
 .../psqlodbc/psqlodbc_09.05.0300.bb                |  14 ++
 .../do-not-use-libltdl-source-directory.patch      |  43 ++++++
 meta-oe/recipes-support/unixodbc/unixodbc_2.3.4.bb |  27 ++++
 8 files changed, 472 insertions(+)
 create mode 100644 meta-oe/recipes-support/psqlodbc/files/psqlodbc-donot-use-the-hardcode-libdir.patch
 create mode 100644 meta-oe/recipes-support/psqlodbc/files/psqlodbc-fix-for-ptest-support.patch
 create mode 100644 meta-oe/recipes-support/psqlodbc/files/psqlodbc-remove-some-checks-for-cross-compiling.patch
 create mode 100644 meta-oe/recipes-support/psqlodbc/files/run-ptest
 create mode 100644 meta-oe/recipes-support/psqlodbc/psqlodbc.inc
 create mode 100644 meta-oe/recipes-support/psqlodbc/psqlodbc_09.05.0300.bb
 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
Signature · 1 line
2.8.1
#1 lore raw

PATCH 1/2 unixodbc: Add the new recipe

From: Jackie Huang <[email protected]>

unixODBC is an Open Source ODBC sub-system and an
ODBC SDK for Linux, Mac OSX, and UNIX.

---
 .../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
meta-oe/recipes-support/unixodbc/files/do-not-use-libltdl-source-directory.patch new file +43 -0
new file mode 100644
index 0000000..69d26ad
@@ -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
+
meta-oe/recipes-support/unixodbc/unixodbc_2.3.4.bb new file +27 -0
new file mode 100644
index 0000000..23d6d04
@@ -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
+}
Signature · 1 line
2.8.1
#2 lore raw

Re: [meta-oe][PATCH 1/2] unixodbc: Add the new recipe

Quoted 84 lines · 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.

---
 .../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
meta-oe/recipes-support/unixodbc/files/do-not-use-libltdl-source-directory.patch new file +43 -0
new file mode 100644
index 0000000..69d26ad
@@ -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
+
meta-oe/recipes-support/unixodbc/unixodbc_2.3.4.bb new file +16 -0
new file mode 100644
index 0000000..23d6d04
@@ -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"
+

meta-oe/recipes-support/unixodbc/unixodbc_2.3.4.bb line 26

Quoted 10 lines
meta-oe/recipes-support/unixodbc/unixodbc_2.3.4.bb new file +10 -0
+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.

Quoted 9 lines
meta-oe/recipes-support/unixodbc/unixodbc_2.3.4.bb new file +1 -0
+}
Signature · 7 lines
2.8.1

-- 
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
#3 lore raw

Re: [meta-oe][PATCH 1/2] unixodbc: Add the new recipe

Quoted 97 lines

-----Original Message-----
From: [email protected] [mailto:openembedded-devel- [email protected]] On Behalf Of Martin Jansa
Sent: Tuesday, July 26, 2016 6:52 PM
To: [email protected]
Subject: Re: [oe] [meta-oe][PATCH 1/2] unixodbc: Add the new recipe

Quoted 11 lines · 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.

---
 .../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

Review

Quoted 3 lines
 create mode 100644 meta-oe/recipes-support/unixodbc/unixodbc_2.3.4.bb
(quoted diff) +0 -0

b/meta-oe/recipes-support/unixodbc/files/do-not-use-libltdl-source-directory.patch

meta-oe/recipes-

Quoted 49 lines

new file mode 100644
index 0000000..69d26ad

meta-oe/recipes-support/unixodbc/files/do-not-use-libltdl-source-directory.patch new file +43 -0
@@ -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
+
meta-oe/recipes- renamed from meta-oe/recipes-support/unixodbc/unixodbc_2.3.4.bb +0 -0

support/unixodbc/unixodbc_2.3.4.bb

Quoted 10 lines

new file mode 100644
index 0000000..23d6d04

meta-oe/recipes-support/unixodbc/unixodbc_2.3.4.bb new file +5 -0
@@ -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/"

meta-oe/recipes-support/unixodbc/unixodbc_2.3.4.bb line 15

Quoted 10 lines
meta-oe/recipes-support/unixodbc/unixodbc_2.3.4.bb new file +10 -0
+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"

Quoted 14 lines

meta-oe/recipes-support/unixodbc/unixodbc_2.3.4.bb line 26

Quoted 11 lines
meta-oe/recipes-support/unixodbc/unixodbc_2.3.4.bb new file +11 -0
+
+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.

I see, thanks!

Thanks,
Jackie

Quoted 13 lines
Quoted 10 lines
meta-oe/recipes-support/unixodbc/unixodbc_2.3.4.bb new file +1 -1
+}
--

2.8.1

--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

--
Martin 'JaMa' Jansa jabber: [email protected]

#4 lore raw

PATCH 2/2 psqlodbc: Add the new recipe

In reply to [email protected]

From: Jackie Huang <[email protected]>

This package provides a driver that allows ODBC-enabled applications to access PostgreSQL databases.

Add ptest support as well.

---
 .../psqlodbc-donot-use-the-hardcode-libdir.patch   |  26 ++++
 .../files/psqlodbc-fix-for-ptest-support.patch     | 148 +++++++++++++++++++++
 ...bc-remove-some-checks-for-cross-compiling.patch | 118 ++++++++++++++++
 meta-oe/recipes-support/psqlodbc/files/run-ptest   |  46 +++++++
 meta-oe/recipes-support/psqlodbc/psqlodbc.inc      |  50 +++++++
 .../psqlodbc/psqlodbc_09.05.0300.bb                |  14 ++
 6 files changed, 402 insertions(+)
 create mode 100644 meta-oe/recipes-support/psqlodbc/files/psqlodbc-donot-use-the-hardcode-libdir.patch
 create mode 100644 meta-oe/recipes-support/psqlodbc/files/psqlodbc-fix-for-ptest-support.patch
 create mode 100644 meta-oe/recipes-support/psqlodbc/files/psqlodbc-remove-some-checks-for-cross-compiling.patch
 create mode 100644 meta-oe/recipes-support/psqlodbc/files/run-ptest
 create mode 100644 meta-oe/recipes-support/psqlodbc/psqlodbc.inc
 create mode 100644 meta-oe/recipes-support/psqlodbc/psqlodbc_09.05.0300.bb
meta-oe/recipes-support/psqlodbc/files/psqlodbc-donot-use-the-hardcode-libdir.patch new file +26 -0
new file mode 100644
index 0000000..7eda038
@@ -0,0 +1,26 @@
+[PATCH] do not use the hardcode libdir
+
+Upstream-status: Pending
+
+Signed-off-by: Roy.Li <[email protected]>
+Signed-off-by: Jackie Huang <[email protected]>
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 9b88d4c..df5ad7a 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -140,7 +140,7 @@ if test "$with_libpq" != yes; then
+ 	if test -d "$with_libpq"; then
+ 		PATH="$PATH:$with_libpq/bin"
+ 		CPPFLAGS="$CPPFLAGS -I$with_libpq/include"
+-		LDFLAGS="$LDFLAGS -L$with_libpq/lib"
++		LDFLAGS="$LDFLAGS -L$with_libpq/${base_libdir}"
+ 	else
+ 		if test -x "$with_libpq"; then
+ 			PG_CONFIG=$with_libpq
+-- 
+2.8.1
+
meta-oe/recipes-support/psqlodbc/files/psqlodbc-fix-for-ptest-support.patch new file +148 -0

148 lines not on this page · raw message

meta-oe/recipes-support/psqlodbc/files/psqlodbc-remove-some-checks-for-cross-compiling.patch new file +118 -0

118 lines not on this page · raw message

meta-oe/recipes-support/psqlodbc/files/run-ptest new file +46 -0

46 lines not on this page · raw message

meta-oe/recipes-support/psqlodbc/psqlodbc.inc new file +50 -0

50 lines not on this page · raw message

meta-oe/recipes-support/psqlodbc/psqlodbc_09.05.0300.bb new file +14 -0
new file mode 100644
index 0000000..7144bd0
@@ -0,0 +1,14 @@
+require ${PN}.inc
+
+LICENSE = "LGPLv2"
+LIC_FILES_CHKSUM = "file://license.txt;md5=6db3822fc7512e83087ba798da013692"
+
+SRC_URI = "http://ftp.postgresql.org/pub/odbc/versions/src/${BPN}-${PV}.tar.gz \
+	   file://psqlodbc-remove-some-checks-for-cross-compiling.patch \
+	   file://psqlodbc-donot-use-the-hardcode-libdir.patch \
+	   file://psqlodbc-fix-for-ptest-support.patch \
+	   file://run-ptest \
+	  "
+
+SRC_URI[md5sum] = "4c6e0b22187d7bb1c998ffac89e50f6b"
+SRC_URI[sha256sum] = "9521f328bf28aaaf5c8488dc89792b614f9d6271742c0baf9bb41c97537764a8"
Signature · 1 line
2.8.1