Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1529314992132680"
MIME-Version: 1.0
Date: Mon, 18 Jun 2018 09:43:12 +0000
From: "Leonardo Taccari" <leot@netbsd.org>
Subject: CVS commit: pkgsrc/devel/global
To: pkgsrc-changes@NetBSD.org
Reply-To: leot@netbsd.org
Message-Id: <20180618094312.6B425FBEC@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1529314992132680
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	leot
Date:		Mon Jun 18 09:43:12 UTC 2018

Modified Files:
	pkgsrc/devel/global: Makefile distinfo options.mk
Added Files:
	pkgsrc/devel/global/patches: patch-configure patch-libglibc_Makefile.in

Log Message:
global: Do not use bundled sqlite3 for `sqlite3' option

global provides a bundled sqlite3 that it is built and used unconditionally.
Adjust configure and libglibc/Makefile.in to avoid building it and instead
use databases/sqlite3.

Bump PKGREVISION


To generate a diff of this commit:
cvs rdiff -u -r1.71 -r1.72 pkgsrc/devel/global/Makefile
cvs rdiff -u -r1.34 -r1.35 pkgsrc/devel/global/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/global/options.mk
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/global/patches/patch-configure \
    pkgsrc/devel/global/patches/patch-libglibc_Makefile.in

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_1529314992132680
Content-Disposition: inline
Content-Length: 4443
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/devel/global/Makefile
diff -u pkgsrc/devel/global/Makefile:1.71 pkgsrc/devel/global/Makefile:1.72
--- pkgsrc/devel/global/Makefile:1.71	Sat Apr 14 07:34:16 2018
+++ pkgsrc/devel/global/Makefile	Mon Jun 18 09:43:12 2018
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.71 2018/04/14 07:34:16 adam Exp $
+# $NetBSD: Makefile,v 1.72 2018/06/18 09:43:12 leot Exp $
 
 DISTNAME=	global-6.6.2
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU:=global/}
 

Index: pkgsrc/devel/global/distinfo
diff -u pkgsrc/devel/global/distinfo:1.34 pkgsrc/devel/global/distinfo:1.35
--- pkgsrc/devel/global/distinfo:1.34	Sun Feb 25 20:43:05 2018
+++ pkgsrc/devel/global/distinfo	Mon Jun 18 09:43:12 2018
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.34 2018/02/25 20:43:05 wiz Exp $
+$NetBSD: distinfo,v 1.35 2018/06/18 09:43:12 leot Exp $
 
 SHA1 (global-6.6.2.tar.gz) = 27099afac1784e7d75e221f659154662fc54e727
 RMD160 (global-6.6.2.tar.gz) = 8019fac9289211f903b39659ae7bc549a9e08340
 SHA512 (global-6.6.2.tar.gz) = 9a58e4c2128bd420068754a5f93a472efa7ce12589dc291ebc0b6f4af8e2a5113d47ffa6887fc61ed1d6370529ced55826f25b484ac16416bced99235c01d744
 Size (global-6.6.2.tar.gz) = 2937594 bytes
+SHA1 (patch-configure) = 91803527b02b4ac2ff64c77a8bfb7f4eb96f30bd
+SHA1 (patch-libglibc_Makefile.in) = 1068764d2fc83ad4f1012c25d7dfd26da3022f98

Index: pkgsrc/devel/global/options.mk
diff -u pkgsrc/devel/global/options.mk:1.1 pkgsrc/devel/global/options.mk:1.2
--- pkgsrc/devel/global/options.mk:1.1	Thu Apr  2 22:39:45 2015
+++ pkgsrc/devel/global/options.mk	Mon Jun 18 09:43:12 2018
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2015/04/02 22:39:45 wiz Exp $
+# $NetBSD: options.mk,v 1.2 2018/06/18 09:43:12 leot Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.global
 PKG_OPTIONS_REQUIRED_GROUPS=	db
@@ -12,6 +12,8 @@ PKG_SUGGESTED_OPTIONS=	sqlite3
 .endif
 
 .if !empty(PKG_OPTIONS:Msqlite3)
-CONFIGURE_ARGS+=	 --with-sqlite3
+CONFIGURE_ARGS+=	--with-sqlite3
+LDFLAGS+=		-L${BUILDLINK_PREFIX.sqlite3}/lib \
+			${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.sqlite3}/lib
 .include "../../databases/sqlite3/buildlink3.mk"
 .endif

Added files:

Index: pkgsrc/devel/global/patches/patch-configure
diff -u /dev/null pkgsrc/devel/global/patches/patch-configure:1.1
--- /dev/null	Mon Jun 18 09:43:12 2018
+++ pkgsrc/devel/global/patches/patch-configure	Mon Jun 18 09:43:12 2018
@@ -0,0 +1,15 @@
+$NetBSD: patch-configure,v 1.1 2018/06/18 09:43:12 leot Exp $
+
+Do not use bundled sqlite3.
+
+--- configure.orig	2018-02-09 20:31:52.000000000 +0000
++++ configure
+@@ -16261,7 +16261,7 @@ $as_echo_n "checking for sqlite3 support
+ # Check whether --with-sqlite3 was given.
+ if test "${with_sqlite3+set}" = set; then :
+   withval=$with_sqlite3;
+-	#LDFLAGS="$LDFLAGS -lsqlite3"
++	LDFLAGS="$LDFLAGS -lsqlite3"
+ 
+ $as_echo "#define USE_SQLITE3 1" >>confdefs.h
+ 
Index: pkgsrc/devel/global/patches/patch-libglibc_Makefile.in
diff -u /dev/null pkgsrc/devel/global/patches/patch-libglibc_Makefile.in:1.1
--- /dev/null	Mon Jun 18 09:43:12 2018
+++ pkgsrc/devel/global/patches/patch-libglibc_Makefile.in	Mon Jun 18 09:43:12 2018
@@ -0,0 +1,28 @@
+$NetBSD: patch-libglibc_Makefile.in,v 1.1 2018/06/18 09:43:12 leot Exp $
+
+Do not use bundled sqlite3.
+
+--- libglibc/Makefile.in.orig	2018-02-09 20:31:54.000000000 +0000
++++ libglibc/Makefile.in
+@@ -116,8 +116,7 @@ am__objects_1 = regex.$(OBJEXT) getopt.$
+ 	snprintf.$(OBJEXT) obstack.$(OBJEXT) hash-string.$(OBJEXT) \
+ 	fnmatch.$(OBJEXT)
+ @USE_SQLITE3_FALSE@am_libgloglibc_a_OBJECTS = $(am__objects_1)
+-@USE_SQLITE3_TRUE@am_libgloglibc_a_OBJECTS = $(am__objects_1) \
+-@USE_SQLITE3_TRUE@	sqlite3.$(OBJEXT)
++@USE_SQLITE3_TRUE@am_libgloglibc_a_OBJECTS = $(am__objects_1)
+ libgloglibc_a_OBJECTS = $(am_libgloglibc_a_OBJECTS)
+ AM_V_P = $(am__v_P_@AM_V@)
+ am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+@@ -361,9 +360,9 @@ noinst_LIBRARIES = libgloglibc.a
+ INCS = regex.h getopt.h obstack.h hash-string.h getopt_int.h fnmatch.h
+ SRCS = regex.c getopt.c getopt1.c snprintf.c obstack.c hash-string.c fnmatch.c
+ @USE_SQLITE3_FALSE@noinst_HEADERS = $(INCS)
+-@USE_SQLITE3_TRUE@noinst_HEADERS = $(INCS) sqlite3.h
++@USE_SQLITE3_TRUE@noinst_HEADERS = $(INCS)
+ @USE_SQLITE3_FALSE@libgloglibc_a_SOURCES = $(SRCS)
+-@USE_SQLITE3_TRUE@libgloglibc_a_SOURCES = $(SRCS) sqlite3.c
++@USE_SQLITE3_TRUE@libgloglibc_a_SOURCES = $(SRCS)
+ libgloglibc_a_DEPENDENCIES = $(libgloglibc_a_LIBADD)
+ all: all-am
+ 


--_----------=_1529314992132680--