Sun Jul 9 14:29:50 2023 UTC ()
libxenserver: Honour CFLAGS/LDFLAGS. Should help the build on some platforms.


(nia)
diff -r1.37 -r1.38 pkgsrc/devel/libxenserver/Makefile
diff -r1.5 -r1.6 pkgsrc/devel/libxenserver/distinfo
diff -r1.1.1.1 -r1.2 pkgsrc/devel/libxenserver/patches/patch-Makefile
cvs diff -r1.37 -r1.38 pkgsrc/devel/libxenserver/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/libxenserver/Makefile 2023/04/19 08:08:18 1.37
+++ pkgsrc/devel/libxenserver/Makefile 2023/07/09 14:29:49 1.38
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1# $NetBSD: Makefile,v 1.37 2023/04/19 08:08:18 adam Exp $ 1# $NetBSD: Makefile,v 1.38 2023/07/09 14:29:49 nia Exp $
2# 2#
3 3
4VERSION= 6.2.0 4VERSION= 6.2.0
5DISTNAME= XenServer-${VERSION}-SDK 5DISTNAME= XenServer-${VERSION}-SDK
6PKGNAME= libxenserver-${VERSION} 6PKGNAME= libxenserver-${VERSION}
7PKGREVISION= 28 7PKGREVISION= 29
8CATEGORIES= devel 8CATEGORIES= devel
9MASTER_SITES= http://downloadns.citrix.com.edgesuite.net/7289/ 9MASTER_SITES= http://downloadns.citrix.com.edgesuite.net/7289/
10 10
11MAINTAINER= sborrill@NetBSD.org 11MAINTAINER= sborrill@NetBSD.org
12HOMEPAGE= http://community.citrix.com/cdn/xs/sdks/ 12HOMEPAGE= http://community.citrix.com/cdn/xs/sdks/
13COMMENT= Citrix XenServer SDK for C 13COMMENT= Citrix XenServer SDK for C
14LICENSE= 2-clause-bsd 14LICENSE= 2-clause-bsd
15 15
16EXTRACT_SUFX= .zip 16EXTRACT_SUFX= .zip
17WRKSRC= ${WRKDIR}/XenServer-SDK/libxenserver/src 17WRKSRC= ${WRKDIR}/XenServer-SDK/libxenserver/src
18MAJOR= 2 18MAJOR= 2
19MINOR= 0 19MINOR= 0
20BUILD_TARGET= libxenserver.so 20BUILD_TARGET= libxenserver.so
cvs diff -r1.5 -r1.6 pkgsrc/devel/libxenserver/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/libxenserver/distinfo 2021/10/26 10:15:31 1.5
+++ pkgsrc/devel/libxenserver/distinfo 2023/07/09 14:29:49 1.6
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.5 2021/10/26 10:15:31 nia Exp $ 1$NetBSD: distinfo,v 1.6 2023/07/09 14:29:49 nia Exp $
2 2
3BLAKE2s (XenServer-6.2.0-SDK.zip) = 8d8587ed4e06b84f9d7d5f244011d29937f8e7886563e5e907cafffd5f9bcf99 3BLAKE2s (XenServer-6.2.0-SDK.zip) = 8d8587ed4e06b84f9d7d5f244011d29937f8e7886563e5e907cafffd5f9bcf99
4SHA512 (XenServer-6.2.0-SDK.zip) = d108d3bcd7d98e667912ffde4ed3e162a1f80a95fb0881550db165e1b647a5d4c983d5b14dc42aedd44a3d502a2c508486c28a66bfdb661d9ce804d38afefa04 4SHA512 (XenServer-6.2.0-SDK.zip) = d108d3bcd7d98e667912ffde4ed3e162a1f80a95fb0881550db165e1b647a5d4c983d5b14dc42aedd44a3d502a2c508486c28a66bfdb661d9ce804d38afefa04
5Size (XenServer-6.2.0-SDK.zip) = 10367600 bytes 5Size (XenServer-6.2.0-SDK.zip) = 10367600 bytes
6SHA1 (patch-Makefile) = d2159549bf4307411ab9b99f4beb3c3ab2cb411b 6SHA1 (patch-Makefile) = a079fd6587fcbe049523ab3f17e7b0f9fb2a96bd
7SHA1 (patch-xen_common.c) = b750589e7c7bcd33fedca8a564371251eeb1f3c9 7SHA1 (patch-xen_common.c) = b750589e7c7bcd33fedca8a564371251eeb1f3c9
cvs diff -r1.1.1.1 -r1.2 pkgsrc/devel/libxenserver/patches/patch-Makefile (expand / switch to unified diff)

--- pkgsrc/devel/libxenserver/patches/patch-Makefile 2011/02/17 09:54:02 1.1.1.1
+++ pkgsrc/devel/libxenserver/patches/patch-Makefile 2023/07/09 14:29:50 1.2
@@ -1,16 +1,25 @@ @@ -1,16 +1,25 @@
1$NetBSD: patch-Makefile,v 1.1.1.1 2011/02/17 09:54:02 sborrill Exp $ 1$NetBSD: patch-Makefile,v 1.2 2023/07/09 14:29:50 nia Exp $
2 2
3Don't embed current build dir 3Don't embed current build dir
4 4
5--- Makefile.orig 2011-02-16 16:50:42.000000000 +0000 5--- Makefile.orig 2013-06-14 13:51:06.000000000 +0000
6+++ Makefile 2011-02-16 16:50:52.000000000 +0000 6+++ Makefile
7@@ -25,8 +25,7 @@ 7@@ -31,14 +31,13 @@
8 -W -Wall -Wmissing-prototypes -Werror -std=c99 -fPIC 8 MAJOR = 2
 9 MINOR = 0
9  10
10 LDFLAGS = -g $(shell xml2-config --libs) \ 11-CFLAGS = -g -Iinclude \
 12+CFLAGS += -Iinclude \
 13 $(shell xml2-config --cflags) \
 14 $(shell curl-config --cflags) \
 15- -W -Wall -Wmissing-prototypes -Werror -std=c99 -fPIC
 16+ -W -Wall -Wmissing-prototypes -std=c99 -fPIC
 17
 18-LDFLAGS = -g $(shell xml2-config --libs) \
11- $(shell curl-config --libs) \ 19- $(shell curl-config --libs) \
12- -Wl,-rpath,$(shell pwd) 20- -Wl,-rpath,$(shell pwd)
 21+LDFLAGS += $(shell xml2-config --libs) \
13+ $(shell curl-config --libs) 22+ $(shell curl-config --libs)
14  23
15 # -h for Solaris 24 # -h for Solaris
16 SONAME_LDFLAG ?= -soname 25 SONAME_LDFLAG ?= -soname