Pullup ticket #5301 - requested by sevan databases/sqlite: build fix Revisions pulled up: - databases/sqlite/distinfo 1.25 - databases/sqlite/patches/patch-Makefile.in 1.2 --- Module Name: pkgsrc Committed By: khorben Date: Sun Apr 16 20:27:09 UTC 2017 Modified Files: pkgsrc/databases/sqlite: distinfo pkgsrc/databases/sqlite/patches: patch-Makefile.in Log Message: Avoid a warning while generating config.h No functional change intended.diff -r1.24 -r1.24.12.1 pkgsrc/databases/sqlite/distinfo
(bsiegert)
@@ -1,9 +1,9 @@ | @@ -1,9 +1,9 @@ | |||
1 | $NetBSD: distinfo,v 1.24 2015/11/03 01:56:35 agc Exp $ | 1 | $NetBSD: distinfo,v 1.24.12.1 2017/04/17 16:36:04 bsiegert Exp $ | |
2 | 2 | |||
3 | SHA1 (sqlite-2.8.17.tar.gz) = 75db1cf3b00ea18ae8528e676fc9fdf698e2fe58 | 3 | SHA1 (sqlite-2.8.17.tar.gz) = 75db1cf3b00ea18ae8528e676fc9fdf698e2fe58 | |
4 | RMD160 (sqlite-2.8.17.tar.gz) = f13edcb0c2f7246e97ea7443de1758b4442a9483 | 4 | RMD160 (sqlite-2.8.17.tar.gz) = f13edcb0c2f7246e97ea7443de1758b4442a9483 | |
5 | SHA512 (sqlite-2.8.17.tar.gz) = 966e0b7f7ebbaaa9e1899864475040946fd7b66363be778d29fadd5184623b1e62644f3c8d4c4ecd001b88044befa7c34d9de9f68590329a1a8301d854b73e3f | 5 | SHA512 (sqlite-2.8.17.tar.gz) = 966e0b7f7ebbaaa9e1899864475040946fd7b66363be778d29fadd5184623b1e62644f3c8d4c4ecd001b88044befa7c34d9de9f68590329a1a8301d854b73e3f | |
6 | Size (sqlite-2.8.17.tar.gz) = 969805 bytes | 6 | Size (sqlite-2.8.17.tar.gz) = 969805 bytes | |
7 | SHA1 (patch-Makefile.in) = 909e53c1ee0b76964774f263f00047118728f38d | 7 | SHA1 (patch-Makefile.in) = a7e6d0c15b6bd4c8c0f3a7123e82a145b3848703 | |
8 | SHA1 (patch-aa) = 4df2eff8c92b3e2bff86c710ef1a803d54201559 | 8 | SHA1 (patch-aa) = 4df2eff8c92b3e2bff86c710ef1a803d54201559 | |
9 | SHA1 (patch-ab) = 00b7de05589fb62d511e26d0d864a8b5545967c8 | 9 | SHA1 (patch-ab) = 00b7de05589fb62d511e26d0d864a8b5545967c8 |
@@ -1,15 +1,26 @@ | @@ -1,15 +1,26 @@ | |||
1 | $NetBSD: patch-Makefile.in,v 1.1 2015/03/16 11:56:32 jperkin Exp $ | 1 | $NetBSD: patch-Makefile.in,v 1.1.18.1 2017/04/17 16:36:04 bsiegert Exp $ | |
2 | 2 | |||
3 | Honour LDFLAGS for bl3. | 3 | * Honour LDFLAGS for bl3. | |
4 | * Avoid a warning while generating config.h. | |||
4 | 5 | |||
5 | --- Makefile.in.orig 2005-04-23 22:43:23.000000000 +0000 | 6 | --- Makefile.in.orig 2005-04-23 22:43:23.000000000 +0000 | |
6 | +++ Makefile.in | 7 | +++ Makefile.in | |
7 | @@ -38,7 +38,7 @@ RELEASE = @ALLOWRELEASE@ | 8 | @@ -38,7 +38,7 @@ RELEASE = @ALLOWRELEASE@ | |
8 | 9 | |||
9 | # libtool compile/link/install | 10 | # libtool compile/link/install | |
10 | LTCOMPILE = $(LIBTOOL) --mode=compile $(TCC) | 11 | LTCOMPILE = $(LIBTOOL) --mode=compile $(TCC) | |
11 | -LTLINK = $(LIBTOOL) --mode=link $(TCC) | 12 | -LTLINK = $(LIBTOOL) --mode=link $(TCC) | |
12 | +LTLINK = $(LIBTOOL) --mode=link $(TCC) $(LDFLAGS) | 13 | +LTLINK = $(LIBTOOL) --mode=link $(TCC) $(LDFLAGS) | |
13 | LTINSTALL = $(LIBTOOL) --mode=install $(INSTALL) | 14 | LTINSTALL = $(LIBTOOL) --mode=install $(INSTALL) | |
14 | 15 | |||
15 | # Compiler options needed for programs that use the TCL library. | 16 | # Compiler options needed for programs that use the TCL library. | |
17 | @@ -268,7 +268,8 @@ parse.c: $(TOP)/src/parse.y lemon@BUILD_ | |||
18 | # configure the config.h file. | |||
19 | # | |||
20 | config.h: | |||
21 | - echo '#include <stdio.h>' >temp.c | |||
22 | + echo '#include <stdlib.h>' >temp.c | |||
23 | + echo '#include <stdio.h>' >>temp.c | |||
24 | echo 'int main(){printf(' >>temp.c | |||
25 | echo '"#define SQLITE_PTR_SZ %d",sizeof(char*));' >>temp.c | |||
26 | echo 'exit(0);}' >>temp.c |