pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
lua-pgsql: Fix build
Module Name: pkgsrc-wip
Committed By: Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By: kamil
Date: Fri Oct 7 17:20:36 2016 +0200
Changeset: 3182e8e0204dd4af4b85ef2fcdb4a1724453a066
Modified Files:
lua-pgsql/Makefile
lua-pgsql/PLIST
lua-pgsql/distinfo
Removed Files:
lua-pgsql/patches/patch-aa
Log Message:
lua-pgsql: Fix build
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=3182e8e0204dd4af4b85ef2fcdb4a1724453a066
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
lua-pgsql/Makefile | 14 +++++++-------
lua-pgsql/PLIST | 5 ++---
lua-pgsql/distinfo | 1 -
lua-pgsql/patches/patch-aa | 24 ------------------------
4 files changed, 9 insertions(+), 35 deletions(-)
diffs:
diff --git a/lua-pgsql/Makefile b/lua-pgsql/Makefile
index e11dcba..0e4164e 100644
--- a/lua-pgsql/Makefile
+++ b/lua-pgsql/Makefile
@@ -1,5 +1,4 @@
# $NetBSD: Makefile,v 1.9 2012/11/25 23:32:27 othyro Exp $
-#
GITHUB_PROJECT= luasql
DISTNAME= luasql-2.3.2
@@ -14,15 +13,16 @@ MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= http://www.keplerproject.org/luasql/
COMMENT= PostgreSQL bindings for Lua
-BUILD_TARGET= pglinux
+USE_TOOLS= gmake
+BUILD_TARGET= postgres
INSTALLATION_DIRS= lib
+MAKE_FLAGS+= DRIVER_LIBS_postgres="${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.${PGSQL_TYPE}}/lib -L${BUILDLINK_PREFIX.${PGSQL_TYPE}}/lib"
+MAKE_FLAGS+= DRIVER_INCS_postgres=-I${BUILDLINK_PREFIX.${PGSQL_TYPE}}/include
+INSTALL_MAKE_FLAGS+= PREFIX=${DESTDIR}${PREFIX}
-do-install:
- ${INSTALL_DATA} ${WRKSRC}/libluasqlpostgres.2.0b.so \
- ${DESTDIR}${PREFIX}/lib/libluasqlpostgres.2.0b.so
- ${INSTALL_DATA} ${WRKSRC}/libluasqlpostgres.2.0b.a \
- ${DESTDIR}${PREFIX}/lib/libluasqlpostgres.2.0b.a
+# %make_install PREFIX=%{buildroot}%{_prefix} LUA_LIBDIR=%{buildroot}%{lualibdir} LUA_DIR=%{buildroot}%{luapkgdir}
+# DRIVER_INCS="`pkg-config --cflags sqlite3`" DRIVER_LIBS="`pkg-config --libs sqlite3`" DEFS="%{optflags}" sqlite3
.include "../../lang/lua/buildlink3.mk"
.include "../../mk/pgsql.buildlink3.mk"
diff --git a/lua-pgsql/PLIST b/lua-pgsql/PLIST
index 1f0e74f..f490954 100644
--- a/lua-pgsql/PLIST
+++ b/lua-pgsql/PLIST
@@ -1,3 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/02/26 15:03:07 poppnk Exp $
-lib/libluasqlpostgres.${PKGVERSION}.a
-lib/libluasqlpostgres.${PKGVERSION}.so
+@comment $NetBSD$
+lib/lua/5.2/luasql/postgres.so
diff --git a/lua-pgsql/distinfo b/lua-pgsql/distinfo
index 66ec94b..82658fb 100644
--- a/lua-pgsql/distinfo
+++ b/lua-pgsql/distinfo
@@ -4,4 +4,3 @@ SHA1 (luasql-2.3.2.tar.gz) = 089b797d22589277b9b2f926f4da008fe7026ccb
RMD160 (luasql-2.3.2.tar.gz) = 478d699360fa9d0605a1801962b0bade6a8e6098
SHA512 (luasql-2.3.2.tar.gz) = 6bfd25c494fa214c2f449d95448966b4872fa46a8df87969a9bd654c4f8c341f2a3a56b2bd6ca6cf09971caf5ab05a0c912fffe97dc782921572039308f7f8fa
Size (luasql-2.3.2.tar.gz) = 100985 bytes
-SHA1 (patch-aa) = dab3a81e380645c43bcecc11a19524cc66571c40
diff --git a/lua-pgsql/patches/patch-aa b/lua-pgsql/patches/patch-aa
deleted file mode 100644
index 6045ea7..0000000
--- a/lua-pgsql/patches/patch-aa
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/02/26 15:03:07 poppnk Exp $
-
---- Makefile.orig Wed Dec 10 18:44:03 2003
-+++ Makefile Thu Feb 26 16:01:45 2004
-@@ -8,8 +8,8 @@
- PG_LIB= libluasqlpostgres.$(VERSION).a
- PG_SO= libluasqlpostgres.$(VERSION).so
- PG_DYLIB= libluasqlpostgres.$(VERSION).dylib
--PG_LIBS= -L/usr/local/pgsql/lib -lpq
--PG_INCS= -I/usr/local/pgsql/include
-+PG_LIBS= -L${PREFIX}/lib -lpq
-+PG_INCS= -I${PREFIX}/include
-
- OCI_OBJ= ls_oci8.o
- OCI_LIB= libluasqloci8.$(VERSION).a
-@@ -28,7 +28,7 @@
- WARN= -Wall -Wmissing-prototypes -Wmissing-declarations -ansi
- INCS= -I/usr/local/include/lua5 $(PG_INCS) $(OCI_INCS) $(MYSQL_INCS)
- #LIBS_DIR= -L../lua-5.0/lib
--LIBS= -llua.5.0 -llualib.5.0 -lm -ldl
-+LIBS= -llua -lm
- CFLAGS= -O2 $(WARN) $(INCS) $(DEFS)
-
- PKG= luasql-$(VERSION)
Home |
Main Index |
Thread Index |
Old Index