pkgsrc-WIP-changes archive

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

OpenIPMI: Fix Makefile order



Module Name:	pkgsrc-wip
Committed By:	Juraj Lutter <otis%NetBSD.org@localhost>
Pushed By:	otis
Date:		Tue Nov 3 12:47:32 2020 +0000
Changeset:	0b459680fc5198a59adee807b13609070b0fc8b4

Modified Files:
	OpenIPMI/Makefile
	OpenIPMI/buildlink3.mk

Log Message:
OpenIPMI: Fix Makefile order

- Move LDFLAGS an BUILDLINK_TRANSFORM below bsd.prefs.mk
  They are needed on, at least, NetBSD and FreeBSD

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=0b459680fc5198a59adee807b13609070b0fc8b4

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

diffstat:
 OpenIPMI/Makefile      | 9 ++++++---
 OpenIPMI/buildlink3.mk | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diffs:
diff --git a/OpenIPMI/Makefile b/OpenIPMI/Makefile
index 90366f33ed..0d38cba78c 100644
--- a/OpenIPMI/Makefile
+++ b/OpenIPMI/Makefile
@@ -13,9 +13,6 @@ GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
 USE_TOOLS+=	gmake perl pkg-config
 
-LDFLAGS.NetBSD+=		-lexecinfo
-BUILDLINK_TRANSFORM.NetBSD=	rm:-ldl
-
 PKGCONFIG_OVERRIDE+=	OpenIPMI.pc.in
 PKGCONFIG_OVERRIDE+=	OpenIPMIcmdlang.pc.in
 PKGCONFIG_OVERRIDE+=	OpenIPMIglib.pc.in
@@ -32,6 +29,12 @@ EGFILES=		lan.conf ipmisim1.emu
 INSTALLATION_DIRS=	share/examples/OpenIPMI
 
 .include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "NetBSD" || ${OPSYS} == "FreeBSD"
+LDFLAGS+=		-lexecinfo
+BUILDLINK_TRANSFORM+=	rm:-ldl
+.endif
+
 post-install:
 .for file in ${EGFILES}
 	${MV} ${DESTDIR}${PREFIX}/etc/ipmi/${file} ${DESTDIR}${EGDIR}/${file}
diff --git a/OpenIPMI/buildlink3.mk b/OpenIPMI/buildlink3.mk
index 164eb18cd9..259e9dd31c 100644
--- a/OpenIPMI/buildlink3.mk
+++ b/OpenIPMI/buildlink3.mk
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	OpenIPMI
 OPENIPMI_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.OpenIPMI+=	OpenIPMI>=2.0.24
-BUILDLINK_PKGSRCDIR.OpenIPMI?=		../../devel/OpenIPMI
+BUILDLINK_PKGSRCDIR.OpenIPMI?=		../../sysutils/OpenIPMI
 
 .include "../../devel/popt/buildlink3.mk"
 .endif # OPENIPMI_BUILDLINK3_MK


Home | Main Index | Thread Index | Old Index