Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 36 additions & 2 deletions Formula/guile-dbi.rb
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
class GuileDbi < Formula
desc "Guile scheme interface to SQL databases"
homepage "https://github.com/opencog/guile-dbi"
url "https://github.com/opencog/guile-dbi/archive/refs/tags/guile-dbi-2.1.8.tar.gz"
sha256 "c6a84a63b57ae23c259c203063f4226ac566161e0261f4e1d2f2f963ad06e4e7"
url "https://github.com/opencog/guile-dbi.git", revision: "56e12dcab139c373dafccdd72fa2a140d82f3910"
version "2.1.9"
license "GPL-2.0-only"

bottle do
root_url "https://github.com/aconchillo/homebrew-guile/releases/download/guile-dbi-2.1.8"
Expand All @@ -11,9 +12,12 @@ class GuileDbi < Formula

depends_on "autoconf" => :build
depends_on "automake" => :build
depends_on "gettext" => :build
depends_on "texinfo" => :build
depends_on "guile"

patch :DATA

def install
ENV["GUILE_AUTO_COMPILE"] = "0"

Expand Down Expand Up @@ -48,3 +52,33 @@ def caveats
system "guile", dbi
end
end

__END__
diff --git a/guile-dbi/configure.ac b/guile-dbi/configure.ac
index 0b7d97f..71994e4 100644
--- a/guile-dbi/configure.ac
+++ b/guile-dbi/configure.ac
@@ -56,10 +56,6 @@ PKG_CHECK_MODULES([GUILE], [guile-3.0])
GUILE_PKG([3.0])
GUILE_FLAGS
GUILE_SITE_DIR
-#--
-CFLAGS="${CFLAGS} ${LTDLINCL} `$GUILE_CONFIG compile`"
-LIBS="$LIBLTDL `$GUILE_CONFIG link`"
-GUILE_SITE=`$GUILE_CONFIG info sitedir`

# Check for makeinfo; avoid ugliness if not installed.
AC_CHECK_PROG(have_makeinfo,makeinfo,yes,no)
diff --git a/guile-dbi/src/dbi/Makefile.am b/guile-dbi/src/dbi/Makefile.am
index fe05315..342f567 100644
--- a/guile-dbi/src/dbi/Makefile.am
+++ b/guile-dbi/src/dbi/Makefile.am
@@ -24,7 +24,7 @@

AUTOMAKE_OPTIONS = gnu

-guiledbidatadir = $(GUILE_SITE)/dbi
+guiledbidatadir = $(datadir)/guile/site/$(GUILE_EFFECTIVE_VERSION)/dbi
guiledbidata_DATA = dbi.scm

EXTRA_DIST = $(guiledbidata_DATA)