Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1710624792121550"
MIME-Version: 1.0
Date: Sat, 16 Mar 2024 21:33:12 +0000
From: "Nia Alarie" <nia@netbsd.org>
Subject: CVS commit: pkgsrc/devel/glib
To: pkgsrc-changes@NetBSD.org
Reply-To: nia@netbsd.org
Message-Id: <20240316213312.104E5FA2C@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

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

Module Name:	pkgsrc
Committed By:	nia
Date:		Sat Mar 16 21:33:11 UTC 2024

Modified Files:
	pkgsrc/devel/glib: Makefile distinfo
	pkgsrc/devel/glib/patches: patch-aa

Log Message:
glib: Do not hardcode COMPILER_RPATH_FLAG.

This patch almost last modified 25 years ago.


To generate a diff of this commit:
cvs rdiff -u -r1.96 -r1.97 pkgsrc/devel/glib/Makefile
cvs rdiff -u -r1.25 -r1.26 pkgsrc/devel/glib/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/glib/patches/patch-aa

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


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

Modified files:

Index: pkgsrc/devel/glib/Makefile
diff -u pkgsrc/devel/glib/Makefile:1.96 pkgsrc/devel/glib/Makefile:1.97
--- pkgsrc/devel/glib/Makefile:1.96	Sun Nov 24 01:02:37 2019
+++ pkgsrc/devel/glib/Makefile	Sat Mar 16 21:33:11 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.96 2019/11/24 01:02:37 gdt Exp $
+# $NetBSD: Makefile,v 1.97 2024/03/16 21:33:11 nia Exp $
 
 DISTNAME=		glib-1.2.10
 PKGREVISION=		11
@@ -59,6 +59,11 @@ SUBST_SED.shlib2=	-e "s|^\\(\#define.*GL
 SUBST_SED.shlib2+=	-e "s|^\\(\#define.*GLIB_MINOR_VERSION\\).*|\\1	${GLIB_MINOR_VERSION}|"
 SUBST_SED.shlib2+=	-e "s|^\\(\#define.*GLIB_MICRO_VERSION\\).*|\\1	${GLIB_MICRO_VERSION}|"
 
+SUBST_CLASSES+=		rpath
+SUBST_STAGE.rpath=	pre-configure
+SUBST_FILES.rpath=	glib-config.in
+SUBST_VARS.rpath=	COMPILER_RPATH_FLAG
+
 #post-configure:
 #	${CHMOD} +x config.status
 

Index: pkgsrc/devel/glib/distinfo
diff -u pkgsrc/devel/glib/distinfo:1.25 pkgsrc/devel/glib/distinfo:1.26
--- pkgsrc/devel/glib/distinfo:1.25	Tue Oct 26 10:14:42 2021
+++ pkgsrc/devel/glib/distinfo	Sat Mar 16 21:33:11 2024
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.25 2021/10/26 10:14:42 nia Exp $
+$NetBSD: distinfo,v 1.26 2024/03/16 21:33:11 nia Exp $
 
 BLAKE2s (glib-1.2.10.tar.gz) = b574a1849bd9cfb337c83adfad9564c885057367d3ab0c7d8d8fda559607f076
 SHA512 (glib-1.2.10.tar.gz) = 4452b741382194d4ca425f084fa60e1a9e30040ac2e839c9136047d0461cf4b1ebcc16aac4e65998d1b9329ead8f617966b3d09317a83634f14d556a7e14b7a8
 Size (glib-1.2.10.tar.gz) = 421480 bytes
-SHA1 (patch-aa) = e9c6046c3766d74919bb03f12cd8e9e32cd4f2f9
+SHA1 (patch-aa) = 285f09f869dfccf4ead2ef00753f26751ed9508a
 SHA1 (patch-ab) = 56e5035d8c144733752e38e0c1e790dfe44f87b7
 SHA1 (patch-ac) = 4ce393ab5cd08f8971faf7967f21669df0caae52
 SHA1 (patch-ad) = edcdc80d77007be247352b46acc95d99853997e9

Index: pkgsrc/devel/glib/patches/patch-aa
diff -u pkgsrc/devel/glib/patches/patch-aa:1.3 pkgsrc/devel/glib/patches/patch-aa:1.4
--- pkgsrc/devel/glib/patches/patch-aa:1.3	Tue Apr 27 21:05:04 1999
+++ pkgsrc/devel/glib/patches/patch-aa	Sat Mar 16 21:33:11 2024
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.3 1999/04/27 21:05:04 tron Exp $
+$NetBSD: patch-aa,v 1.4 2024/03/16 21:33:11 nia Exp $
 
 --- glib-config.in.orig	Wed Dec 16 02:29:18 1998
 +++ glib-config.in	Tue Apr 27 22:48:27 1999
@@ -7,5 +7,5 @@ $NetBSD: patch-aa,v 1.3 1999/04/27 21:05
  		libsa="$libsa @G_MODULE_LIBS@"
  	fi
 -	echo -L@libdir@ $libsp $libsa
-+	echo -L@libdir@ -Wl,-R@libdir@ $libsp $libsa
++	echo -L@libdir@ @COMPILER_RPATH_FLAG@@libdir@ $libsp $libsa
  fi


--_----------=_1710624792121550--