Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/net/bind911 net/bind911: fix build problem if PKG_DEVE...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/5872b1e53f62
branches:  trunk
changeset: 433035:5872b1e53f62
user:      taca <taca%pkgsrc.org@localhost>
date:      Sat May 30 14:20:36 2020 +0000

description:
net/bind911: fix build problem if PKG_DEVELOPER is enabled

There was build problem after pkg-config was aded to USE_TOOLS if
PKG_DEVELOPER is enabled, causing WRKDIR reference.

Fix method is dirty (or quick) hack.

diffstat:

 net/bind911/Makefile                            |   3 ++-
 net/bind911/distinfo                            |   3 ++-
 net/bind911/patches/patch-bin_named_Makefile.in |  15 +++++++++++++++
 3 files changed, 19 insertions(+), 2 deletions(-)

diffs (51 lines):

diff -r c5e9a3a274f4 -r 5872b1e53f62 net/bind911/Makefile
--- a/net/bind911/Makefile      Sat May 30 12:59:29 2020 +0000
+++ b/net/bind911/Makefile      Sat May 30 14:20:36 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2020/05/21 12:45:47 jperkin Exp $
+# $NetBSD: Makefile,v 1.26 2020/05/30 14:20:36 taca Exp $
 
 DISTNAME=      bind-${BIND_VERSION}
 PKGNAME=       ${DISTNAME:S/-P/pl/}
@@ -25,6 +25,7 @@
 USE_TOOLS+=            pax perl pkg-config
 USE_LIBTOOL=           yes
 GNU_CONFIGURE=         yes
+MAKE_ENV+=             WRKDIR=${WRKDIR} PREFIX=${PREFIX}
 
 CONFIGURE_ARGS+=               --with-libtool
 CONFIGURE_ARGS+=               --sysconfdir=${PKG_SYSCONFDIR}
diff -r c5e9a3a274f4 -r 5872b1e53f62 net/bind911/distinfo
--- a/net/bind911/distinfo      Sat May 30 12:59:29 2020 +0000
+++ b/net/bind911/distinfo      Sat May 30 14:20:36 2020 +0000
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.18 2020/05/19 10:21:25 taca Exp $
+$NetBSD: distinfo,v 1.19 2020/05/30 14:20:36 taca Exp $
 
 SHA1 (bind-9.11.19.tar.gz) = f62726f2379eb1f2921c64c20f6668ce3db190c2
 RMD160 (bind-9.11.19.tar.gz) = 1c3fb7df3a88e2e13053f606b6a2d6a3efd73185
 SHA512 (bind-9.11.19.tar.gz) = 4378afcd8c72a3f1b597e180a21674e1bbfc44b8378831ab3256395bdc46dce74da31aaa855fbae29d4c93e360dad233e3c8e3e69326779ddfecddbc96511ea2
 Size (bind-9.11.19.tar.gz) = 8230483 bytes
+SHA1 (patch-bin_named_Makefile.in) = 3e5b98e3e0bdb701be679d3580d6d2d7609d655b
 SHA1 (patch-bin_named_server.c) = 0294d74eb3039049c4672a3de6eb371407bb382d
 SHA1 (patch-bin_pkcs11_pkcs11-keygen.c) = ca2671a5e3216a08a212cf893e070b01705ef9ee
 SHA1 (patch-bin_tests_system_metadata_tests.sh) = d01a492d0b7738760bdbff714248e279a78fef28
diff -r c5e9a3a274f4 -r 5872b1e53f62 net/bind911/patches/patch-bin_named_Makefile.in
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/bind911/patches/patch-bin_named_Makefile.in   Sat May 30 14:20:36 2020 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-bin_named_Makefile.in,v 1.1 2020/05/30 14:20:36 taca Exp $
+
+* Dirty hack to prevent WRKDIR reference.
+
+--- bin/named/Makefile.in.orig 2020-05-06 12:50:24.000000000 +0000
++++ bin/named/Makefile.in
+@@ -130,7 +130,7 @@ main.@O@: main.c
+               -DPRODUCT=\"${PRODUCT}\" \
+               -DDESCRIPTION=\"${DESCRIPTION}\" \
+               -DSRCID=\"${SRCID}\" \
+-              -DCONFIGARGS="\"${CONFIGARGS}\"" \
++              -DCONFIGARGS="\"${CONFIGARGS:S/${WRKDIR}\/.tools/${PREFIX}/g:S/${WRKDIR}\/.buildlink/${PREFIX}/g}\"" \
+               -DBUILDER="\"make\"" \
+               -DNS_LOCALSTATEDIR=\"${localstatedir}\" \
+               -DNS_SYSCONFDIR=\"${sysconfdir}\" -c ${srcdir}/main.c



Home | Main Index | Thread Index | Old Index