CVS commit: pkgsrc/textproc/libxml2

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Wed Nov 15 15:53:41 UTC 2023

Modified Files:
        pkgsrc/textproc/libxml2: Makefile distinfo
        pkgsrc/textproc/libxml2/patches: patch-configure

Log Message:
libxml2: Fix xml2-config script on systems without -Wl,-R


To generate a diff of this commit:
cvs rdiff -u -r1.172 -r1.173 pkgsrc/textproc/libxml2/Makefile
cvs rdiff -u -r1.144 -r1.145 pkgsrc/textproc/libxml2/distinfo
cvs rdiff -u -r1.5 -r1.6 pkgsrc/textproc/libxml2/patches/patch-configure

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

Modified files:

Index: pkgsrc/textproc/libxml2/Makefile
diff -u pkgsrc/textproc/libxml2/Makefile:1.172 pkgsrc/textproc/libxml2/Makefile:1.173
--- pkgsrc/textproc/libxml2/Makefile:1.172      Wed Nov  8 13:21:06 2023
+++ pkgsrc/textproc/libxml2/Makefile    Wed Nov 15 15:53:41 2023
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.172 2023/11/08 13:21:06 wiz Exp $
+# $NetBSD: Makefile,v 1.173 2023/11/15 15:53:41 nia Exp $
 
-PKGREVISION= 3
+PKGREVISION= 4
 .include "../../textproc/libxml2/Makefile.common"
 
 COMMENT=       XML parser library from the GNOME project
@@ -22,6 +22,11 @@ USE_LANGUAGES+=              c99
 
 TEST_TARGET=   check
 
+SUBST_CLASSES+=                rpath
+SUBST_STAGE.rpath=     pre-configure
+SUBST_FILES.rpath=     configure
+SUBST_VARS.rpath=      COMPILER_RPATH_FLAG
+
 .include "options.mk"
 
 .include "../../archivers/xz/buildlink3.mk"

Index: pkgsrc/textproc/libxml2/distinfo
diff -u pkgsrc/textproc/libxml2/distinfo:1.144 pkgsrc/textproc/libxml2/distinfo:1.145
--- pkgsrc/textproc/libxml2/distinfo:1.144      Sat Apr 15 13:06:21 2023
+++ pkgsrc/textproc/libxml2/distinfo    Wed Nov 15 15:53:41 2023
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.144 2023/04/15 13:06:21 gutteridge Exp $
+$NetBSD: distinfo,v 1.145 2023/11/15 15:53:41 nia Exp $
 
 BLAKE2s (libxml2-2.10.4.tar.xz) = f54b22ffa245226395133ab4d172192d06ee88b1a4a9f700804bb26d7af757d0
 SHA512 (libxml2-2.10.4.tar.xz) = 792c1dceb098cd353a7eca4c46d31cce6310b2553d97fd3918cf0b94d93b2480759202036511bde36c24166236bd4616f57e79959eea9afe3f60614bdfe13094
 Size (libxml2-2.10.4.tar.xz) = 2643600 bytes
-SHA1 (patch-configure) = 3d73d05780562dccd5f9621d9e9f15f2d62cfa87
+SHA1 (patch-configure) = ff3dee578548e852cb6ff3281d18f5fcce1c2649
 SHA1 (patch-encoding.c) = 7fe0f67db061a2f46abe1c4b6b4d8a0402f82830
 SHA1 (patch-error.c) = 77561e820e0da96acb572378c2f2a0b9b84112e1

Index: pkgsrc/textproc/libxml2/patches/patch-configure
diff -u pkgsrc/textproc/libxml2/patches/patch-configure:1.5 pkgsrc/textproc/libxml2/patches/patch-configure:1.6
--- pkgsrc/textproc/libxml2/patches/patch-configure:1.5 Sun Jan 22 10:30:09 2023
+++ pkgsrc/textproc/libxml2/patches/patch-configure     Wed Nov 15 15:53:41 2023
@@ -1,4 +1,4 @@
-$NetBSD: patch-configure,v 1.5 2023/01/22 10:30:09 wiz Exp $
+$NetBSD: patch-configure,v 1.6 2023/11/15 15:53:41 nia Exp $
 
  * Add run-path to XML_LIBDIR
 
@@ -9,7 +9,7 @@ $NetBSD: patch-configure,v 1.5 2023/01/2
  
  
 -XML_LIBDIR='-L${libdir}'
-+XML_LIBDIR='-Wl,-R${libdir} -L${libdir}'
++XML_LIBDIR='@COMPILER_RPATH_FLAG@${libdir} -L${libdir}'
  XML_INCLUDEDIR='-I${includedir}/libxml2'
  
  XML_CFLAGS=""