Skip to content

Commit

Permalink
dev-db/unixODBC: fix patch & install
Browse files Browse the repository at this point in the history
I'm sorry, I must have tested the old version instead.

Closes: https://bugs.gentoo.org/905819
Fixes: 57836a8
Signed-off-by: Sam James <[email protected]>
  • Loading branch information
thesamesam committed May 6, 2023
1 parent 70320ca commit ce5c52a
Show file tree
Hide file tree
Showing 2 changed files with 44 additions and 3 deletions.
33 changes: 33 additions & 0 deletions dev-db/unixODBC/files/unixODBC-2.3.11-config-no-install.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
https://github.com/lurcher/unixODBC/commit/685df9e2b4fbbd191ab081a2020956aa78295fe0

From 685df9e2b4fbbd191ab081a2020956aa78295fe0 Mon Sep 17 00:00:00 2001
From: Hugh McMaster <[email protected]>
Date: Fri, 13 May 2022 22:03:37 +1000
Subject: [PATCH] Makefile.am: Do not install config.h

--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-ACLOCAL_AMFLAGS=-I m4
+ACLOCAL_AMFLAGS=-I m4

pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = \
@@ -21,7 +21,7 @@ SUBDIRS = \
include \
doc \
man \
- samples
+ samples

EXTRA_DIST = \
README.OSX \
@@ -47,7 +47,7 @@ EXTRA_DIST = \

include_HEADERS = unixodbc.h

-pkginclude_HEADERS = unixodbc_conf.h config.h
+pkginclude_HEADERS = unixodbc_conf.h

install-data-hook:
-$(MKDIR_P) $(DESTDIR)$(sysconfdir)/ODBCDataSources
14 changes: 11 additions & 3 deletions dev-db/unixODBC/unixODBC-2.3.11.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

EAPI=8

inherit multilib-minimal
inherit autotools multilib-minimal

DESCRIPTION="Complete ODBC driver manager"
HOMEPAGE="https://www.unixodbc.org/"
Expand All @@ -27,12 +27,20 @@ DEPEND="
"

MULTILIB_CHOST_TOOLS=( /usr/bin/odbc_config )
MULTILIB_WRAPPED_HEADERS=( /usr/include/unixodbc_conf.h )
MULTILIB_WRAPPED_HEADERS=( /usr/include/unixODBC/unixodbc_conf.h /usr/include/unixodbc.h )

PATCHES=(
"${FILESDIR}"/${P}-clang16.patch
"${FILESDIR}"/${PN}-2.3.9-clang16.patch
"${FILESDIR}"/${P}-config-no-install.patch
)

src_prepare() {
default

# Only needed for config.h install patch
eautoreconf
}

multilib_src_configure() {
# Needs flex, bison
export LEX=flex
Expand Down

0 comments on commit ce5c52a

Please sign in to comment.