diff options
| author | adam <adam@pkgsrc.org> | 2016-03-06 12:12:00 +0000 |
|---|---|---|
| committer | adam <adam@pkgsrc.org> | 2016-03-06 12:12:00 +0000 |
| commit | b0c072c17840c0889ab38bcb673c1784e3847542 (patch) | |
| tree | b68bc711520896dfae130493061a951f958d57c6 | |
| parent | 8e646e545a8a17a94700d3fd3b39d8799f5511b7 (diff) | |
| download | pkgsrc-b0c072c17840c0889ab38bcb673c1784e3847542.tar.gz | |
Switch to dynamically-linked shell
| -rw-r--r-- | databases/sqlite3/Makefile | 8 | ||||
| -rw-r--r-- | databases/sqlite3/distinfo | 3 | ||||
| -rw-r--r-- | databases/sqlite3/patches/patch-Makefile.in | 33 |
3 files changed, 37 insertions, 7 deletions
diff --git a/databases/sqlite3/Makefile b/databases/sqlite3/Makefile index 1c5a91170ff..67ec58728c8 100644 --- a/databases/sqlite3/Makefile +++ b/databases/sqlite3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.104 2016/01/23 05:45:59 ryoon Exp $ +# $NetBSD: Makefile,v 1.105 2016/03/06 12:12:00 adam Exp $ DISTNAME= sqlite-autoconf-${SQLITE3_DISTVERSION} PKGNAME= sqlite3-${SQLITE3_VERSION} @@ -12,14 +12,10 @@ LICENSE= public-domain .include "../../databases/sqlite3/Makefile.version" .include "options.mk" -# On at least NetBSD 7.0_BETA amd64 -# sqlite3.o: file not recognized: File truncated -# Makefile:404: recipe for target 'sqlite3' failed -MAKE_JOBS_SAFE= no - USE_LIBTOOL= yes USE_TOOLS+= gmake GNU_CONFIGURE= yes +CONFIGURE_ARGS+= --disable-static-shell PKGCONFIG_OVERRIDE+= sqlite3.pc.in diff --git a/databases/sqlite3/distinfo b/databases/sqlite3/distinfo index c21b3dc356c..2ededd9c221 100644 --- a/databases/sqlite3/distinfo +++ b/databases/sqlite3/distinfo @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.117 2016/03/06 09:57:51 adam Exp $ +$NetBSD: distinfo,v 1.118 2016/03/06 12:12:00 adam Exp $ SHA1 (sqlite-autoconf-3110100.tar.gz) = c4b4dcd735a4daf5a2e2bb90f374484c8d4dad29 RMD160 (sqlite-autoconf-3110100.tar.gz) = 34af4aa0dbb1635752a6093034c87a7467647fc9 SHA512 (sqlite-autoconf-3110100.tar.gz) = c3efd2693e6a9526a2901d9879982a421e81e7e979aef65a160e71b255339344079a1943395480d5c37a1acc6243a8d45f45fa688f7e996774da38a3a99e71a1 Size (sqlite-autoconf-3110100.tar.gz) = 2359545 bytes +SHA1 (patch-Makefile.in) = 8966794bad2be8bb56af6f743569c454713abf3d SHA1 (patch-configure) = 6b6c19d6be2cd61e6502554dc263a1178f9d75c0 diff --git a/databases/sqlite3/patches/patch-Makefile.in b/databases/sqlite3/patches/patch-Makefile.in new file mode 100644 index 00000000000..c2ec6b82b80 --- /dev/null +++ b/databases/sqlite3/patches/patch-Makefile.in @@ -0,0 +1,33 @@ +$NetBSD: patch-Makefile.in,v 1.1 2016/03/06 12:12:00 adam Exp $ + +Fix for dynamically linked shell tool. + +--- Makefile.in.orig 2016-03-03 16:37:17.000000000 +0000 ++++ Makefile.in +@@ -146,7 +146,7 @@ libsqlite3_la_LINK = $(LIBTOOL) $(AM_V_l + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(libsqlite3_la_LDFLAGS) $(LDFLAGS) -o $@ + PROGRAMS = $(bin_PROGRAMS) +-am_sqlite3_OBJECTS = sqlite3-shell.$(OBJEXT) sqlite3-sqlite3.$(OBJEXT) ++am_sqlite3_OBJECTS = sqlite3-shell.$(OBJEXT) + sqlite3_OBJECTS = $(am_sqlite3_OBJECTS) + sqlite3_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(sqlite3_CFLAGS) \ +@@ -364,7 +364,7 @@ AM_CFLAGS = @THREADSAFE_FLAGS@ @DYNAMIC_ + lib_LTLIBRARIES = libsqlite3.la + libsqlite3_la_SOURCES = sqlite3.c + libsqlite3_la_LDFLAGS = -no-undefined -version-info 8:6:8 +-sqlite3_SOURCES = shell.c sqlite3.c sqlite3.h ++sqlite3_SOURCES = shell.c sqlite3.h + sqlite3_LDADD = @READLINE_LIBS@ + sqlite3_DEPENDENCIES = @EXTRA_SHELL_OBJ@ + sqlite3_CFLAGS = $(AM_CFLAGS) -DSQLITE_ENABLE_EXPLAIN_COMMENTS +@@ -502,7 +502,7 @@ clean-binPROGRAMS: + + sqlite3$(EXEEXT): $(sqlite3_OBJECTS) $(sqlite3_DEPENDENCIES) $(EXTRA_sqlite3_DEPENDENCIES) + @rm -f sqlite3$(EXEEXT) +- $(AM_V_CCLD)$(sqlite3_LINK) $(sqlite3_OBJECTS) $(sqlite3_LDADD) $(LIBS) ++ $(AM_V_CCLD)$(sqlite3_LINK) $(sqlite3_OBJECTS) $(sqlite3_DEPENDENCIES) $(sqlite3_LDADD) $(LIBS) + + mostlyclean-compile: + -rm -f *.$(OBJEXT) |