Re: pkgsrc-upstream-trunk64 SunOS 5.11/x86_64 2014-02-19 20:26

[Leonardo Taccari <iamleot%gmail.com@localhost>]

Hello,

On Fri, Feb 21, 2014 at 10:27:29AM +0000, Joyent Packages Development wrote:
> Build failures
> 
> Package                               Breaks Maintainer
> -------------------------------------------------------------------------
> chat/irssi-xmpp                              
> leot1990%users.sourceforge.net@localhost
> [...]
The attached patch I hope will fix the problem.
I am not sure if it is the better solution. If for you is ok and fix the build
failure on SunOS please apply it (and if appropiate adjust the hacks.mk date
and author).

I preferred to define what it is not defined because IMO it is the less
intrusive way and adding a proper hacks.mk file. If other OSes does not define
__BEGIN_DECLS and __END_DECLS please add them to hacks.mk.

Please keep me updated!
TIA,
Ciao,
L.

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/chat/irssi-xmpp/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- Makefile    3 Oct 2012 00:02:38 -0000       1.3
+++ Makefile    21 Feb 2014 20:56:39 -0000
@@ -23,11 +23,16 @@
 
 MAKE_ENV+=     IRSSI_INCLUDE="${WRKDIR}/${IRSSI_DISTNAME}"
 
-SUBST_CLASSES+=                makefile
+SUBST_CLASSES+=                configmk makefile
 SUBST_STAGE.makefile=  pre-build
 SUBST_MESSAGE.makefile=        Fixing doc-install Makefile target.
 SUBST_FILES.makefile=  Makefile
 SUBST_SED.makefile+=   -e '/docs/s/install/install -m 644/'
+SUBST_STAGE.configmk=  pre-build
+SUBST_MESSAGE.configmk=        Fixing CFLAGS and LDFLAGS to be user-settable.
+SUBST_FILES.configmk=  config.mk
+SUBST_SED.configmk+=   -e 's/^CFLAGS =/CFLAGS +=/'
+SUBST_SED.configmk+=   -e 's/^LDFLAGS =/LDFLAGS +=/'
 
 post-extract:
        ${MV} ${WRKDIR}/${DISTNAME} ${WRKDIR}/${IRSSI_DISTNAME}
Index: hacks.mk
===================================================================
RCS file: hacks.mk
diff -N hacks.mk
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ hacks.mk    21 Feb 2014 20:56:39 -0000
@@ -0,0 +1,16 @@
+# $NetBSD$
+
+.if !defined(IRSSI-XMPP_HACKS_MK)
+IRSSI-XMPP_HACKS_MK=   defined
+
+.include "../../mk/bsd.fast.prefs.mk"
+.include "../../mk/compiler.mk"
+
+### [Mon Feb  3 12:46:03 CET 2014 : leot]
+### On SunOS the __BEGIN_DECLS and __END_DECLS are not defined. Define them
+### with a void value.
+.if !empty(MACHINE_PLATFORM:MSunOS-*-*)
+CFLAGS+=       -D__BEGIN_DECLS= -D__END_DECLS=
+.endif
+
+.endif # IRSSI-XMPP_HACKS_MK